diff -up chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc --- chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc.typename 2023-06-17 14:50:56.342591702 +0200 +++ chromium-115.0.5790.24/chrome/browser/download/bubble/download_bubble_update_service.cc 2023-06-17 14:57:48.024377375 +0200 @@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item) // Helper to get an iterator to the last element in the cache. The cache // must not be empty. template -SortedItems::const_iterator GetLastIter(const SortedItems& cache) { +typename SortedItems::const_iterator GetLastIter(const SortedItems& cache) { CHECK(!cache.empty()); auto it = cache.end(); return std::prev(it); @@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheM } template -SortedItems::iterator +typename SortedItems::iterator DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter( - SortedItems::iterator iter, + typename SortedItems::iterator iter, SortedItems& cache, IterMap& iter_map) { CHECK(iter != cache.end()); diff -up chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h --- chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h.me 2023-06-18 21:52:53.515625237 +0200 +++ chromium-115.0.5790.32/components/optimization_guide/core/tflite_model_executor.h 2023-06-18 21:53:06.881881293 +0200 @@ -189,7 +189,7 @@ class TFLiteModelExecutor : public Model void SendForBatchExecution( BatchExecutionCallback callback_on_complete, base::TimeTicks start_time, - ModelExecutor::ConstRefInputVector inputs) + typename ModelExecutor::ConstRefInputVector inputs) override { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); diff -up chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc --- chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.me1 2023-06-19 10:03:32.319218678 +0200 +++ chromium-115.0.5790.32/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc 2023-06-19 10:04:12.023942232 +0200 @@ -169,7 +169,7 @@ class HTMLFastPathParser { using Span = base::span; using USpan = base::span; // 32 matches that used by HTMLToken::Attribute. - typedef std::conditional, + typedef typename std::conditional, UCharLiteralBuffer<32>, LCharLiteralBuffer<32>>::type LiteralBufferType; typedef UCharLiteralBuffer<32> UCharLiteralBufferType;