FIXUP: Fix build with gcc 5

Fixes needed after merge with 79.

Change-Id: I8bd346f331e5b5aa772da143bca83c1d8c207061
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

34 files changed, 201 insertions, 198 deletions

diff --git a/chromium/base/containers/span.h b/chromium/base/containers/span.h
index fc7f58d8e4b..f866926f893 100644
--- a/chromium/base/containers/span.h
+++ b/chromium/base/containers/span.h
@@ -480,7 +480,7 @@ constexpr span<T> make_span(T* begin, T* end) noexcept {
 
 template <typename T, size_t N>
 constexpr span<T, N> make_span(T (&array)[N]) noexcept {
-  return array;
+  return span<T, N>(array);
 }
 
 template <typename T, size_t N>
diff --git a/chromium/base/cpu.cc b/chromium/base/cpu.cc
index 8cc2028a5f8..2a571fe3155 100644
--- a/chromium/base/cpu.cc
+++ b/chromium/base/cpu.cc
@@ -59,7 +59,7 @@ std::tuple<int, int, int, int> ComputeX86FamilyAndModel(
     family += ext_family;
   }
 
-  return {family, model, ext_family, ext_model};
+  return std::make_tuple(family, model, ext_family, ext_model);
 }
 
 }  // namespace internal
diff --git a/chromium/base/logging.h b/chromium/base/logging.h
index 33fa754836f..1d4b590f56a 100644
--- a/chromium/base/logging.h
+++ b/chromium/base/logging.h
@@ -696,15 +696,15 @@ std::string* MakeCheckOpString<std::string, std::string>(
 // condition is false.
 #define DEFINE_CHECK_OP_IMPL(name, op)                                 \
   template <class t1, class t2>                                        \
-  constexpr std::string* Check##name##Impl(const t1& v1, const t2& v2, \
-                                           const char* names) {        \
+  std::string* Check##name##Impl(const t1& v1, const t2& v2,           \
+                                 const char* names) {                  \
     if (!!ANALYZER_ASSUME_TRUE(v1 op v2))                              \
       return nullptr;                                                  \
     else                                                               \
       return ::logging::MakeCheckOpString(v1, v2, names);              \
   }                                                                    \
-  constexpr std::string* Check##name##Impl(int v1, int v2,             \
-                                           const char* names) {        \
+  inline std::string* Check##name##Impl(int v1, int v2,                \
+                                        const char* names) {           \
     if (!!ANALYZER_ASSUME_TRUE(v1 op v2))                              \
       return nullptr;                                                  \
     else                                                               \
diff --git a/chromium/base/threading/thread_collision_warner.cc b/chromium/base/threading/thread_collision_warner.cc
index 547e11ca66f..9f11d90ac3f 100644
--- a/chromium/base/threading/thread_collision_warner.cc
+++ b/chromium/base/threading/thread_collision_warner.cc
@@ -13,7 +13,7 @@ void DCheckAsserter::warn() {
   NOTREACHED() << "Thread Collision";
 }
 
-static subtle::Atomic32 CurrentThread() {
+static subtle::Atomic32 GetCurrentThread() {
   const PlatformThreadId current_thread_id = PlatformThread::CurrentId();
   // We need to get the thread id into an atomic data type. This might be a
   // truncating conversion, but any loss-of-information just increases the
@@ -28,7 +28,7 @@ void ThreadCollisionWarner::EnterSelf() {
   // If the active thread is 0 then I'll write the current thread ID
   // if two or more threads arrive here only one will succeed to
   // write on valid_thread_id_ the current thread ID.
-  subtle::Atomic32 current_thread_id = CurrentThread();
+  subtle::Atomic32 current_thread_id = GetCurrentThread();
 
   int previous_value = subtle::NoBarrier_CompareAndSwap(&valid_thread_id_,
                                                         0,
@@ -43,7 +43,7 @@ void ThreadCollisionWarner::EnterSelf() {
 }
 
 void ThreadCollisionWarner::Enter() {
-  subtle::Atomic32 current_thread_id = CurrentThread();
+  subtle::Atomic32 current_thread_id = GetCurrentThread();
 
   if (subtle::NoBarrier_CompareAndSwap(&valid_thread_id_,
                                        0,
diff --git a/chromium/base/time/time.h b/chromium/base/time/time.h
index 9aeba2adf90..b918bfe95c3 100644
--- a/chromium/base/time/time.h
+++ b/chromium/base/time/time.h
@@ -342,10 +342,10 @@ constexpr int64_t SaturatedAdd(int64_t value, TimeDelta delta) {
   // Treat Min/Max() as +/- infinity (additions involving two infinities are
   // only valid if signs match).
   if (delta.is_max()) {
-    CHECK_GT(value, std::numeric_limits<int64_t>::min());
+//    CHECK_GT(value, std::numeric_limits<int64_t>::min());
     return std::numeric_limits<int64_t>::max();
   } else if (delta.is_min()) {
-    CHECK_LT(value, std::numeric_limits<int64_t>::max());
+//    CHECK_LT(value, std::numeric_limits<int64_t>::max());
     return std::numeric_limits<int64_t>::min();
   }
 
@@ -356,10 +356,10 @@ constexpr int64_t SaturatedSub(int64_t value, TimeDelta delta) {
   // Treat Min/Max() as +/- infinity (subtractions involving two infinities are
   // only valid if signs are opposite).
   if (delta.is_max()) {
-    CHECK_LT(value, std::numeric_limits<int64_t>::max());
+//    CHECK_LT(value, std::numeric_limits<int64_t>::max());
     return std::numeric_limits<int64_t>::min();
   } else if (delta.is_min()) {
-    CHECK_GT(value, std::numeric_limits<int64_t>::min());
+//    CHECK_GT(value, std::numeric_limits<int64_t>::min());
     return std::numeric_limits<int64_t>::max();
   }
 
diff --git a/chromium/components/services/leveldb/leveldb_database_impl.cc b/chromium/components/services/leveldb/leveldb_database_impl.cc
index 14e056aaf69..8379272ef49 100644
--- a/chromium/components/services/leveldb/leveldb_database_impl.cc
+++ b/chromium/components/services/leveldb/leveldb_database_impl.cc
@@ -154,47 +154,38 @@ void LevelDBDatabaseImpl::Write(
 
 void LevelDBDatabaseImpl::Get(const std::vector<uint8_t>& key,
                               GetCallback callback) {
-  struct GetResult {
-    Status status;
-    storage::DomStorageDatabase::Value value;
-  };
   RunDatabaseTask(base::BindOnce(
                       [](const std::vector<uint8_t>& key,
                          const storage::DomStorageDatabase& db) {
-                        GetResult result;
-                        result.status = db.Get(key, &result.value);
+                        std::pair<Status, storage::DomStorageDatabase::Value> result;
+                        result.first = db.Get(key, &result.second);
                         return result;
                       },
                       key),
                   base::BindOnce(
-                      [](GetCallback callback, GetResult result) {
-                        std::move(callback).Run(result.status, result.value);
+                      [](GetCallback callback, std::pair<Status, storage::DomStorageDatabase::Value> result) {
+                        std::move(callback).Run(result.first, result.second);
                       },
                       std::move(callback)));
 }
 
 void LevelDBDatabaseImpl::GetPrefixed(const std::vector<uint8_t>& key_prefix,
                                       GetPrefixedCallback callback) {
-  struct GetPrefixedResult {
-    Status status;
-    std::vector<storage::DomStorageDatabase::KeyValuePair> entries;
-  };
-
   RunDatabaseTask(
       base::BindOnce(
           [](const std::vector<uint8_t>& prefix,
              const storage::DomStorageDatabase& db) {
-            GetPrefixedResult result;
-            result.status = db.GetPrefixed(prefix, &result.entries);
+            std::pair<Status,std::vector<storage::DomStorageDatabase::KeyValuePair>> result;
+            result.first = db.GetPrefixed(prefix, &result.second);
             return result;
           },
           key_prefix),
       base::BindOnce(
-          [](GetPrefixedCallback callback, GetPrefixedResult result) {
+          [](GetPrefixedCallback callback, std::pair<Status,std::vector<storage::DomStorageDatabase::KeyValuePair>> result) {
             std::vector<mojom::KeyValuePtr> entries;
-            for (auto& entry : result.entries)
+            for (auto& entry : result.second)
               entries.push_back(mojom::KeyValue::New(entry.key, entry.value));
-            std::move(callback).Run(result.status, std::move(entries));
+            std::move(callback).Run(result.first, std::move(entries));
           },
           std::move(callback)));
 }
diff --git a/chromium/content/browser/indexed_db/indexed_db_connection_coordinator.cc b/chromium/content/browser/indexed_db/indexed_db_connection_coordinator.cc
index c0618ae4e94..a418d2ff336 100644
--- a/chromium/content/browser/indexed_db/indexed_db_connection_coordinator.cc
+++ b/chromium/content/browser/indexed_db/indexed_db_connection_coordinator.cc
@@ -362,7 +362,7 @@ class IndexedDBConnectionCoordinator::OpenRequest
     pending_.reset();
     // The tasks_available_callback_ is NOT run here, because we are assuming
     // the caller is doing their own cleanup & execution for ForceClose.
-    return {true, status};
+    return std::make_tuple(true, status);
   }
 
  private:
@@ -495,7 +495,7 @@ class IndexedDBConnectionCoordinator::DeleteRequest
 
   // The delete requests should always be run during force close.
   std::tuple<bool, leveldb::Status> ShouldPruneForForceClose() override {
-    return {false, leveldb::Status::OK()};
+    return std::make_tuple(false, leveldb::Status::OK());
   }
 
  private:
@@ -617,7 +617,7 @@ void IndexedDBConnectionCoordinator::OnUpgradeTransactionFinished(
 std::tuple<IndexedDBConnectionCoordinator::ExecuteTaskResult, leveldb::Status>
 IndexedDBConnectionCoordinator::ExecuteTask(bool has_connections) {
   if (request_queue_.empty())
-    return {ExecuteTaskResult::kDone, leveldb::Status()};
+    return std::make_tuple(ExecuteTaskResult::kDone, leveldb::Status());
 
   auto& request = request_queue_.front();
   if (request->state() == RequestState::kNotStarted) {
@@ -628,11 +628,11 @@ IndexedDBConnectionCoordinator::ExecuteTask(bool has_connections) {
   switch (request->state()) {
     case RequestState::kNotStarted:
       NOTREACHED();
-      return {ExecuteTaskResult::kError, leveldb::Status::OK()};
+      return std::make_tuple(ExecuteTaskResult::kError, leveldb::Status::OK());
     case RequestState::kPendingNoConnections:
     case RequestState::kPendingLocks:
     case RequestState::kPendingTransactionComplete:
-      return {ExecuteTaskResult::kPendingAsyncWork, leveldb::Status()};
+      return std::make_tuple(ExecuteTaskResult::kPendingAsyncWork, leveldb::Status());
     case RequestState::kDone: {
       // Move |request_to_discard| out of |request_queue_| then
       // |request_queue_.pop()|. We do this because |request_to_discard|'s dtor
@@ -642,9 +642,9 @@ IndexedDBConnectionCoordinator::ExecuteTask(bool has_connections) {
       auto request_to_discard = std::move(request_queue_.front());
       request_queue_.pop();
       request_to_discard.reset();
-      return {request_queue_.empty() ? ExecuteTaskResult::kDone
+      return std::make_tuple(request_queue_.empty() ? ExecuteTaskResult::kDone
                                      : ExecuteTaskResult::kMoreTasks,
-              leveldb::Status::OK()};
+              leveldb::Status::OK());
     }
     case RequestState::kError: {
       leveldb::Status status = request->status();
@@ -656,7 +656,7 @@ IndexedDBConnectionCoordinator::ExecuteTask(bool has_connections) {
       auto request_to_discard = std::move(request_queue_.front());
       request_queue_.pop();
       request_to_discard.reset();
-      return {ExecuteTaskResult::kError, status};
+      return std::make_tuple(ExecuteTaskResult::kError, status);
     }
   }
   NOTREACHED();
diff --git a/chromium/content/browser/indexed_db/indexed_db_database.cc b/chromium/content/browser/indexed_db/indexed_db_database.cc
index 11520bd130e..44b1577bcde 100644
--- a/chromium/content/browser/indexed_db/indexed_db_database.cc
+++ b/chromium/content/browser/indexed_db/indexed_db_database.cc
@@ -199,7 +199,7 @@ IndexedDBDatabase::RunTasks() {
            IndexedDBConnectionCoordinator::ExecuteTaskResult::kMoreTasks);
 
   if (task_state == IndexedDBConnectionCoordinator::ExecuteTaskResult::kError)
-    return {RunTasksResult::kError, status};
+    return std::make_tuple(RunTasksResult::kError, status);
 
   bool transactions_removed = true;
 
@@ -237,7 +237,7 @@ IndexedDBDatabase::RunTasks() {
         std::tie(task_result, transaction_status) = txn->RunTasks();
         switch (task_result) {
           case IndexedDBTransaction::RunTasksResult::kError:
-            return {RunTasksResult::kError, transaction_status};
+            return std::make_tuple(RunTasksResult::kError, transaction_status);
           case IndexedDBTransaction::RunTasksResult::kCommitted:
           case IndexedDBTransaction::RunTasksResult::kAborted:
             if (txn->mode() ==
@@ -264,8 +264,8 @@ IndexedDBDatabase::RunTasks() {
     }
   }
   if (CanBeDestroyed())
-    return {RunTasksResult::kCanBeDestroyed, leveldb::Status::OK()};
-  return {RunTasksResult::kDone, leveldb::Status::OK()};
+    return std::make_tuple(RunTasksResult::kCanBeDestroyed, leveldb::Status::OK());
+  return std::make_tuple(RunTasksResult::kDone, leveldb::Status::OK());
 }
 
 leveldb::Status IndexedDBDatabase::ForceCloseAndRunTasks() {
diff --git a/chromium/content/browser/indexed_db/indexed_db_factory_impl.cc b/chromium/content/browser/indexed_db/indexed_db_factory_impl.cc
index 014df69f32e..ff579303648 100644
--- a/chromium/content/browser/indexed_db/indexed_db_factory_impl.cc
+++ b/chromium/content/browser/indexed_db/indexed_db_factory_impl.cc
@@ -736,8 +736,8 @@ IndexedDBFactoryImpl::GetOrOpenOriginFactory(
     ReportOpenStatus(indexed_db::INDEXED_DB_BACKING_STORE_OPEN_NO_RECOVERY,
                      origin);
 
-    return {IndexedDBOriginStateHandle(), s, CreateDefaultError(),
-            data_loss_info, /*was_cold_open=*/true};
+    return std::make_tuple(IndexedDBOriginStateHandle(), s, CreateDefaultError(),
+            data_loss_info, /*was_cold_open=*/true);
   }
 
   if (!is_incognito_and_in_memory)
@@ -853,7 +853,7 @@ IndexedDBFactoryImpl::OpenAndVerifyIndexedDBBackingStore(
   std::tie(scopes, status) = scopes_factory->CreateAndInitializeLevelDBScopes(
       std::move(scopes_options), state);
   if (UNLIKELY(!status.ok()))
-    return {nullptr, status, std::move(data_loss_info), /*is_disk_full=*/false};
+    return std::make_tuple(nullptr, status, std::move(data_loss_info), /*is_disk_full=*/false);
 
   std::unique_ptr<TransactionalLevelDBDatabase> database =
       leveldb_factory_->CreateLevelDBDatabase(
diff --git a/chromium/content/browser/indexed_db/indexed_db_origin_state.cc b/chromium/content/browser/indexed_db/indexed_db_origin_state.cc
index 06305168c63..84606cd40f9 100644
--- a/chromium/content/browser/indexed_db/indexed_db_origin_state.cc
+++ b/chromium/content/browser/indexed_db/indexed_db_origin_state.cc
@@ -199,7 +199,7 @@ IndexedDBOriginState::RunTasks() {
         continue;
       case IndexedDBDatabase::RunTasksResult::kError:
         running_tasks_ = false;
-        return {RunTasksResult::kError, status};
+        return std::make_tuple(RunTasksResult::kError, status);
       case IndexedDBDatabase::RunTasksResult::kCanBeDestroyed:
         db_it = databases_.erase(db_it);
         break;
@@ -207,8 +207,8 @@ IndexedDBOriginState::RunTasks() {
   }
   running_tasks_ = false;
   if (CanCloseFactory() && closing_stage_ == ClosingState::kClosed)
-    return {RunTasksResult::kCanBeDestroyed, leveldb::Status::OK()};
-  return {RunTasksResult::kDone, leveldb::Status::OK()};
+    return std::make_tuple(RunTasksResult::kCanBeDestroyed, leveldb::Status::OK());
+  return std::make_tuple(RunTasksResult::kDone, leveldb::Status::OK());
 }
 
 IndexedDBDatabase* IndexedDBOriginState::AddDatabase(
diff --git a/chromium/content/browser/indexed_db/indexed_db_transaction.cc b/chromium/content/browser/indexed_db/indexed_db_transaction.cc
index 061d0bf9704..557eb1d3944 100644
--- a/chromium/content/browser/indexed_db/indexed_db_transaction.cc
+++ b/chromium/content/browser/indexed_db/indexed_db_transaction.cc
@@ -450,9 +450,9 @@ IndexedDBTransaction::RunTasks() {
 
   // May have been aborted.
   if (aborted_)
-    return {RunTasksResult::kAborted, leveldb::Status::OK()};
+    return std::make_tuple(RunTasksResult::kAborted, leveldb::Status::OK());
   if (IsTaskQueueEmpty() && !is_commit_pending_)
-    return {RunTasksResult::kNotFinished, leveldb::Status::OK()};
+    return std::make_tuple(RunTasksResult::kNotFinished, leveldb::Status::OK());
 
   processing_event_queue_ = true;
 
@@ -475,10 +475,10 @@ IndexedDBTransaction::RunTasks() {
     }
     if (!result.ok()) {
       processing_event_queue_ = false;
-      return {
+      return std::make_tuple(
           RunTasksResult::kError,
-          result,
-      };
+          result
+      );
     }
 
     run_preemptive_queue =
@@ -494,14 +494,14 @@ IndexedDBTransaction::RunTasks() {
     // This can delete |this|.
     leveldb::Status result = Commit();
     if (!result.ok())
-      return {RunTasksResult::kError, result};
+      return std::make_tuple(RunTasksResult::kError, result);
   }
 
   // The transaction may have been aborted while processing tasks.
   if (state_ == FINISHED) {
     processing_event_queue_ = false;
-    return {aborted_ ? RunTasksResult::kAborted : RunTasksResult::kCommitted,
-            leveldb::Status::OK()};
+    return std::make_tuple(aborted_ ? RunTasksResult::kAborted : RunTasksResult::kCommitted,
+            leveldb::Status::OK());
   }
 
   DCHECK(state_ == STARTED || state_ == COMMITTING) << state_;
@@ -516,7 +516,7 @@ IndexedDBTransaction::RunTasks() {
                                         ptr_factory_.GetWeakPtr()));
   }
   processing_event_queue_ = false;
-  return {RunTasksResult::kNotFinished, leveldb::Status::OK()};
+  return std::make_tuple(RunTasksResult::kNotFinished, leveldb::Status::OK());
 }
 
 base::TimeDelta IndexedDBTransaction::GetInactivityTimeout() const {
diff --git a/chromium/content/browser/indexed_db/leveldb/leveldb_env.cc b/chromium/content/browser/indexed_db/leveldb/leveldb_env.cc
index e5c9ae9bb99..8ada67d383b 100644
--- a/chromium/content/browser/indexed_db/leveldb/leveldb_env.cc
+++ b/chromium/content/browser/indexed_db/leveldb/leveldb_env.cc
@@ -94,7 +94,7 @@ DefaultLevelDBFactory::OpenLevelDBState(
 
   if (file_name.empty()) {
     if (!create_if_missing)
-      return {nullptr, leveldb::Status::NotFound("", ""), false};
+      return std::make_tuple(nullptr, leveldb::Status::NotFound("", ""), false);
 
     std::unique_ptr<leveldb::Env> in_memory_env =
         leveldb_chrome::NewMemEnv("indexed-db", LevelDBEnv::Get());
@@ -127,7 +127,7 @@ DefaultLevelDBFactory::OpenLevelDBState(
   std::tie(db, status) = OpenDB(options, file_name.AsUTF8Unsafe());
   if (!status.ok()) {
     if (!create_if_missing)
-      return {nullptr, leveldb::Status::NotFound("", ""), false};
+      return std::make_tuple(nullptr, leveldb::Status::NotFound("", ""), false);
 
     ReportLevelDBError("WebCore.IndexedDB.LevelDBOpenErrors", status);
 
diff --git a/chromium/content/browser/indexed_db/leveldb/transactional_leveldb_iterator.cc b/chromium/content/browser/indexed_db/leveldb/transactional_leveldb_iterator.cc
index c4d780dbd9a..0ca8f7300b9 100644
--- a/chromium/content/browser/indexed_db/leveldb/transactional_leveldb_iterator.cc
+++ b/chromium/content/browser/indexed_db/leveldb/transactional_leveldb_iterator.cc
@@ -212,18 +212,18 @@ TransactionalLevelDBIterator::WillUseDBIterator(bool perform_seek) {
   leveldb::Status s;
   db_->OnIteratorUsed(this);
   if (!IsEvicted())
-    return {"", s};
+    return std::make_tuple("", s);
 
   s = ReloadIterator();
   if (!s.ok())
-    return {"", s};
+    return std::make_tuple("", s);
 
   if (iterator_state_ == IteratorState::kEvictedAndValid && perform_seek)
     iterator_->Seek(key_before_eviction_);
 
   iterator_state_ = IteratorState::kActive;
   value_before_eviction_.clear();
-  return {std::move(key_before_eviction_), s};
+  return std::make_tuple(std::move(key_before_eviction_), s);
 }
 
 leveldb::Status TransactionalLevelDBIterator::ReloadIterator() {
diff --git a/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc b/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc
index 12e938573f0..eb35b135ba5 100644
--- a/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc
+++ b/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc
@@ -23,10 +23,10 @@ DisjointRangeLockManager::LockRequest::LockRequest(LockRequest&&) noexcept =
     default;
 DisjointRangeLockManager::LockRequest::~LockRequest() = default;
 DisjointRangeLockManager::Lock::Lock() = default;
-DisjointRangeLockManager::Lock::Lock(Lock&&) noexcept = default;
+DisjointRangeLockManager::Lock::Lock(Lock&&) = default;
 DisjointRangeLockManager::Lock::~Lock() = default;
 DisjointRangeLockManager::Lock& DisjointRangeLockManager::Lock::operator=(
-    DisjointRangeLockManager::Lock&&) noexcept = default;
+    DisjointRangeLockManager::Lock&&) = default;
 
 DisjointRangeLockManager::DisjointRangeLockManager(int level_count)
     : task_runner_(base::SequencedTaskRunnerHandle::Get()) {
diff --git a/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.h b/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.h
index 3e917621c04..f2a91da8362 100644
--- a/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.h
+++ b/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.h
@@ -81,9 +81,9 @@ class CONTENT_EXPORT DisjointRangeLockManager : public ScopesLockManager {
   struct Lock {
    public:
     Lock();
-    Lock(Lock&&) noexcept;
+    Lock(Lock&&);
     ~Lock();
-    Lock& operator=(Lock&&) noexcept;
+    Lock& operator=(Lock&&);
 
     bool CanBeAcquired(LockType lock_type) {
       return acquired_count == 0 ||
diff --git a/chromium/content/renderer/accessibility/ax_image_annotator.cc b/chromium/content/renderer/accessibility/ax_image_annotator.cc
index 0cf83db58f0..db17c91768a 100644
--- a/chromium/content/renderer/accessibility/ax_image_annotator.cc
+++ b/chromium/content/renderer/accessibility/ax_image_annotator.cc
@@ -80,7 +80,7 @@ void AXImageAnnotator::OnImageAdded(blink::WebAXObject& image) {
   if (image_id.empty())
     return;
 
-  image_annotations_.emplace(image.AxID(), image);
+  image_annotations_[image.AxID()] = ImageInfo(image);
   ImageInfo& image_info = image_annotations_.at(image.AxID());
   // Fetch image annotation.
   annotator_->AnnotateImage(image_id, preferred_language_,
diff --git a/chromium/content/renderer/accessibility/ax_image_annotator.h b/chromium/content/renderer/accessibility/ax_image_annotator.h
index d277dcb0dfe..3dd97eb48fa 100644
--- a/chromium/content/renderer/accessibility/ax_image_annotator.h
+++ b/chromium/content/renderer/accessibility/ax_image_annotator.h
@@ -64,6 +64,7 @@ class CONTENT_EXPORT AXImageAnnotator : public base::CheckedObserver {
   // Keeps track of the image data and the automatic annotation for each image.
   class ImageInfo final {
    public:
+    ImageInfo() = default;
     ImageInfo(const blink::WebAXObject& image);
     virtual ~ImageInfo();
     ImageInfo(ImageInfo&&) = default;
diff --git a/chromium/content/renderer/media/audio/audio_output_ipc_factory.cc b/chromium/content/renderer/media/audio/audio_output_ipc_factory.cc
index 6fc112da547..7258975f585 100644
--- a/chromium/content/renderer/media/audio/audio_output_ipc_factory.cc
+++ b/chromium/content/renderer/media/audio/audio_output_ipc_factory.cc
@@ -75,7 +75,7 @@ void AudioOutputIPCFactory::RegisterRemoteFactoryOnIOThread(
         factory_pending_remote) {
   DCHECK(io_task_runner_->BelongsToCurrentThread());
   std::pair<StreamFactoryMap::iterator, bool> emplace_result =
-      factory_remotes_.emplace(frame_id, std::move(factory_pending_remote));
+      factory_remotes_.emplace(frame_id, mojo::Remote<mojom::RendererAudioOutputStreamFactory>(std::move(factory_pending_remote)));
 
   DCHECK(emplace_result.second) << "Attempt to register a factory for a "
                                    "frame which already has a factory "
diff --git a/chromium/gpu/command_buffer/service/texture_manager.cc b/chromium/gpu/command_buffer/service/texture_manager.cc
index 67dee8e9ed4..bf1f945aabc 100644
--- a/chromium/gpu/command_buffer/service/texture_manager.cc
+++ b/chromium/gpu/command_buffer/service/texture_manager.cc
@@ -133,130 +133,130 @@ class FormatTypeValidator {
   FormatTypeValidator() {
     static const FormatType kSupportedFormatTypes[] = {
         // ES2.
-        {GL_RGB, GL_RGB, GL_UNSIGNED_BYTE},
-        {GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
-        {GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE},
-        {GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4},
-        {GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1},
-        {GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE},
-        {GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE},
-        {GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE},
+        FormatType{GL_RGB, GL_RGB, GL_UNSIGNED_BYTE},
+        FormatType{GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
+        FormatType{GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE},
+        FormatType{GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4},
+        FormatType{GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1},
+        FormatType{GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE},
+        FormatType{GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE},
+        FormatType{GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE},
 
         // ES3.
-        {GL_R8, GL_RED, GL_UNSIGNED_BYTE},
-        {GL_R8_SNORM, GL_RED, GL_BYTE},
-        {GL_R16F, GL_RED, GL_HALF_FLOAT},
-        {GL_R16F, GL_RED, GL_FLOAT},
-        {GL_R32F, GL_RED, GL_FLOAT},
-        {GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE},
-        {GL_R8I, GL_RED_INTEGER, GL_BYTE},
-        {GL_R16UI, GL_RED_INTEGER, GL_UNSIGNED_SHORT},
-        {GL_R16I, GL_RED_INTEGER, GL_SHORT},
-        {GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT},
-        {GL_R32I, GL_RED_INTEGER, GL_INT},
-        {GL_RG8, GL_RG, GL_UNSIGNED_BYTE},
-        {GL_RG8_SNORM, GL_RG, GL_BYTE},
-        {GL_RG16F, GL_RG, GL_HALF_FLOAT},
-        {GL_RG16F, GL_RG, GL_FLOAT},
-        {GL_RG32F, GL_RG, GL_FLOAT},
-        {GL_RG8UI, GL_RG_INTEGER, GL_UNSIGNED_BYTE},
-        {GL_RG8I, GL_RG_INTEGER, GL_BYTE},
-        {GL_RG16UI, GL_RG_INTEGER, GL_UNSIGNED_SHORT},
-        {GL_RG16I, GL_RG_INTEGER, GL_SHORT},
-        {GL_RG32UI, GL_RG_INTEGER, GL_UNSIGNED_INT},
-        {GL_RG32I, GL_RG_INTEGER, GL_INT},
-        {GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE},
-        {GL_SRGB8, GL_RGB, GL_UNSIGNED_BYTE},
-        {GL_RGB565, GL_RGB, GL_UNSIGNED_BYTE},
-        {GL_RGB565, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
-        {GL_RGB8_SNORM, GL_RGB, GL_BYTE},
-        {GL_R11F_G11F_B10F, GL_RGB, GL_UNSIGNED_INT_10F_11F_11F_REV},
-        {GL_R11F_G11F_B10F, GL_RGB, GL_HALF_FLOAT},
-        {GL_R11F_G11F_B10F, GL_RGB, GL_FLOAT},
-        {GL_RGB9_E5, GL_RGB, GL_UNSIGNED_INT_5_9_9_9_REV},
-        {GL_RGB9_E5, GL_RGB, GL_HALF_FLOAT},
-        {GL_RGB9_E5, GL_RGB, GL_FLOAT},
-        {GL_RGB16F, GL_RGB, GL_HALF_FLOAT},
-        {GL_RGB16F, GL_RGB, GL_FLOAT},
-        {GL_RGB32F, GL_RGB, GL_FLOAT},
-        {GL_RGB8UI, GL_RGB_INTEGER, GL_UNSIGNED_BYTE},
-        {GL_RGB8I, GL_RGB_INTEGER, GL_BYTE},
-        {GL_RGB16UI, GL_RGB_INTEGER, GL_UNSIGNED_SHORT},
-        {GL_RGB16I, GL_RGB_INTEGER, GL_SHORT},
-        {GL_RGB32UI, GL_RGB_INTEGER, GL_UNSIGNED_INT},
-        {GL_RGB32I, GL_RGB_INTEGER, GL_INT},
-        {GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE},
-        {GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE},
-        {GL_RGBA8_SNORM, GL_RGBA, GL_BYTE},
-        {GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_BYTE},
-        {GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1},
-        {GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV},
-        {GL_RGBA4, GL_RGBA, GL_UNSIGNED_BYTE},
-        {GL_RGBA4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4},
-        {GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV},
-        {GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT},
-        {GL_RGBA16F, GL_RGBA, GL_FLOAT},
-        {GL_RGBA32F, GL_RGBA, GL_FLOAT},
-        {GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE},
-        {GL_RGBA8I, GL_RGBA_INTEGER, GL_BYTE},
-        {GL_RGB10_A2UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT_2_10_10_10_REV},
-        {GL_RGBA16UI, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT},
-        {GL_RGBA16I, GL_RGBA_INTEGER, GL_SHORT},
-        {GL_RGBA32I, GL_RGBA_INTEGER, GL_INT},
-        {GL_RGBA32UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT},
-        {GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT},
-        {GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT},
-        {GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT},
-        {GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT},
-        {GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8},
-        {GL_DEPTH32F_STENCIL8, GL_DEPTH_STENCIL,
+        FormatType{GL_R8, GL_RED, GL_UNSIGNED_BYTE},
+        FormatType{GL_R8_SNORM, GL_RED, GL_BYTE},
+        FormatType{GL_R16F, GL_RED, GL_HALF_FLOAT},
+        FormatType{GL_R16F, GL_RED, GL_FLOAT},
+        FormatType{GL_R32F, GL_RED, GL_FLOAT},
+        FormatType{GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE},
+        FormatType{GL_R8I, GL_RED_INTEGER, GL_BYTE},
+        FormatType{GL_R16UI, GL_RED_INTEGER, GL_UNSIGNED_SHORT},
+        FormatType{GL_R16I, GL_RED_INTEGER, GL_SHORT},
+        FormatType{GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT},
+        FormatType{GL_R32I, GL_RED_INTEGER, GL_INT},
+        FormatType{GL_RG8, GL_RG, GL_UNSIGNED_BYTE},
+        FormatType{GL_RG8_SNORM, GL_RG, GL_BYTE},
+        FormatType{GL_RG16F, GL_RG, GL_HALF_FLOAT},
+        FormatType{GL_RG16F, GL_RG, GL_FLOAT},
+        FormatType{GL_RG32F, GL_RG, GL_FLOAT},
+        FormatType{GL_RG8UI, GL_RG_INTEGER, GL_UNSIGNED_BYTE},
+        FormatType{GL_RG8I, GL_RG_INTEGER, GL_BYTE},
+        FormatType{GL_RG16UI, GL_RG_INTEGER, GL_UNSIGNED_SHORT},
+        FormatType{GL_RG16I, GL_RG_INTEGER, GL_SHORT},
+        FormatType{GL_RG32UI, GL_RG_INTEGER, GL_UNSIGNED_INT},
+        FormatType{GL_RG32I, GL_RG_INTEGER, GL_INT},
+        FormatType{GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE},
+        FormatType{GL_SRGB8, GL_RGB, GL_UNSIGNED_BYTE},
+        FormatType{GL_RGB565, GL_RGB, GL_UNSIGNED_BYTE},
+        FormatType{GL_RGB565, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
+        FormatType{GL_RGB8_SNORM, GL_RGB, GL_BYTE},
+        FormatType{GL_R11F_G11F_B10F, GL_RGB, GL_UNSIGNED_INT_10F_11F_11F_REV},
+        FormatType{GL_R11F_G11F_B10F, GL_RGB, GL_HALF_FLOAT},
+        FormatType{GL_R11F_G11F_B10F, GL_RGB, GL_FLOAT},
+        FormatType{GL_RGB9_E5, GL_RGB, GL_UNSIGNED_INT_5_9_9_9_REV},
+        FormatType{GL_RGB9_E5, GL_RGB, GL_HALF_FLOAT},
+        FormatType{GL_RGB9_E5, GL_RGB, GL_FLOAT},
+        FormatType{GL_RGB16F, GL_RGB, GL_HALF_FLOAT},
+        FormatType{GL_RGB16F, GL_RGB, GL_FLOAT},
+        FormatType{GL_RGB32F, GL_RGB, GL_FLOAT},
+        FormatType{GL_RGB8UI, GL_RGB_INTEGER, GL_UNSIGNED_BYTE},
+        FormatType{GL_RGB8I, GL_RGB_INTEGER, GL_BYTE},
+        FormatType{GL_RGB16UI, GL_RGB_INTEGER, GL_UNSIGNED_SHORT},
+        FormatType{GL_RGB16I, GL_RGB_INTEGER, GL_SHORT},
+        FormatType{GL_RGB32UI, GL_RGB_INTEGER, GL_UNSIGNED_INT},
+        FormatType{GL_RGB32I, GL_RGB_INTEGER, GL_INT},
+        FormatType{GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE},
+        FormatType{GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE},
+        FormatType{GL_RGBA8_SNORM, GL_RGBA, GL_BYTE},
+        FormatType{GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_BYTE},
+        FormatType{GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1},
+        FormatType{GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV},
+        FormatType{GL_RGBA4, GL_RGBA, GL_UNSIGNED_BYTE},
+        FormatType{GL_RGBA4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4},
+        FormatType{GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV},
+        FormatType{GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT},
+        FormatType{GL_RGBA16F, GL_RGBA, GL_FLOAT},
+        FormatType{GL_RGBA32F, GL_RGBA, GL_FLOAT},
+        FormatType{GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE},
+        FormatType{GL_RGBA8I, GL_RGBA_INTEGER, GL_BYTE},
+        FormatType{GL_RGB10_A2UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT_2_10_10_10_REV},
+        FormatType{GL_RGBA16UI, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT},
+        FormatType{GL_RGBA16I, GL_RGBA_INTEGER, GL_SHORT},
+        FormatType{GL_RGBA32I, GL_RGBA_INTEGER, GL_INT},
+        FormatType{GL_RGBA32UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT},
+        FormatType{GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT},
+        FormatType{GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT},
+        FormatType{GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT},
+        FormatType{GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT},
+        FormatType{GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8},
+        FormatType{GL_DEPTH32F_STENCIL8, GL_DEPTH_STENCIL,
          GL_FLOAT_32_UNSIGNED_INT_24_8_REV},
 
         // Exposed by GL_APPLE_texture_format_BGRA8888 for TexStorage*
         // TODO(kainino): this actually exposes it for (Copy)TexImage* as well,
         // which is incorrect. crbug.com/663086
-        {GL_BGRA8_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE},
+        FormatType{GL_BGRA8_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE},
 
         // Exposed by GL_APPLE_texture_format_BGRA8888 and
         // GL_EXT_texture_format_BGRA8888
-        {GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE},
+        FormatType{GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE},
 
         // Exposed by GL_EXT_texture_norm16
-        {GL_R16_EXT, GL_RED, GL_UNSIGNED_SHORT},
+        FormatType{GL_R16_EXT, GL_RED, GL_UNSIGNED_SHORT},
     };
 
     static const FormatType kSupportedFormatTypesES2Only[] = {
         // Exposed by GL_OES_texture_float and GL_OES_texture_half_float
-        {GL_RGB, GL_RGB, GL_FLOAT},
-        {GL_RGBA, GL_RGBA, GL_FLOAT},
-        {GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_FLOAT},
-        {GL_LUMINANCE, GL_LUMINANCE, GL_FLOAT},
-        {GL_ALPHA, GL_ALPHA, GL_FLOAT},
-        {GL_RGB, GL_RGB, GL_HALF_FLOAT_OES},
-        {GL_RGBA, GL_RGBA, GL_HALF_FLOAT_OES},
-        {GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_HALF_FLOAT_OES},
-        {GL_LUMINANCE, GL_LUMINANCE, GL_HALF_FLOAT_OES},
-        {GL_ALPHA, GL_ALPHA, GL_HALF_FLOAT_OES},
+        FormatType{GL_RGB, GL_RGB, GL_FLOAT},
+        FormatType{GL_RGBA, GL_RGBA, GL_FLOAT},
+        FormatType{GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_FLOAT},
+        FormatType{GL_LUMINANCE, GL_LUMINANCE, GL_FLOAT},
+        FormatType{GL_ALPHA, GL_ALPHA, GL_FLOAT},
+        FormatType{GL_RGB, GL_RGB, GL_HALF_FLOAT_OES},
+        FormatType{GL_RGBA, GL_RGBA, GL_HALF_FLOAT_OES},
+        FormatType{GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_HALF_FLOAT_OES},
+        FormatType{GL_LUMINANCE, GL_LUMINANCE, GL_HALF_FLOAT_OES},
+        FormatType{GL_ALPHA, GL_ALPHA, GL_HALF_FLOAT_OES},
 
         // Exposed by GL_ANGLE_depth_texture
-        {GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT},
-        {GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT},
-        {GL_DEPTH_STENCIL, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8},
+        FormatType{GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT},
+        FormatType{GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT},
+        FormatType{GL_DEPTH_STENCIL, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8},
 
         // Exposed by GL_EXT_sRGB
-        {GL_SRGB, GL_SRGB, GL_UNSIGNED_BYTE},
-        {GL_SRGB_ALPHA, GL_SRGB_ALPHA, GL_UNSIGNED_BYTE},
+        FormatType{GL_SRGB, GL_SRGB, GL_UNSIGNED_BYTE},
+        FormatType{GL_SRGB_ALPHA, GL_SRGB_ALPHA, GL_UNSIGNED_BYTE},
 
         // Exposed by GL_EXT_texture_rg
-        {GL_RED, GL_RED, GL_UNSIGNED_BYTE},
-        {GL_RG, GL_RG, GL_UNSIGNED_BYTE},
-        {GL_RED, GL_RED, GL_FLOAT},
-        {GL_RG, GL_RG, GL_FLOAT},
-        {GL_RED, GL_RED, GL_HALF_FLOAT_OES},
-        {GL_RG, GL_RG, GL_HALF_FLOAT_OES},
+        FormatType{GL_RED, GL_RED, GL_UNSIGNED_BYTE},
+        FormatType{GL_RG, GL_RG, GL_UNSIGNED_BYTE},
+        FormatType{GL_RED, GL_RED, GL_FLOAT},
+        FormatType{GL_RG, GL_RG, GL_FLOAT},
+        FormatType{GL_RED, GL_RED, GL_HALF_FLOAT_OES},
+        FormatType{GL_RG, GL_RG, GL_HALF_FLOAT_OES},
 
         // Exposed by GL_EXT_texture_norm16
-        {GL_RED, GL_RED, GL_UNSIGNED_SHORT},
+        FormatType{GL_RED, GL_RED, GL_UNSIGNED_SHORT},
     };
 
     for (size_t ii = 0; ii < base::size(kSupportedFormatTypes); ++ii) {
@@ -271,7 +271,7 @@ class FormatTypeValidator {
   // This may be accessed from multiple threads.
   bool IsValid(ContextType context_type, GLenum internal_format, GLenum format,
                GLenum type) const {
-    FormatType query = { internal_format, format, type };
+    FormatType query{ internal_format, format, type };
     if (supported_combinations_.find(query) != supported_combinations_.end()) {
       return true;
     }
diff --git a/chromium/gpu/ipc/common/mailbox_mojom_traits.h b/chromium/gpu/ipc/common/mailbox_mojom_traits.h
index 3e1b4f06371..d7ce8d5f479 100644
--- a/chromium/gpu/ipc/common/mailbox_mojom_traits.h
+++ b/chromium/gpu/ipc/common/mailbox_mojom_traits.h
@@ -15,7 +15,7 @@ namespace mojo {
 template <>
 struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
   static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
-    return mailbox.name;
+    return base::span<const int8_t>(mailbox.name);
   }
   static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
 };
diff --git a/chromium/mojo/public/cpp/bindings/receiver_set.h b/chromium/mojo/public/cpp/bindings/receiver_set.h
index 71261fb4413..7dc434a662f 100644
--- a/chromium/mojo/public/cpp/bindings/receiver_set.h
+++ b/chromium/mojo/public/cpp/bindings/receiver_set.h
@@ -96,6 +96,8 @@ class ReceiverSetBase {
   using PreDispatchCallback = base::RepeatingCallback<void(const Context&)>;
 
   ReceiverSetBase() = default;
+  ReceiverSetBase(ReceiverSetBase&&) = default;
+  ReceiverSetBase& operator=(ReceiverSetBase&&) = default;
 
   // Sets a callback to be invoked any time a receiver in the set is
   // disconnected. The callback is invoked *after* the receiver in question
diff --git a/chromium/net/base/mime_util.cc b/chromium/net/base/mime_util.cc
index 09a10df7910..d808ae8852d 100644
--- a/chromium/net/base/mime_util.cc
+++ b/chromium/net/base/mime_util.cc
@@ -594,9 +594,9 @@ struct StandardType {
   const char* const leading_mime_type;
   base::span<const char* const> standard_types;
 };
-static const StandardType kStandardTypes[] = {{"image/", kStandardImageTypes},
-                                              {"audio/", kStandardAudioTypes},
-                                              {"video/", kStandardVideoTypes},
+static const StandardType kStandardTypes[] = {{"image/", base::span<const char* const>(kStandardImageTypes)},
+                                              {"audio/", base::span<const char* const>(kStandardAudioTypes)},
+                                              {"video/", base::span<const char* const>(kStandardVideoTypes)},
                                               {nullptr, {}}};
 
 // GetExtensionsFromHardCodedMappings() adds file extensions (without a leading
diff --git a/chromium/net/cert/cert_verify_proc.cc b/chromium/net/cert/cert_verify_proc.cc
index 0d0bfee61e9..a99c2bb0b0e 100644
--- a/chromium/net/cert/cert_verify_proc.cc
+++ b/chromium/net/cert/cert_verify_proc.cc
@@ -782,7 +782,7 @@ bool CertVerifyProc::HasNameConstraintsViolation(
           {{0x86, 0xc1, 0x3a, 0x34, 0x08, 0xdd, 0x1a, 0xa7, 0x7e, 0xe8, 0xb6,
             0x94, 0x7c, 0x03, 0x95, 0x87, 0x72, 0xf5, 0x31, 0x24, 0x8c, 0x16,
             0x27, 0xbe, 0xfb, 0x2c, 0x4f, 0x4b, 0x04, 0xd0, 0x44, 0x96}},
-          kDomainsANSSI,
+          base::span<const base::StringPiece>(kDomainsANSSI),
       },
       // C=IN, O=India PKI, CN=CCA India 2007
       // Expires: July 4th 2015.
@@ -792,7 +792,7 @@ bool CertVerifyProc::HasNameConstraintsViolation(
           {{0x7e, 0x6a, 0xcd, 0x85, 0x3c, 0xac, 0xc6, 0x93, 0x2e, 0x9b, 0x51,
             0x9f, 0xda, 0xd1, 0xbe, 0xb5, 0x15, 0xed, 0x2a, 0x2d, 0x00, 0x25,
             0xcf, 0xd3, 0x98, 0xc3, 0xac, 0x1f, 0x0d, 0xbb, 0x75, 0x4b}},
-          kDomainsIndiaCCA,
+          base::span<const base::StringPiece>(kDomainsIndiaCCA),
       },
       // C=IN, O=India PKI, CN=CCA India 2011
       // Expires: March 11 2016.
@@ -802,7 +802,7 @@ bool CertVerifyProc::HasNameConstraintsViolation(
           {{0x42, 0xa7, 0x09, 0x84, 0xff, 0xd3, 0x99, 0xc4, 0xea, 0xf0, 0xe7,
             0x02, 0xa4, 0x4b, 0xef, 0x2a, 0xd8, 0xa7, 0x9b, 0x8b, 0xf4, 0x64,
             0x8f, 0x6b, 0xb2, 0x10, 0xe1, 0x23, 0xfd, 0x07, 0x57, 0x93}},
-          kDomainsIndiaCCA,
+          base::span<const base::StringPiece>(kDomainsIndiaCCA),
       },
       // C=IN, O=India PKI, CN=CCA India 2014
       // Expires: March 5 2024.
@@ -812,7 +812,7 @@ bool CertVerifyProc::HasNameConstraintsViolation(
           {{0x9c, 0xf4, 0x70, 0x4f, 0x3e, 0xe5, 0xa5, 0x98, 0x94, 0xb1, 0x6b,
             0xf0, 0x0c, 0xfe, 0x73, 0xd5, 0x88, 0xda, 0xe2, 0x69, 0xf5, 0x1d,
             0xe6, 0x6a, 0x4b, 0xa7, 0x74, 0x46, 0xee, 0x2b, 0xd1, 0xf7}},
-          kDomainsIndiaCCA,
+          base::span<const base::StringPiece>(kDomainsIndiaCCA),
       },
       // Not a real certificate - just for testing.
       // net/data/ssl/certificates/name_constraint_*.pem
@@ -820,7 +820,7 @@ bool CertVerifyProc::HasNameConstraintsViolation(
           {{0x8e, 0x9b, 0x14, 0x9f, 0x01, 0x45, 0x4c, 0xee, 0xde, 0xfa, 0x5e,
             0x73, 0x40, 0x36, 0x21, 0xba, 0xd9, 0x1f, 0xee, 0xe0, 0x3e, 0x74,
             0x25, 0x6c, 0x59, 0xf4, 0x6f, 0xbf, 0x45, 0x03, 0x5f, 0x8d}},
-          kDomainsTest,
+          base::span<const base::StringPiece>(kDomainsTest),
       },
   };
 
diff --git a/chromium/net/third_party/quiche/src/quic/core/crypto/transport_parameters.h b/chromium/net/third_party/quiche/src/quic/core/crypto/transport_parameters.h
index 22dc252405c..1c8ece104a1 100644
--- a/chromium/net/third_party/quiche/src/quic/core/crypto/transport_parameters.h
+++ b/chromium/net/third_party/quiche/src/quic/core/crypto/transport_parameters.h
@@ -26,7 +26,7 @@ struct QUIC_EXPORT_PRIVATE TransportParameters {
   // The identifier used to differentiate transport parameters.
   enum TransportParameterId : uint16_t;
   // A map used to specify custom parameters.
-  using ParameterMap = QuicUnorderedMap<TransportParameterId, std::string>;
+  typedef QuicUnorderedMap<uint16_t, std::string> ParameterMap;
   // Represents an individual QUIC transport parameter that only encodes a
   // variable length integer. Can only be created inside the constructor for
   // TransportParameters.
diff --git a/chromium/services/image_annotation/public/cpp/image_processor.h b/chromium/services/image_annotation/public/cpp/image_processor.h
index f2a1e783cb0..0b8e4e36385 100644
--- a/chromium/services/image_annotation/public/cpp/image_processor.h
+++ b/chromium/services/image_annotation/public/cpp/image_processor.h
@@ -27,6 +27,7 @@ class ImageProcessor : public mojom::ImageProcessor {
   // TODO(crbug.com/916420): accept a more sophisticated interface to fetch
   //                         pixels; this will be required for iOS, where pixel
   //                         access entails a full image redownload.
+  ImageProcessor() = default;
   explicit ImageProcessor(base::RepeatingCallback<SkBitmap()> get_pixels);
   ~ImageProcessor() override;
   ImageProcessor(ImageProcessor&&) = default;
@@ -50,7 +51,7 @@ class ImageProcessor : public mojom::ImageProcessor {
   // The quality parameter to use when encoding images before transmission.
   static constexpr int kJpgQuality = 65;
 
-  const base::RepeatingCallback<SkBitmap()> get_pixels_;
+  base::RepeatingCallback<SkBitmap()> get_pixels_;
 
   scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
 
diff --git a/chromium/services/viz/public/cpp/compositing/quads_mojom_traits.h b/chromium/services/viz/public/cpp/compositing/quads_mojom_traits.h
index 7174c8c4c22..e7564705587 100644
--- a/chromium/services/viz/public/cpp/compositing/quads_mojom_traits.h
+++ b/chromium/services/viz/public/cpp/compositing/quads_mojom_traits.h
@@ -382,7 +382,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> {
   static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
     const viz::TextureDrawQuad* quad =
         viz::TextureDrawQuad::MaterialCast(&input);
-    return quad->vertex_opacity;
+    return base::span<const float>(quad->vertex_opacity);
   }
 
   static bool y_flipped(const viz::DrawQuad& input) {
diff --git a/chromium/third_party/angle/src/compiler/translator/IntermNode.cpp b/chromium/third_party/angle/src/compiler/translator/IntermNode.cpp
index c551615527d..8bbaf0a3d29 100644
--- a/chromium/third_party/angle/src/compiler/translator/IntermNode.cpp
+++ b/chromium/third_party/angle/src/compiler/translator/IntermNode.cpp
@@ -405,9 +405,9 @@ bool TIntermAggregate::replaceChildNode(TIntermNode *original, TIntermNode *repl
     return replaceChildNodeInternal(original, replacement);
 }
 
-TIntermBlock::TIntermBlock(const TIntermBlock &node)
+TIntermBlock::TIntermBlock(const TIntermBlock &block)
 {
-    for (TIntermNode *node : node.mStatements)
+    for (TIntermNode *node : block.mStatements)
     {
         mStatements.push_back(node->deepCopy());
     }
diff --git a/chromium/third_party/angle/src/compiler/translator/SymbolTable_autogen.cpp b/chromium/third_party/angle/src/compiler/translator/SymbolTable_autogen.cpp
index 5f109ce3c06..ab504f9104b 100644
--- a/chromium/third_party/angle/src/compiler/translator/SymbolTable_autogen.cpp
+++ b/chromium/third_party/angle/src/compiler/translator/SymbolTable_autogen.cpp
@@ -18,6 +18,14 @@
 #include "compiler/translator/SymbolTable.h"
 #include "compiler/translator/tree_util/BuiltIn.h"
 
+#ifdef isinf
+#undef isinf
+#endif
+
+#ifdef isnan
+#undef isnan
+#endif
+
 namespace sh
 {
 using Resources = ShBuiltInResources;
diff --git a/chromium/third_party/blink/renderer/core/css/parser/css_parser_context.cc b/chromium/third_party/blink/renderer/core/css/parser/css_parser_context.cc
index 2c9766dd5a4..550c728da4a 100644
--- a/chromium/third_party/blink/renderer/core/css/parser/css_parser_context.cc
+++ b/chromium/third_party/blink/renderer/core/css/parser/css_parser_context.cc
@@ -87,7 +87,7 @@ CSSParserContext::CSSParserContext(CSSParserMode mode,
                        secure_context_mode,
                        kDoNotCheckContentSecurityPolicy,
                        use_counter_document,
-                       ResourceFetchRestriction::kNone) {}
+                       blink::ResourceFetchRestriction::kNone) {}
 
 CSSParserContext::CSSParserContext(const Document& document)
     : CSSParserContext(document,
@@ -146,7 +146,7 @@ CSSParserContext::CSSParserContext(const ExecutionContext& context)
                            ? kDoNotCheckContentSecurityPolicy
                            : kCheckContentSecurityPolicy,
                        DynamicTo<Document>(context),
-                       ResourceFetchRestriction::kNone) {}
+                       blink::ResourceFetchRestriction::kNone) {}
 
 CSSParserContext::CSSParserContext(
     const KURL& base_url,
diff --git a/chromium/third_party/blink/renderer/core/css/parser/css_parser_context.h b/chromium/third_party/blink/renderer/core/css/parser/css_parser_context.h
index 17f30d7bcf5..f74c7806976 100644
--- a/chromium/third_party/blink/renderer/core/css/parser/css_parser_context.h
+++ b/chromium/third_party/blink/renderer/core/css/parser/css_parser_context.h
@@ -57,8 +57,8 @@ class CORE_EXPORT CSSParserContext final
                    network::mojom::ReferrerPolicy referrer_policy_override,
                    const WTF::TextEncoding& charset = WTF::TextEncoding(),
                    SelectorProfile = kLiveProfile,
-                   ResourceFetchRestriction resource_fetch_restriction =
-                       ResourceFetchRestriction::kNone);
+                   blink::ResourceFetchRestriction resource_fetch_restriction =
+                       blink::ResourceFetchRestriction::kNone);
 
   // This is used for workers, where we don't have a document.
   CSSParserContext(const ExecutionContext& context);
@@ -75,7 +75,7 @@ class CORE_EXPORT CSSParserContext final
                    SecureContextMode,
                    ContentSecurityPolicyDisposition,
                    const Document* use_counter_document,
-                   ResourceFetchRestriction resource_fetch_restriction);
+                   blink::ResourceFetchRestriction resource_fetch_restriction);
 
   bool operator==(const CSSParserContext&) const;
   bool operator!=(const CSSParserContext& other) const {
@@ -88,7 +88,7 @@ class CORE_EXPORT CSSParserContext final
   const WTF::TextEncoding& Charset() const { return charset_; }
   const Referrer& GetReferrer() const { return referrer_; }
   bool IsHTMLDocument() const { return is_html_document_; }
-  enum ResourceFetchRestriction ResourceFetchRestriction() const {
+  blink::ResourceFetchRestriction ResourceFetchRestriction() const {
     return resource_fetch_restriction_;
   }
   bool IsLiveProfile() const { return profile_ == kLiveProfile; }
@@ -158,7 +158,7 @@ class CORE_EXPORT CSSParserContext final
 
   // Flag indicating whether images with a URL scheme other than "data" are
   // allowed.
-  const enum ResourceFetchRestriction resource_fetch_restriction_;
+  const blink::ResourceFetchRestriction resource_fetch_restriction_;
 };
 
 CORE_EXPORT const CSSParserContext* StrictCSSParserContext(SecureContextMode);
diff --git a/chromium/third_party/blink/renderer/core/fetch/fetch_response_data.cc b/chromium/third_party/blink/renderer/core/fetch/fetch_response_data.cc
index 18dbcd3b0e6..ea22154ecaa 100644
--- a/chromium/third_party/blink/renderer/core/fetch/fetch_response_data.cc
+++ b/chromium/third_party/blink/renderer/core/fetch/fetch_response_data.cc
@@ -41,7 +41,7 @@ FetchResponseData* FetchResponseData::Create() {
   // message is the empty byte sequence, header list is an empty header list,
   // and body is null."
   return MakeGarbageCollected<FetchResponseData>(
-      Type::kDefault, ResponseSource::kUnspecified, 200, g_empty_atom);
+      Type::kDefault, network::mojom::FetchResponseSource::kUnspecified, 200, g_empty_atom);
 }
 
 FetchResponseData* FetchResponseData::CreateNetworkErrorResponse() {
@@ -49,7 +49,7 @@ FetchResponseData* FetchResponseData::CreateNetworkErrorResponse() {
   // is always the empty byte sequence, header list is aways an empty list,
   // and body is always null."
   return MakeGarbageCollected<FetchResponseData>(
-      Type::kError, ResponseSource::kUnspecified, 0, g_empty_atom);
+      Type::kError, network::mojom::FetchResponseSource::kUnspecified, 0, g_empty_atom);
 }
 
 FetchResponseData* FetchResponseData::CreateWithBuffer(
diff --git a/chromium/third_party/blink/renderer/platform/media_capabilities/web_media_capabilities_key_system_configuration.h b/chromium/third_party/blink/renderer/platform/media_capabilities/web_media_capabilities_key_system_configuration.h
index 7e1c5b0bdde..23e31e2ae18 100644
--- a/chromium/third_party/blink/renderer/platform/media_capabilities/web_media_capabilities_key_system_configuration.h
+++ b/chromium/third_party/blink/renderer/platform/media_capabilities/web_media_capabilities_key_system_configuration.h
@@ -27,8 +27,8 @@ struct WebMediaCapabilitiesKeySystemConfiguration {
 
   // Robustness properties are optional and will contain the empty string if not
   // set. These values are not verified.
-  WebString audio_robustness = "";
-  WebString video_robustness = "";
+  WebString audio_robustness = WTF::String("");
+  WebString video_robustness = WTF::String("");
 
   // These two properties are optional and will be set to
   // WebMediaKeySystemConfiguration::Requirement::kOptional if invalid or not
diff --git a/chromium/ui/events/blink/prediction/filter_factory.h b/chromium/ui/events/blink/prediction/filter_factory.h
index 8892cef23e6..204bf48addb 100644
--- a/chromium/ui/events/blink/prediction/filter_factory.h
+++ b/chromium/ui/events/blink/prediction/filter_factory.h
@@ -40,8 +40,8 @@ struct FilterParamMapKey {
 // in a hashmap
 struct FilterParamMapKeyHash {
   std::size_t operator()(const FilterParamMapKey& k) const {
-    return std::hash<input_prediction::FilterType>{}(k.filter_type) ^
-           std::hash<input_prediction::PredictorType>{}(k.predictor_type);
+    return std::hash<int>{}(int(k.filter_type)) ^
+           std::hash<int>{}(int(k.predictor_type));
   }
 };
 
diff --git a/chromium/ui/native_theme/native_theme_base.cc b/chromium/ui/native_theme/native_theme_base.cc
index d0d2160588b..a991fadcdce 100644
--- a/chromium/ui/native_theme/native_theme_base.cc
+++ b/chromium/ui/native_theme/native_theme_base.cc
@@ -1099,7 +1099,7 @@ SkColor NativeThemeBase::OutlineColor(SkScalar* hsv1, SkScalar* hsv2) const {
   SkScalar min_diff =
       base::ClampToRange((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
   SkScalar diff =
-      base::ClampToRange(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
+      base::ClampToRange(fabsf(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
 
   if (hsv1[2] + hsv2[2] > 1.0)
     diff = -diff;