Fixes for jumbo build

Fixes necessary to make jumbo build work

Change-Id: I1551ddeaa15fdc4e9db72e86ea49191193cb4964
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

95 files changed, 585 insertions, 473 deletions

diff --git a/chromium/base/BUILD.gn b/chromium/base/BUILD.gn
index cb9dfb9702f..03c341d8dbe 100644
--- a/chromium/base/BUILD.gn
+++ b/chromium/base/BUILD.gn
@@ -993,6 +993,10 @@ jumbo_component("base") {
     }
   }
 
+  jumbo_excluded_sources = [
+      "logging.cc",
+  ]
+
   if (is_win) {
     sources += [
       "debug/close_handle_hook_win.cc",
@@ -1156,6 +1160,9 @@ jumbo_component("base") {
       "win/wrapped_window_proc.cc",
       "win/wrapped_window_proc.h",
     ]
+    jumbo_excluded_sources += [
+      "logging_win.cc",
+    ]
   }
 
   if (is_mac) {
@@ -1305,6 +1312,7 @@ jumbo_component("base") {
       "process/process_metrics_linux.cc",
       "threading/platform_thread_linux.cc",
     ]
+    jumbo_excluded_sources += [ "process/memory_linux.cc" ]
   }
 
   if (!is_nacl) {
@@ -1958,6 +1966,8 @@ jumbo_component("base") {
         "allocator/partition_allocator/thread_cache.h",
         "allocator/partition_allocator/yield_processor.h",
       ]
+      jumbo_excluded_sources += [ "allocator/partition_allocator/random.cc", ]
+
       if (is_win) {
         sources += [
           "allocator/partition_allocator/page_allocator_internals_win.h",
@@ -2010,6 +2020,11 @@ jumbo_component("base") {
       "file_descriptor_store.h",
     ]
 
+    # winternl.h and NTSecAPI.h have different definitions of UNICODE_STRING.
+    # There's only one client of NTSecAPI.h in base but several of winternl.h,
+    # so exclude the NTSecAPI.h one.
+    jumbo_excluded_sources += [ "rand_util_win.cc" ]
+
     deps += [ "//base/win:base_win_buildflags" ]
 
     data_deps += [ "//build/win:runtime_libs" ]
diff --git a/chromium/cc/metrics/jank_metrics.cc b/chromium/cc/metrics/jank_metrics.cc
index 8922e14f484..9201516a7ab 100644
--- a/chromium/cc/metrics/jank_metrics.cc
+++ b/chromium/cc/metrics/jank_metrics.cc
@@ -19,10 +19,10 @@ namespace cc {
 
 namespace {
 
-constexpr int kBuiltinSequenceNum =
+constexpr int kBuiltinJankSequenceNum =
     static_cast<int>(FrameSequenceTrackerType::kMaxType) + 1;
-constexpr int kMaximumJankHistogramIndex = 2 * kBuiltinSequenceNum;
-constexpr int kMaximumStaleHistogramIndex = kBuiltinSequenceNum;
+constexpr int kMaximumJankHistogramIndex = 2 * kBuiltinJankSequenceNum;
+constexpr int kMaximumStaleHistogramIndex = kBuiltinJankSequenceNum;
 
 constexpr base::TimeDelta kStaleHistogramMin =
     base::TimeDelta::FromMicroseconds(1);
@@ -56,7 +56,7 @@ int GetIndexForJankMetric(FrameSequenceMetrics::ThreadType thread_type,
     return static_cast<int>(type);
 
   DCHECK_EQ(thread_type, FrameSequenceMetrics::ThreadType::kCompositor);
-  return static_cast<int>(type) + kBuiltinSequenceNum;
+  return static_cast<int>(type) + kBuiltinJankSequenceNum;
 }
 
 int GetIndexForStaleMetric(FrameSequenceTrackerType type) {
diff --git a/chromium/components/guest_view/browser/BUILD.gn b/chromium/components/guest_view/browser/BUILD.gn
index f60ffe5ed78..d9c78359619 100644
--- a/chromium/components/guest_view/browser/BUILD.gn
+++ b/chromium/components/guest_view/browser/BUILD.gn
@@ -8,7 +8,9 @@
 # remove this assert.
 assert(!is_android && !is_ios)
 
-static_library("browser") {
+import("//build/config/jumbo.gni")
+
+jumbo_static_library("browser") {
   output_name = "guest_view_browser"
   sources = [
     "//components/guest_view/browser/bad_message.cc",
diff --git a/chromium/components/guest_view/renderer/BUILD.gn b/chromium/components/guest_view/renderer/BUILD.gn
index 13065887efd..d79abfecbf7 100644
--- a/chromium/components/guest_view/renderer/BUILD.gn
+++ b/chromium/components/guest_view/renderer/BUILD.gn
@@ -8,7 +8,9 @@
 # remove this assert.
 assert(!is_android && !is_ios)
 
-static_library("renderer") {
+import("//build/config/jumbo.gni")
+
+jumbo_static_library("renderer") {
   sources = [
     "guest_view_container.cc",
     "guest_view_container.h",
diff --git a/chromium/components/metrics/metrics_state_manager.cc b/chromium/components/metrics/metrics_state_manager.cc
index 77a708d3c76..10de3bcf0b2 100644
--- a/chromium/components/metrics/metrics_state_manager.cc
+++ b/chromium/components/metrics/metrics_state_manager.cc
@@ -41,7 +41,7 @@ namespace {
 // The argument used to generate a non-identifying entropy source. We want no
 // more than 13 bits of entropy, so use this max to return a number in the range
 // [0, 7999] as the entropy source (12.97 bits of entropy).
-const int kMaxLowEntropySize = 8000;
+const int kThisMaxLowEntropySize = 8000;
 
 int64_t ReadEnabledDate(PrefService* local_state) {
   return local_state->GetInt64(prefs::kMetricsReportingEnabledTimestamp);
@@ -327,7 +327,7 @@ std::unique_ptr<const base::FieldTrial::EntropyProvider>
 MetricsStateManager::CreateLowEntropyProvider() {
   int source = GetLowEntropySource();
   return std::make_unique<variations::NormalizedMurmurHashEntropyProvider>(
-      base::checked_cast<uint16_t>(source), kMaxLowEntropySize);
+      base::checked_cast<uint16_t>(source), kThisMaxLowEntropySize);
 }
 
 // static
diff --git a/chromium/components/performance_manager/BUILD.gn b/chromium/components/performance_manager/BUILD.gn
index a13b9c75472..7144075e944 100644
--- a/chromium/components/performance_manager/BUILD.gn
+++ b/chromium/components/performance_manager/BUILD.gn
@@ -2,13 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/jumbo.gni")
 import("//third_party/protobuf/proto_library.gni")
 
 proto_library("site_data_proto") {
   sources = [ "persistence/site_data/site_data.proto" ]
 }
 
-static_library("performance_manager") {
+jumbo_static_library("performance_manager") {
   sources = [
     "binders.cc",
     "decorators/frame_visibility_decorator.cc",
@@ -229,6 +230,7 @@ static_library("performance_manager") {
       "public/persistence/site_data/feature_usage.h",
       "public/persistence/site_data/site_data_reader.h",
     ]
+    jumbo_excluded_sources = [ "decorators/site_data_recorder.cc" ]
 
     public_deps += [
       ":site_data_proto",
diff --git a/chromium/components/performance_manager/decorators/page_live_state_decorator.cc b/chromium/components/performance_manager/decorators/page_live_state_decorator.cc
index b2b9fbde916..184342448b7 100644
--- a/chromium/components/performance_manager/decorators/page_live_state_decorator.cc
+++ b/chromium/components/performance_manager/decorators/page_live_state_decorator.cc
@@ -191,8 +191,6 @@ class PageLiveStateDataImpl
   const PageNode* const page_node_;
 };
 
-const char kDescriberName[] = "PageLiveStateDecorator";
-
 }  // namespace
 
 // static
@@ -276,7 +274,7 @@ void PageLiveStateDecorator::SetWasDiscarded(content::WebContents* contents,
 
 void PageLiveStateDecorator::OnPassedToGraph(Graph* graph) {
   graph->GetNodeDataDescriberRegistry()->RegisterDescriber(this,
-                                                           kDescriberName);
+                                                           "PageLiveStateDecorator");
 }
 
 void PageLiveStateDecorator::OnTakenFromGraph(Graph* graph) {
diff --git a/chromium/components/performance_manager/decorators/page_load_tracker_decorator.cc b/chromium/components/performance_manager/decorators/page_load_tracker_decorator.cc
index e4531867398..ece6df68140 100644
--- a/chromium/components/performance_manager/decorators/page_load_tracker_decorator.cc
+++ b/chromium/components/performance_manager/decorators/page_load_tracker_decorator.cc
@@ -67,8 +67,6 @@ const char* ToString(LoadIdleState state) {
   }
 }
 
-const char kDescriberName[] = "PageLoadTrackerDecorator";
-
 }  // namespace
 
 // static
@@ -92,7 +90,7 @@ void PageLoadTrackerDecorator::OnNetworkAlmostIdleChanged(
 void PageLoadTrackerDecorator::OnPassedToGraph(Graph* graph) {
   RegisterObservers(graph);
   graph->GetNodeDataDescriberRegistry()->RegisterDescriber(this,
-                                                           kDescriberName);
+                                                           "PageLoadTrackerDecorator");
 }
 
 void PageLoadTrackerDecorator::OnTakenFromGraph(Graph* graph) {
diff --git a/chromium/components/performance_manager/decorators/tab_properties_decorator.cc b/chromium/components/performance_manager/decorators/tab_properties_decorator.cc
index d629cb88243..b6131de21c8 100644
--- a/chromium/components/performance_manager/decorators/tab_properties_decorator.cc
+++ b/chromium/components/performance_manager/decorators/tab_properties_decorator.cc
@@ -40,8 +40,6 @@ class TabPropertiesDataImpl
   bool is_tab_ = false;
 };
 
-const char kDescriberName[] = "TabPropertiesDecorator";
-
 }  // namespace
 
 void TabPropertiesDecorator::SetIsTab(content::WebContents* contents,
@@ -60,7 +58,7 @@ void TabPropertiesDecorator::SetIsTabForTesting(PageNode* page_node,
 
 void TabPropertiesDecorator::OnPassedToGraph(Graph* graph) {
   graph->GetNodeDataDescriberRegistry()->RegisterDescriber(this,
-                                                           kDescriberName);
+                                                           "TabPropertiesDecorator");
 }
 
 void TabPropertiesDecorator::OnTakenFromGraph(Graph* graph) {
diff --git a/chromium/components/performance_manager/execution_context_priority/frame_audible_voter.cc b/chromium/components/performance_manager/execution_context_priority/frame_audible_voter.cc
index 238b0415166..677eaab6693 100644
--- a/chromium/components/performance_manager/execution_context_priority/frame_audible_voter.cc
+++ b/chromium/components/performance_manager/execution_context_priority/frame_audible_voter.cc
@@ -13,7 +13,7 @@ namespace execution_context_priority {
 
 namespace {
 
-const execution_context::ExecutionContext* GetExecutionContext(
+const execution_context::ExecutionContext* GetExecutionContext2(
     const FrameNode* frame_node) {
   return execution_context::ExecutionContextRegistry::GetFromGraph(
              frame_node->GetGraph())
@@ -43,16 +43,16 @@ void FrameAudibleVoter::SetVotingChannel(VotingChannel voting_channel) {
 
 void FrameAudibleVoter::OnFrameNodeAdded(const FrameNode* frame_node) {
   const Vote vote = GetVote(frame_node->IsAudible());
-  voting_channel_.SubmitVote(GetExecutionContext(frame_node), vote);
+  voting_channel_.SubmitVote(GetExecutionContext2(frame_node), vote);
 }
 
 void FrameAudibleVoter::OnBeforeFrameNodeRemoved(const FrameNode* frame_node) {
-  voting_channel_.InvalidateVote(GetExecutionContext(frame_node));
+  voting_channel_.InvalidateVote(GetExecutionContext2(frame_node));
 }
 
 void FrameAudibleVoter::OnIsAudibleChanged(const FrameNode* frame_node) {
   const Vote new_vote = GetVote(frame_node->IsAudible());
-  voting_channel_.ChangeVote(GetExecutionContext(frame_node), new_vote);
+  voting_channel_.ChangeVote(GetExecutionContext2(frame_node), new_vote);
 }
 
 }  // namespace execution_context_priority
diff --git a/chromium/components/performance_manager/execution_context_priority/frame_visibility_voter.cc b/chromium/components/performance_manager/execution_context_priority/frame_visibility_voter.cc
index 2d7634a998d..c9757b537f3 100644
--- a/chromium/components/performance_manager/execution_context_priority/frame_visibility_voter.cc
+++ b/chromium/components/performance_manager/execution_context_priority/frame_visibility_voter.cc
@@ -14,7 +14,7 @@ namespace execution_context_priority {
 
 namespace {
 
-const execution_context::ExecutionContext* GetExecutionContext(
+const execution_context::ExecutionContext* GetExecutionContext5(
     const FrameNode* frame_node) {
   return execution_context::ExecutionContextRegistry::GetFromGraph(
              frame_node->GetGraph())
@@ -23,7 +23,7 @@ const execution_context::ExecutionContext* GetExecutionContext(
 
 // Returns a vote with the appropriate priority depending on the frame's
 // |visibility|.
-Vote GetVote(FrameNode::Visibility visibility) {
+Vote GetVote2(FrameNode::Visibility visibility) {
   base::TaskPriority priority;
   switch (visibility) {
     case FrameNode::Visibility::kUnknown:
@@ -53,25 +53,25 @@ void FrameVisibilityVoter::SetVotingChannel(VotingChannel voting_channel) {
 }
 
 void FrameVisibilityVoter::OnFrameNodeAdded(const FrameNode* frame_node) {
-  const Vote vote = GetVote(frame_node->GetVisibility());
-  voting_channel_.SubmitVote(GetExecutionContext(frame_node), vote);
+  const Vote vote = GetVote2(frame_node->GetVisibility());
+  voting_channel_.SubmitVote(GetExecutionContext5(frame_node), vote);
 }
 
 void FrameVisibilityVoter::OnBeforeFrameNodeRemoved(
     const FrameNode* frame_node) {
-  voting_channel_.InvalidateVote(GetExecutionContext(frame_node));
+  voting_channel_.InvalidateVote(GetExecutionContext5(frame_node));
 }
 
 void FrameVisibilityVoter::OnFrameVisibilityChanged(
     const FrameNode* frame_node,
     FrameNode::Visibility previous_value) {
-  const Vote new_vote = GetVote(frame_node->GetVisibility());
+  const Vote new_vote = GetVote2(frame_node->GetVisibility());
 
   // Nothing to change if the new priority is the same as the old one.
-  if (new_vote == GetVote(previous_value))
+  if (new_vote == GetVote2(previous_value))
     return;
 
-  voting_channel_.ChangeVote(GetExecutionContext(frame_node), new_vote);
+  voting_channel_.ChangeVote(GetExecutionContext5(frame_node), new_vote);
 }
 
 }  // namespace execution_context_priority
diff --git a/chromium/components/performance_manager/execution_context_priority/inherit_client_priority_voter.cc b/chromium/components/performance_manager/execution_context_priority/inherit_client_priority_voter.cc
index a1e1ab0bac8..22b0a89cdb7 100644
--- a/chromium/components/performance_manager/execution_context_priority/inherit_client_priority_voter.cc
+++ b/chromium/components/performance_manager/execution_context_priority/inherit_client_priority_voter.cc
@@ -16,14 +16,14 @@ namespace execution_context_priority {
 
 namespace {
 
-const execution_context::ExecutionContext* GetExecutionContext(
+const execution_context::ExecutionContext* GetExecutionContext_ICPV(
     const FrameNode* frame_node) {
   return execution_context::ExecutionContextRegistry::GetFromGraph(
              frame_node->GetGraph())
       ->GetExecutionContextForFrameNode(frame_node);
 }
 
-const execution_context::ExecutionContext* GetExecutionContext(
+const execution_context::ExecutionContext* GetExecutionContext_ICPV(
     const WorkerNode* worker_node) {
   return execution_context::ExecutionContextRegistry::GetFromGraph(
              worker_node->GetGraph())
@@ -50,7 +50,7 @@ void InheritClientPriorityVoter::SetVotingChannel(
 
 void InheritClientPriorityVoter::OnFrameNodeAdded(const FrameNode* frame_node) {
   bool inserted = voting_channels_
-                      .emplace(GetExecutionContext(frame_node),
+                      .emplace(GetExecutionContext_ICPV(frame_node),
                                max_vote_aggregator_.GetVotingChannel())
                       .second;
   DCHECK(inserted);
@@ -60,7 +60,7 @@ void InheritClientPriorityVoter::OnFrameNodeAdded(const FrameNode* frame_node) {
 void InheritClientPriorityVoter::OnBeforeFrameNodeRemoved(
     const FrameNode* frame_node) {
   DCHECK(frame_node->GetChildWorkerNodes().empty());
-  size_t removed = voting_channels_.erase(GetExecutionContext(frame_node));
+  size_t removed = voting_channels_.erase(GetExecutionContext_ICPV(frame_node));
   DCHECK_EQ(removed, 1u);
 }
 
@@ -70,7 +70,7 @@ void InheritClientPriorityVoter::OnPriorityAndReasonChanged(
   // The priority of a frame changed. All its children must inherit the new
   // priority.
 
-  auto it = voting_channels_.find(GetExecutionContext(frame_node));
+  auto it = voting_channels_.find(GetExecutionContext_ICPV(frame_node));
 
   // Unknown |frame_node|. Just ignore it until we get notified of its existence
   // via OnFrameNodeAdded(). This can happen because another voter received the
@@ -86,7 +86,7 @@ void InheritClientPriorityVoter::OnPriorityAndReasonChanged(
   for (const WorkerNode* child_worker_node :
        frame_node->GetChildWorkerNodes()) {
     const ExecutionContext* child_execution_context =
-        GetExecutionContext(child_worker_node);
+        GetExecutionContext_ICPV(child_worker_node);
     voting_channel.ChangeVote(child_execution_context, inherited_vote);
   }
 }
@@ -94,7 +94,7 @@ void InheritClientPriorityVoter::OnPriorityAndReasonChanged(
 void InheritClientPriorityVoter::OnWorkerNodeAdded(
     const WorkerNode* worker_node) {
   bool inserted = voting_channels_
-                      .emplace(GetExecutionContext(worker_node),
+                      .emplace(GetExecutionContext_ICPV(worker_node),
                                max_vote_aggregator_.GetVotingChannel())
                       .second;
   DCHECK(inserted);
@@ -104,7 +104,7 @@ void InheritClientPriorityVoter::OnWorkerNodeAdded(
 void InheritClientPriorityVoter::OnBeforeWorkerNodeRemoved(
     const WorkerNode* worker_node) {
   DCHECK(worker_node->GetChildWorkers().empty());
-  size_t removed = voting_channels_.erase(GetExecutionContext(worker_node));
+  size_t removed = voting_channels_.erase(GetExecutionContext_ICPV(worker_node));
   DCHECK_EQ(removed, 1u);
 }
 
@@ -115,14 +115,14 @@ void InheritClientPriorityVoter::OnClientFrameAdded(
   // priority.
 
   // Get the voting channel for the client.
-  auto it = voting_channels_.find(GetExecutionContext(client_frame_node));
+  auto it = voting_channels_.find(GetExecutionContext_ICPV(client_frame_node));
   DCHECK(it != voting_channels_.end());
   auto* voting_channel = &it->second;
 
   const Vote inherited_vote(
       client_frame_node->GetPriorityAndReason().priority(),
       kPriorityInheritedReason);
-  voting_channel->SubmitVote(GetExecutionContext(worker_node), inherited_vote);
+  voting_channel->SubmitVote(GetExecutionContext_ICPV(worker_node), inherited_vote);
 }
 
 void InheritClientPriorityVoter::OnBeforeClientFrameRemoved(
@@ -132,11 +132,11 @@ void InheritClientPriorityVoter::OnBeforeClientFrameRemoved(
   // vote must be invalidated.
 
   // Get the voting channel for the client.
-  auto it = voting_channels_.find(GetExecutionContext(client_frame_node));
+  auto it = voting_channels_.find(GetExecutionContext_ICPV(client_frame_node));
   DCHECK(it != voting_channels_.end());
   auto* voting_channel = &it->second;
 
-  voting_channel->InvalidateVote(GetExecutionContext(worker_node));
+  voting_channel->InvalidateVote(GetExecutionContext_ICPV(worker_node));
 }
 
 void InheritClientPriorityVoter::OnClientWorkerAdded(
@@ -146,14 +146,14 @@ void InheritClientPriorityVoter::OnClientWorkerAdded(
   // priority.
 
   // Get the voting channel for the client.
-  auto it = voting_channels_.find(GetExecutionContext(client_worker_node));
+  auto it = voting_channels_.find(GetExecutionContext_ICPV(client_worker_node));
   DCHECK(it != voting_channels_.end());
   auto* voting_channel = &it->second;
 
   const Vote inherited_vote(
       client_worker_node->GetPriorityAndReason().priority(),
       kPriorityInheritedReason);
-  voting_channel->SubmitVote(GetExecutionContext(worker_node), inherited_vote);
+  voting_channel->SubmitVote(GetExecutionContext_ICPV(worker_node), inherited_vote);
 }
 
 void InheritClientPriorityVoter::OnBeforeClientWorkerRemoved(
@@ -163,11 +163,11 @@ void InheritClientPriorityVoter::OnBeforeClientWorkerRemoved(
   // vote must be invalidated.
 
   // Get the voting channel for the client.
-  auto it = voting_channels_.find(GetExecutionContext(client_worker_node));
+  auto it = voting_channels_.find(GetExecutionContext_ICPV(client_worker_node));
   DCHECK(it != voting_channels_.end());
   auto* voting_channel = &it->second;
 
-  voting_channel->InvalidateVote(GetExecutionContext(worker_node));
+  voting_channel->InvalidateVote(GetExecutionContext_ICPV(worker_node));
 }
 
 void InheritClientPriorityVoter::OnPriorityAndReasonChanged(
@@ -176,7 +176,7 @@ void InheritClientPriorityVoter::OnPriorityAndReasonChanged(
   // The priority of a worker changed. All its children must inherit the new
   // priority.
 
-  auto it = voting_channels_.find(GetExecutionContext(worker_node));
+  auto it = voting_channels_.find(GetExecutionContext_ICPV(worker_node));
 
   // Unknown |worker_node|. Just ignore it until we get notified of its
   // existence via OnWorkerNodeAdded().
@@ -189,7 +189,7 @@ void InheritClientPriorityVoter::OnPriorityAndReasonChanged(
                             kPriorityInheritedReason);
   for (const WorkerNode* child_worker_node : worker_node->GetChildWorkers()) {
     const ExecutionContext* child_execution_context =
-        GetExecutionContext(child_worker_node);
+        GetExecutionContext_ICPV(child_worker_node);
     voting_channel.ChangeVote(child_execution_context, inherited_vote);
   }
 }
diff --git a/chromium/components/performance_manager/graph/frame_node_impl_describer.cc b/chromium/components/performance_manager/graph/frame_node_impl_describer.cc
index 161aaea181c..3c84b68648a 100644
--- a/chromium/components/performance_manager/graph/frame_node_impl_describer.cc
+++ b/chromium/components/performance_manager/graph/frame_node_impl_describer.cc
@@ -17,8 +17,6 @@ namespace performance_manager {
 
 namespace {
 
-const char kDescriberName[] = "FrameNodeImpl";
-
 std::string ViewportIntersectionToString(
     const absl::optional<gfx::Rect>& viewport_intersection) {
   if (!viewport_intersection.has_value())
@@ -45,7 +43,7 @@ FrameNodeImplDescriber::~FrameNodeImplDescriber() = default;
 
 void FrameNodeImplDescriber::OnPassedToGraph(Graph* graph) {
   graph->GetNodeDataDescriberRegistry()->RegisterDescriber(this,
-                                                           kDescriberName);
+                                                           "FrameNodeImpl");
 }
 
 void FrameNodeImplDescriber::OnTakenFromGraph(Graph* graph) {
diff --git a/chromium/components/performance_manager/graph/page_node_impl_describer.cc b/chromium/components/performance_manager/graph/page_node_impl_describer.cc
index 10a4a226a88..42c14e24b64 100644
--- a/chromium/components/performance_manager/graph/page_node_impl_describer.cc
+++ b/chromium/components/performance_manager/graph/page_node_impl_describer.cc
@@ -15,8 +15,6 @@ namespace performance_manager {
 
 namespace {
 
-const char kDescriberName[] = "PageNodeImpl";
-
 const char* FreezingVoteToString(
     absl::optional<freezing::FreezingVote> freezing_vote) {
   if (!freezing_vote)
@@ -32,7 +30,7 @@ PageNodeImplDescriber::~PageNodeImplDescriber() = default;
 
 void PageNodeImplDescriber::OnPassedToGraph(Graph* graph) {
   graph->GetNodeDataDescriberRegistry()->RegisterDescriber(this,
-                                                           kDescriberName);
+                                                           "PageNodeImpl");
 }
 
 void PageNodeImplDescriber::OnTakenFromGraph(Graph* graph) {
diff --git a/chromium/components/performance_manager/graph/process_node_impl_describer.cc b/chromium/components/performance_manager/graph/process_node_impl_describer.cc
index 90f1dbe32d2..b02bebdb054 100644
--- a/chromium/components/performance_manager/graph/process_node_impl_describer.cc
+++ b/chromium/components/performance_manager/graph/process_node_impl_describer.cc
@@ -24,8 +24,6 @@ namespace performance_manager {
 
 namespace {
 
-const char kDescriberName[] = "ProcessNodeImpl";
-
 base::Value GetProcessValueDict(const base::Process& process) {
   base::Value ret(base::Value::Type::DICTIONARY);
 
@@ -82,7 +80,7 @@ base::Value GetProcessValueDict(const base::Process& process) {
 
 void ProcessNodeImplDescriber::OnPassedToGraph(Graph* graph) {
   graph->GetNodeDataDescriberRegistry()->RegisterDescriber(this,
-                                                           kDescriberName);
+                                                           "ProcessNodeImpl");
 }
 
 void ProcessNodeImplDescriber::OnTakenFromGraph(Graph* graph) {
diff --git a/chromium/components/performance_manager/graph/worker_node_impl_describer.cc b/chromium/components/performance_manager/graph/worker_node_impl_describer.cc
index fad7f477d57..47b80396a21 100644
--- a/chromium/components/performance_manager/graph/worker_node_impl_describer.cc
+++ b/chromium/components/performance_manager/graph/worker_node_impl_describer.cc
@@ -12,8 +12,6 @@ namespace performance_manager {
 
 namespace {
 
-const char kDescriberName[] = "WorkerNode";
-
 const char* WorkerTypeToString(WorkerNode::WorkerType state) {
   switch (state) {
     case WorkerNode::WorkerType::kDedicated:
@@ -29,7 +27,7 @@ const char* WorkerTypeToString(WorkerNode::WorkerType state) {
 
 void WorkerNodeImplDescriber::OnPassedToGraph(Graph* graph) {
   graph->GetNodeDataDescriberRegistry()->RegisterDescriber(this,
-                                                           kDescriberName);
+                                                           "WorkerNode");
 }
 
 void WorkerNodeImplDescriber::OnTakenFromGraph(Graph* graph) {
diff --git a/chromium/components/performance_manager/performance_manager_registry_impl.cc b/chromium/components/performance_manager/performance_manager_registry_impl.cc
index 9f797a123dc..105d52b7bf6 100644
--- a/chromium/components/performance_manager/performance_manager_registry_impl.cc
+++ b/chromium/components/performance_manager/performance_manager_registry_impl.cc
@@ -24,15 +24,15 @@
 
 namespace performance_manager {
 
-namespace {
+namespace performance_manager_registry_impl {
 
 PerformanceManagerRegistryImpl* g_instance = nullptr;
 
 }  // namespace
 
 PerformanceManagerRegistryImpl::PerformanceManagerRegistryImpl() {
-  DCHECK(!g_instance);
-  g_instance = this;
+  DCHECK(!performance_manager_registry_impl::g_instance);
+  performance_manager_registry_impl::g_instance = this;
 
   // The registry should be created after the PerformanceManager.
   DCHECK(PerformanceManager::IsAvailable());
@@ -43,7 +43,7 @@ PerformanceManagerRegistryImpl::~PerformanceManagerRegistryImpl() {
   // TearDown() should have been invoked to reset |g_instance| and clear
   // |web_contents_| and |render_process_user_data_| prior to destroying the
   // registry.
-  DCHECK(!g_instance);
+  DCHECK(!performance_manager_registry_impl::g_instance);
   DCHECK(web_contents_.empty());
   DCHECK(render_process_hosts_.empty());
   DCHECK(pm_owned_.empty());
@@ -54,7 +54,7 @@ PerformanceManagerRegistryImpl::~PerformanceManagerRegistryImpl() {
 
 // static
 PerformanceManagerRegistryImpl* PerformanceManagerRegistryImpl::GetInstance() {
-  return g_instance;
+  return performance_manager_registry_impl::g_instance;
 }
 
 void PerformanceManagerRegistryImpl::AddObserver(
@@ -222,8 +222,8 @@ void PerformanceManagerRegistryImpl::TearDown() {
   for (auto& observer : observers_)
     observer.OnBeforePerformanceManagerDestroyed();
 
-  DCHECK_EQ(g_instance, this);
-  g_instance = nullptr;
+  DCHECK_EQ(performance_manager_registry_impl::g_instance, this);
+  performance_manager_registry_impl::g_instance = nullptr;
 
   // Destroy WorkerNodes before ProcessNodes, because ProcessNode checks that it
   // has no associated WorkerNode when torn down.
diff --git a/chromium/components/performance_manager/persistence/site_data/site_data_cache_factory.cc b/chromium/components/performance_manager/persistence/site_data/site_data_cache_factory.cc
index 440aa963704..908595217bd 100644
--- a/chromium/components/performance_manager/persistence/site_data/site_data_cache_factory.cc
+++ b/chromium/components/performance_manager/persistence/site_data/site_data_cache_factory.cc
@@ -19,29 +19,29 @@
 
 namespace performance_manager {
 
-namespace {
+namespace site_data_cache_factory {
 SiteDataCacheFactory* g_instance = nullptr;
 }  // namespace
 
 SiteDataCacheFactory::SiteDataCacheFactory() {
-  DCHECK(!g_instance);
-  g_instance = this;
+  DCHECK(!site_data_cache_factory::g_instance);
+  site_data_cache_factory::g_instance = this;
 }
 
 SiteDataCacheFactory::~SiteDataCacheFactory() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  DCHECK_EQ(this, g_instance);
+  DCHECK_EQ(this, site_data_cache_factory::g_instance);
   // Clear the cache map before unsetting |g_instance| as this will cause some
   // calls to |SetDataCacheInspectorForBrowserContext|.
   data_cache_map_.clear();
   for (const auto& iter : data_cache_map_)
     DCHECK_EQ(0, iter.second->Size());
-  g_instance = nullptr;
+  site_data_cache_factory::g_instance = nullptr;
 }
 
 // static
 SiteDataCacheFactory* SiteDataCacheFactory::GetInstance() {
-  return g_instance;
+  return site_data_cache_factory::g_instance;
 }
 
 SiteDataCache* SiteDataCacheFactory::GetDataCacheForBrowserContext(
diff --git a/chromium/components/printing/browser/BUILD.gn b/chromium/components/printing/browser/BUILD.gn
index 8ec335074c1..1433bbb409f 100644
--- a/chromium/components/printing/browser/BUILD.gn
+++ b/chromium/components/printing/browser/BUILD.gn
@@ -2,7 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("browser") {
+import("//build/config/jumbo.gni")
+
+jumbo_static_library("browser") {
   sources = [
     "prefs_util.cc",
     "prefs_util.h",
diff --git a/chromium/components/storage_monitor/BUILD.gn b/chromium/components/storage_monitor/BUILD.gn
index 28c1453f963..792730aaab9 100644
--- a/chromium/components/storage_monitor/BUILD.gn
+++ b/chromium/components/storage_monitor/BUILD.gn
@@ -4,8 +4,9 @@
 
 import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
 
-static_library("storage_monitor") {
+jumbo_static_library("storage_monitor") {
   sources = [
     "media_storage_util.cc",
     "media_storage_util.h",
diff --git a/chromium/components/viz/service/BUILD.gn b/chromium/components/viz/service/BUILD.gn
index 597f86bcf8b..599801739c2 100644
--- a/chromium/components/viz/service/BUILD.gn
+++ b/chromium/components/viz/service/BUILD.gn
@@ -206,6 +206,11 @@ viz_component("service") {
     "viz_service_export.h",
   ]
 
+  jumbo_excluded_sources = [
+    "display/display.cc",
+    "display/overlay_processor_on_gpu.cc",
+  ]
+
   defines = [ "VIZ_SERVICE_IMPLEMENTATION" ]
 
   allow_circular_includes_from = [ ":gpu_service_dependencies" ]
diff --git a/chromium/components/viz/service/display_embedder/skia_output_device_webview.cc b/chromium/components/viz/service/display_embedder/skia_output_device_webview.cc
index 016bf808dd7..d884a60cf7b 100644
--- a/chromium/components/viz/service/display_embedder/skia_output_device_webview.cc
+++ b/chromium/components/viz/service/display_embedder/skia_output_device_webview.cc
@@ -18,7 +18,7 @@
 namespace viz {
 
 namespace {
-constexpr auto kSurfaceColorType = kRGBA_8888_SkColorType;
+constexpr auto kMySurfaceColorType = kRGBA_8888_SkColorType;
 }
 
 SkiaOutputDeviceWebView::SkiaOutputDeviceWebView(
@@ -42,9 +42,9 @@ SkiaOutputDeviceWebView::SkiaOutputDeviceWebView(
   DCHECK(context_state_->context());
 
   capabilities_.sk_color_types[static_cast<int>(gfx::BufferFormat::RGBA_8888)] =
-      kSurfaceColorType;
+      kMySurfaceColorType;
   capabilities_.sk_color_types[static_cast<int>(gfx::BufferFormat::BGRA_8888)] =
-      kSurfaceColorType;
+      kMySurfaceColorType;
 }
 
 SkiaOutputDeviceWebView::~SkiaOutputDeviceWebView() = default;
@@ -104,7 +104,7 @@ void SkiaOutputDeviceWebView::InitSkiaSurface(unsigned int fbo) {
   GrGLFramebufferInfo framebuffer_info;
   framebuffer_info.fFBOID = fbo;
   framebuffer_info.fFormat = GL_RGBA8;
-  SkColorType color_type = kSurfaceColorType;
+  SkColorType color_type = kMySurfaceColorType;
 
   GrBackendRenderTarget render_target(size_.width(), size_.height(),
                                       /*sampleCnt=*/0,
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index 4e4afdd4281..d6143756eee 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -24,6 +24,92 @@ import("//printing/buildflags/buildflags.gni")
 import("//third_party/blink/public/public_features.gni")
 import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
 
+jumbo_static_library("devtools_protocol") {
+  configs += [
+    "//build/config:precompiled_headers",
+    "//content:content_implementation",
+  ]
+
+  deps = [
+    "//base",
+    "//content/browser/devtools:devtools_background_services_proto",
+    "//content/browser/devtools:protocol_sources",
+    "//content/common:buildflags",
+    "//third_party/blink/public/mojom:mojom_platform",
+    "//third_party/inspector_protocol:crdtp",
+  ]
+
+  sources = [
+    "$target_gen_dir/devtools/protocol/audits.cc",
+    "$target_gen_dir/devtools/protocol/audits.h",
+    "$target_gen_dir/devtools/protocol/background_service.cc",
+    "$target_gen_dir/devtools/protocol/background_service.h",
+    "$target_gen_dir/devtools/protocol/base_string_adapter.cc",
+    "$target_gen_dir/devtools/protocol/base_string_adapter.h",
+    "$target_gen_dir/devtools/protocol/browser.cc",
+    "$target_gen_dir/devtools/protocol/browser.h",
+    "$target_gen_dir/devtools/protocol/dom.cc",
+    "$target_gen_dir/devtools/protocol/dom.h",
+    "$target_gen_dir/devtools/protocol/emulation.cc",
+    "$target_gen_dir/devtools/protocol/emulation.h",
+    "$target_gen_dir/devtools/protocol/fetch.cc",
+    "$target_gen_dir/devtools/protocol/fetch.h",
+    "$target_gen_dir/devtools/protocol/forward.h",
+    "$target_gen_dir/devtools/protocol/input.cc",
+    "$target_gen_dir/devtools/protocol/input.h",
+    "$target_gen_dir/devtools/protocol/inspector.cc",
+    "$target_gen_dir/devtools/protocol/inspector.h",
+    "$target_gen_dir/devtools/protocol/io.cc",
+    "$target_gen_dir/devtools/protocol/io.h",
+    "$target_gen_dir/devtools/protocol/log.cc",
+    "$target_gen_dir/devtools/protocol/log.h",
+    "$target_gen_dir/devtools/protocol/memory.cc",
+    "$target_gen_dir/devtools/protocol/memory.h",
+    "$target_gen_dir/devtools/protocol/network.cc",
+    "$target_gen_dir/devtools/protocol/network.h",
+    "$target_gen_dir/devtools/protocol/overlay.cc",
+    "$target_gen_dir/devtools/protocol/overlay.h",
+    "$target_gen_dir/devtools/protocol/page.cc",
+    "$target_gen_dir/devtools/protocol/page.h",
+    "$target_gen_dir/devtools/protocol/protocol.cc",
+    "$target_gen_dir/devtools/protocol/protocol.h",
+    "$target_gen_dir/devtools/protocol/runtime.cc",
+    "$target_gen_dir/devtools/protocol/runtime.h",
+    "$target_gen_dir/devtools/protocol/schema.cc",
+    "$target_gen_dir/devtools/protocol/schema.h",
+    "$target_gen_dir/devtools/protocol/security.cc",
+    "$target_gen_dir/devtools/protocol/security.h",
+    "$target_gen_dir/devtools/protocol/service_worker.cc",
+    "$target_gen_dir/devtools/protocol/service_worker.h",
+    "$target_gen_dir/devtools/protocol/storage.cc",
+    "$target_gen_dir/devtools/protocol/storage.h",
+    "$target_gen_dir/devtools/protocol/system_info.cc",
+    "$target_gen_dir/devtools/protocol/system_info.h",
+    "$target_gen_dir/devtools/protocol/target.cc",
+    "$target_gen_dir/devtools/protocol/target.h",
+    "$target_gen_dir/devtools/protocol/tethering.cc",
+    "$target_gen_dir/devtools/protocol/tethering.h",
+    "$target_gen_dir/devtools/protocol/tracing.cc",
+    "$target_gen_dir/devtools/protocol/tracing.h",
+  ]
+  if (!is_android) {
+    # The WebAuthn devtools protocol API is not supported in Android yet.
+    sources += [
+      "$target_gen_dir/devtools/protocol/web_authn.cc",
+      "$target_gen_dir/devtools/protocol/web_authn.h",
+    ]
+  }
+
+  if (use_viz_debugger) {
+    sources += [
+      "$target_gen_dir/devtools/protocol/visual_debugger.cc",
+      "$target_gen_dir/devtools/protocol/visual_debugger.h",
+      "devtools/protocol/visual_debugger_handler.cc",
+      "devtools/protocol/visual_debugger_handler.h",
+    ]
+  }
+}
+
 jumbo_static_library("browser") {
   # Only the public target should depend on this. All other targets (even
   # internal content ones) should depend on the public one.
@@ -107,8 +193,6 @@ jumbo_static_library("browser") {
     "//content/browser/content_index:content_index_proto",
     "//content/browser/conversions:mojo_bindings",
     "//content/browser/cookie_store:cookie_store_proto",
-    "//content/browser/devtools:devtools_background_services_proto",
-    "//content/browser/devtools:protocol_sources",
     "//content/browser/file_system_access:proto",
     "//content/browser/notifications:notification_proto",
     "//content/browser/payments:payment_app_proto",
@@ -250,6 +334,7 @@ jumbo_static_library("browser") {
     "//ui/snapshot",
     "//ui/touch_selection",
     "//v8:v8_version",
+    ":devtools_protocol",
   ]
 
   if (is_chromeos_ash) {
@@ -271,57 +356,6 @@ jumbo_static_library("browser") {
   ]
 
   sources = [
-    "$target_gen_dir/devtools/protocol/audits.cc",
-    "$target_gen_dir/devtools/protocol/audits.h",
-    "$target_gen_dir/devtools/protocol/background_service.cc",
-    "$target_gen_dir/devtools/protocol/background_service.h",
-    "$target_gen_dir/devtools/protocol/base_string_adapter.cc",
-    "$target_gen_dir/devtools/protocol/base_string_adapter.h",
-    "$target_gen_dir/devtools/protocol/browser.cc",
-    "$target_gen_dir/devtools/protocol/browser.h",
-    "$target_gen_dir/devtools/protocol/dom.cc",
-    "$target_gen_dir/devtools/protocol/dom.h",
-    "$target_gen_dir/devtools/protocol/emulation.cc",
-    "$target_gen_dir/devtools/protocol/emulation.h",
-    "$target_gen_dir/devtools/protocol/fetch.cc",
-    "$target_gen_dir/devtools/protocol/fetch.h",
-    "$target_gen_dir/devtools/protocol/forward.h",
-    "$target_gen_dir/devtools/protocol/input.cc",
-    "$target_gen_dir/devtools/protocol/input.h",
-    "$target_gen_dir/devtools/protocol/inspector.cc",
-    "$target_gen_dir/devtools/protocol/inspector.h",
-    "$target_gen_dir/devtools/protocol/io.cc",
-    "$target_gen_dir/devtools/protocol/io.h",
-    "$target_gen_dir/devtools/protocol/log.cc",
-    "$target_gen_dir/devtools/protocol/log.h",
-    "$target_gen_dir/devtools/protocol/memory.cc",
-    "$target_gen_dir/devtools/protocol/memory.h",
-    "$target_gen_dir/devtools/protocol/network.cc",
-    "$target_gen_dir/devtools/protocol/network.h",
-    "$target_gen_dir/devtools/protocol/overlay.cc",
-    "$target_gen_dir/devtools/protocol/overlay.h",
-    "$target_gen_dir/devtools/protocol/page.cc",
-    "$target_gen_dir/devtools/protocol/page.h",
-    "$target_gen_dir/devtools/protocol/protocol.cc",
-    "$target_gen_dir/devtools/protocol/protocol.h",
-    "$target_gen_dir/devtools/protocol/runtime.cc",
-    "$target_gen_dir/devtools/protocol/runtime.h",
-    "$target_gen_dir/devtools/protocol/schema.cc",
-    "$target_gen_dir/devtools/protocol/schema.h",
-    "$target_gen_dir/devtools/protocol/security.cc",
-    "$target_gen_dir/devtools/protocol/security.h",
-    "$target_gen_dir/devtools/protocol/service_worker.cc",
-    "$target_gen_dir/devtools/protocol/service_worker.h",
-    "$target_gen_dir/devtools/protocol/storage.cc",
-    "$target_gen_dir/devtools/protocol/storage.h",
-    "$target_gen_dir/devtools/protocol/system_info.cc",
-    "$target_gen_dir/devtools/protocol/system_info.h",
-    "$target_gen_dir/devtools/protocol/target.cc",
-    "$target_gen_dir/devtools/protocol/target.h",
-    "$target_gen_dir/devtools/protocol/tethering.cc",
-    "$target_gen_dir/devtools/protocol/tethering.h",
-    "$target_gen_dir/devtools/protocol/tracing.cc",
-    "$target_gen_dir/devtools/protocol/tracing.h",
     "about_url_loader_factory.cc",
     "about_url_loader_factory.h",
     "accessibility/accessibility_event_recorder.cc",
@@ -1977,7 +2011,7 @@ jumbo_static_library("browser") {
     "worker_host/worker_script_loader_factory.h",
   ]
 
-  if (is_mac) {
+  if (is_mac && !use_qt) {
     sources += [
       "../app_shim_remote_cocoa/web_drag_source_mac.h",
       "../app_shim_remote_cocoa/web_drag_source_mac.mm",
@@ -1996,6 +2030,10 @@ jumbo_static_library("browser") {
       "accessibility/browser_accessibility_manager_mac.h",
       "accessibility/browser_accessibility_manager_mac.mm",
       "accessibility/browser_accessibility_state_impl_mac.mm",
+    ]
+  }
+  if (is_mac) {
+    sources += [
       "browser_plugin/browser_plugin_popup_menu_helper_mac.h",
       "browser_plugin/browser_plugin_popup_menu_helper_mac.mm",
       "child_process_launcher_helper_mac.cc",
@@ -2104,7 +2142,7 @@ jumbo_static_library("browser") {
     ]
   }
 
-  if (is_win) {
+  if (is_win && !use_qt) {
     sources += [
       "accessibility/accessibility_event_recorder_uia_win.cc",
       "accessibility/accessibility_event_recorder_uia_win.h",
@@ -2121,6 +2159,10 @@ jumbo_static_library("browser") {
       "accessibility/browser_accessibility_state_impl_win.cc",
       "accessibility/browser_accessibility_win.cc",
       "accessibility/browser_accessibility_win.h",
+    ]
+  }
+  if (is_win) {
+    sources += [
       "child_process_launcher_helper_win.cc",
       "media/key_system_support_win.cc",
       "media/key_system_support_win.h",
@@ -2144,14 +2186,13 @@ jumbo_static_library("browser") {
     ]
   }
 
-  if (use_viz_debugger) {
-    sources += [
-      "$target_gen_dir/devtools/protocol/visual_debugger.cc",
-      "$target_gen_dir/devtools/protocol/visual_debugger.h",
-      "devtools/protocol/visual_debugger_handler.cc",
-      "devtools/protocol/visual_debugger_handler.h",
-    ]
-  }
+  jumbo_excluded_sources = [
+    "push_messaging/push_messaging_router.cc",
+    "renderer_host/media/media_devices_manager.cc",
+    "service_worker/service_worker_registry.cc",
+    "web_package/web_bundle_blob_data_source.cc",
+  ]
+
   if (toolkit_views) {
     deps += [ "//ui/events" ]
   }
@@ -2402,6 +2443,9 @@ jumbo_static_library("browser") {
         "media/capture/desktop_capture_device.h",
       ]
       deps += [ "//third_party/webrtc_overrides:webrtc_component" ]
+      jumbo_excluded_sources += [
+        "media/capture/desktop_capture_device.cc",
+      ]
     }
   }
 
@@ -2696,6 +2740,12 @@ jumbo_static_library("browser") {
       "web_contents/web_contents_view_android.h",
     ]
 
+    jumbo_excluded_sources += [
+      # Files with kJavaLangClass and similar constants:
+      # Bug https://crbug.com/787557.
+      "android/java/java_method.cc",  # and in gin_java_bound_object.cc.
+    ]
+
     deps += [
       ":reflection_jni_headers",
       "//build/config/freetype",
@@ -2724,10 +2774,6 @@ jumbo_static_library("browser") {
   } else {
     # Not Android.
     sources += [
-      # The WebAuthn devtools protocol API is not supported in Android yet.
-      "$target_gen_dir/devtools/protocol/web_authn.cc",
-      "$target_gen_dir/devtools/protocol/web_authn.h",
-
       # Devtools frontend not included in Android
       "devtools/devtools_frontend_host_impl.cc",
       "devtools/devtools_frontend_host_impl.h",
@@ -2958,6 +3004,7 @@ jumbo_static_library("browser") {
       "gpu/viz_devtools_connector.cc",
       "gpu/viz_devtools_connector.h",
     ]
+    jumbo_excluded_sources += [ "gpu/viz_devtools_connector.cc" ]
   }
 
   if (enable_vr) {
@@ -3028,26 +3075,12 @@ jumbo_static_library("browser") {
     ]
     if (is_win) {
       sources -= [
-        "accessibility/browser_accessibility_com_win.cc",
-        "accessibility/browser_accessibility_com_win.h",
-        "accessibility/browser_accessibility_manager_win.cc",
-        "accessibility/browser_accessibility_manager_win.h",
-        "accessibility/browser_accessibility_win.cc",
-        "accessibility/browser_accessibility_win.h",
-        "accessibility/accessibility_tree_formatter_win.cc",
         "renderer_host/legacy_render_widget_host_win.cc",
         "renderer_host/legacy_render_widget_host_win.h"
       ]
     }
     if (is_mac) {
       sources -= [
-        "accessibility/accessibility_tree_formatter_mac.mm",
-        "accessibility/browser_accessibility_cocoa.mm",
-        "accessibility/browser_accessibility_cocoa.h",
-        "accessibility/browser_accessibility_mac.mm",
-        "accessibility/browser_accessibility_mac.h",
-        "accessibility/browser_accessibility_manager_mac.mm",
-        "accessibility/browser_accessibility_manager_mac.h",
         "renderer_host/input/synthetic_gesture_target_mac.h",
         "renderer_host/input/synthetic_gesture_target_mac.mm",
         "renderer_host/native_web_keyboard_event_mac.mm",
@@ -3057,8 +3090,6 @@ jumbo_static_library("browser") {
         "web_contents/web_contents_view_mac.h",
         "web_contents/web_drag_dest_mac.h",
         "web_contents/web_drag_dest_mac.mm",
-        "../app_shim_remote_cocoa/web_drag_source_mac.h",
-        "../app_shim_remote_cocoa/web_drag_source_mac.mm",
       ]
       deps -= [
         "//components/remote_cocoa/app_shim",
diff --git a/chromium/content/browser/cookie_store/cookie_change_subscription.cc b/chromium/content/browser/cookie_store/cookie_change_subscription.cc
index 07b9b55f5fd..9aff409989e 100644
--- a/chromium/content/browser/cookie_store/cookie_change_subscription.cc
+++ b/chromium/content/browser/cookie_store/cookie_change_subscription.cc
@@ -10,14 +10,15 @@
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_util.h"
 #include "services/network/public/cpp/is_potentially_trustworthy.h"
+#include "third_party/blink/renderer/platform/wtf/assertions.h"
 
 namespace content {
 
 namespace {
 
-#define STATIC_ASSERT_ENUM(a, b)                            \
-  static_assert(static_cast<int>(a) == static_cast<int>(b), \
-                "mismatching enums: " #a)
+//#define STATIC_ASSERT_ENUM(a, b)                            \
+//  static_assert(static_cast<int>(a) == static_cast<int>(b), \
+//                "mismatching enums: " #a)
 
 STATIC_ASSERT_ENUM(network::mojom::CookieMatchType::EQUALS,
                    proto::CookieMatchType::EQUALS);
diff --git a/chromium/content/browser/devtools/BUILD.gn b/chromium/content/browser/devtools/BUILD.gn
index ac10fe1c21d..3ef3ed5bb27 100644
--- a/chromium/content/browser/devtools/BUILD.gn
+++ b/chromium/content/browser/devtools/BUILD.gn
@@ -64,7 +64,7 @@ action("concatenate_protocols") {
 }
 
 inspector_protocol_generate("protocol_sources") {
-  visibility = [ "//content/browser" ]
+  visibility = [ "//content/browser:*" ]
   deps = [ ":concatenate_protocols" ]
   inspector_protocol_dir = "//third_party/inspector_protocol"
   out_dir = target_gen_dir
diff --git a/chromium/content/browser/file_system_access/file_system_chooser.cc b/chromium/content/browser/file_system_access/file_system_chooser.cc
index c97d5800d02..b2c164d3e34 100644
--- a/chromium/content/browser/file_system_access/file_system_chooser.cc
+++ b/chromium/content/browser/file_system_access/file_system_chooser.cc
@@ -73,7 +73,7 @@ base::FilePath::StringType GetLastExtension(
 
 // Returns whether the specified extension receives special handling by the
 // Windows shell.
-bool IsShellIntegratedExtension(const base::FilePath::StringType& extension) {
+bool IsShellIntegratedExtension2(const base::FilePath::StringType& extension) {
   // TODO(https://crbug.com/1154757): Figure out some way to unify this with
   // net::IsSafePortablePathComponent, with the result probably ending up in
   // base/i18n/file_util_icu.h.
@@ -105,7 +105,7 @@ bool IsInvalidExtension(base::FilePath::StringType& extension) {
   auto extension16 = base::UTF8ToUTF16(component8);
 
   return !base::i18n::IsFilenameLegal(extension16) ||
-         IsShellIntegratedExtension(GetLastExtension(extension));
+         IsShellIntegratedExtension2(GetLastExtension(extension));
 }
 
 // Converts the accepted mime types and extensions from |option| into a list
diff --git a/chromium/content/browser/net/cross_origin_embedder_policy_reporter.cc b/chromium/content/browser/net/cross_origin_embedder_policy_reporter.cc
index f506654a2f5..5bb95167722 100644
--- a/chromium/content/browser/net/cross_origin_embedder_policy_reporter.cc
+++ b/chromium/content/browser/net/cross_origin_embedder_policy_reporter.cc
@@ -14,7 +14,7 @@ namespace content {
 
 namespace {
 
-constexpr char kType[] = "coep";
+constexpr char kTypeCoep[] = "coep";
 
 GURL StripUsernameAndPassword(const GURL& url) {
   url::Replacements<char> replacements;
@@ -101,7 +101,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
         blink::mojom::ReportBodyElement::New("disposition", disposition));
 
     observer_->Notify(blink::mojom::Report::New(
-        kType, context_url_, blink::mojom::ReportBody::New(std::move(list))));
+        kTypeCoep, context_url_, blink::mojom::ReportBody::New(std::move(list))));
   }
   if (endpoint) {
     base::DictionaryValue body_to_pass;
@@ -111,7 +111,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
     body_to_pass.SetString("disposition", disposition);
 
     storage_partition_->GetNetworkContext()->QueueReport(
-        kType, *endpoint, context_url_, network_isolation_key_,
+        kTypeCoep, *endpoint, context_url_, network_isolation_key_,
         /*user_agent=*/absl::nullopt, std::move(body_to_pass));
   }
 }
diff --git a/chromium/content/browser/quota/quota_change_dispatcher.h b/chromium/content/browser/quota/quota_change_dispatcher.h
index 38969e084db..e226b23dfa1 100644
--- a/chromium/content/browser/quota/quota_change_dispatcher.h
+++ b/chromium/content/browser/quota/quota_change_dispatcher.h
@@ -17,8 +17,6 @@
 #include "third_party/blink/public/mojom/quota/quota_manager_host.mojom.h"
 #include "url/origin.h"
 
-class TimeDelta;
-
 namespace content {
 
 // Dispatches a storage pressure event to listeners across multiple origins.
diff --git a/chromium/content/browser/renderer_host/render_frame_proxy_host.cc b/chromium/content/browser/renderer_host/render_frame_proxy_host.cc
index 728f52c1b44..a86f88b12f0 100644
--- a/chromium/content/browser/renderer_host/render_frame_proxy_host.cc
+++ b/chromium/content/browser/renderer_host/render_frame_proxy_host.cc
@@ -75,10 +75,10 @@ typedef std::unordered_map<RenderFrameProxyHostID,
 base::LazyInstance<RoutingIDFrameProxyMap>::DestructorAtExit
     g_routing_id_frame_proxy_map = LAZY_INSTANCE_INITIALIZER;
 
-using TokenFrameMap = std::unordered_map<blink::RemoteFrameToken,
-                                         RenderFrameProxyHost*,
-                                         blink::RemoteFrameToken::Hasher>;
-base::LazyInstance<TokenFrameMap>::Leaky g_token_frame_proxy_map =
+using TokenFrameProxyMap = std::unordered_map<blink::RemoteFrameToken,
+                                              RenderFrameProxyHost*,
+                                              blink::RemoteFrameToken::Hasher>;
+base::LazyInstance<TokenFrameProxyMap>::Leaky g_token_frame_proxy_map =
     LAZY_INSTANCE_INITIALIZER;
 
 // Maintains a list of the most recently recorded (source, target) pairs for the
@@ -144,7 +144,7 @@ RenderFrameProxyHost* RenderFrameProxyHost::FromFrameToken(
     int process_id,
     const blink::RemoteFrameToken& frame_token) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  TokenFrameMap* frames = g_token_frame_proxy_map.Pointer();
+  TokenFrameProxyMap* frames = g_token_frame_proxy_map.Pointer();
   auto it = frames->find(frame_token);
   // The check against |process_id| isn't strictly necessary, but represents
   // an extra level of protection against a renderer trying to force a frame
diff --git a/chromium/content/child/BUILD.gn b/chromium/content/child/BUILD.gn
index 4b49a079d70..f928d859e78 100644
--- a/chromium/content/child/BUILD.gn
+++ b/chromium/content/child/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
 import("//build/config/ui.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//third_party/blink/public/public_features.gni")
@@ -11,9 +12,9 @@ if (is_android) {
 }
 
 if (is_component_build) {
-  link_target_type = "source_set"
+  link_target_type = "jumbo_source_set"
 } else {
-  link_target_type = "static_library"
+  link_target_type = "jumbo_static_library"
 }
 target(link_target_type, "child") {
   # Targets external to content should always link to the public API.
diff --git a/chromium/content/common/BUILD.gn b/chromium/content/common/BUILD.gn
index 8395998cc5c..0cce43f3197 100644
--- a/chromium/content/common/BUILD.gn
+++ b/chromium/content/common/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/buildflag_header.gni")
 import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
 import("//build/config/ui.gni")
 import("//content/public/common/zygote/features.gni")
 import("//ipc/features.gni")
@@ -35,7 +36,7 @@ buildflag_header("buildflags") {
   ]
 }
 
-static_library("common") {
+jumbo_static_library("common") {
   # Targets external to content should always link to the public API.
   # In addition, targets outside of the content component (shell and tests)
   # must not link to this because it will duplicate the code in the component
@@ -154,6 +155,11 @@ static_library("common") {
     "web_package/signed_exchange_utils.cc",
     "web_package/signed_exchange_utils.h",
   ]
+  jumbo_excluded_sources = [
+    "common_param_traits.cc",
+    "content_message_generator.cc",
+    "content_param_traits.cc",
+  ]
 
   configs += [
     "//content:content_implementation",
diff --git a/chromium/device/fido/cable/cable_discovery_data.h b/chromium/device/fido/cable/cable_discovery_data.h
index 56843e9c14d..c0743bdcb7c 100644
--- a/chromium/device/fido/cable/cable_discovery_data.h
+++ b/chromium/device/fido/cable/cable_discovery_data.h
@@ -101,7 +101,7 @@ struct COMPONENT_EXPORT(DEVICE_FIDO) Pairing {
   // within the structure is validated by using |local_identity_seed| and
   // |handshake_hash|.
   static absl::optional<std::unique_ptr<Pairing>> Parse(
-      const cbor::Value& cbor,
+      const ::cbor::Value& cbor,
       uint32_t tunnel_server_domain,
       base::span<const uint8_t, kQRSeedSize> local_identity_seed,
       base::span<const uint8_t, 32> handshake_hash);
diff --git a/chromium/device/fido/public_key_credential_descriptor.h b/chromium/device/fido/public_key_credential_descriptor.h
index 85ad46463f9..51bea84e8db 100644
--- a/chromium/device/fido/public_key_credential_descriptor.h
+++ b/chromium/device/fido/public_key_credential_descriptor.h
@@ -25,7 +25,7 @@ namespace device {
 class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialDescriptor {
  public:
   static absl::optional<PublicKeyCredentialDescriptor> CreateFromCBORValue(
-      const cbor::Value& cbor);
+      const ::cbor::Value& cbor);
 
   PublicKeyCredentialDescriptor();
   PublicKeyCredentialDescriptor(CredentialType credential_type,
@@ -63,7 +63,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialDescriptor {
   base::flat_set<FidoTransportProtocol> transports_;
 };
 
-cbor::Value AsCBOR(const PublicKeyCredentialDescriptor&);
+::cbor::Value AsCBOR(const PublicKeyCredentialDescriptor&);
 
 }  // namespace device
 
diff --git a/chromium/device/fido/public_key_credential_params.h b/chromium/device/fido/public_key_credential_params.h
index 4bf36c13b17..ca5100dd3d0 100644
--- a/chromium/device/fido/public_key_credential_params.h
+++ b/chromium/device/fido/public_key_credential_params.h
@@ -32,7 +32,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialParams {
   };
 
   static absl::optional<PublicKeyCredentialParams> CreateFromCBORValue(
-      const cbor::Value& cbor_value);
+      const ::cbor::Value& cbor_value);
 
   explicit PublicKeyCredentialParams(
       std::vector<CredentialInfo> credential_params);
@@ -50,7 +50,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialParams {
   std::vector<CredentialInfo> public_key_credential_params_;
 };
 
-cbor::Value AsCBOR(const PublicKeyCredentialParams&);
+::cbor::Value AsCBOR(const PublicKeyCredentialParams&);
 
 }  // namespace device
 
diff --git a/chromium/device/fido/public_key_credential_rp_entity.h b/chromium/device/fido/public_key_credential_rp_entity.h
index 40b4db5a8ee..f648f5d4874 100644
--- a/chromium/device/fido/public_key_credential_rp_entity.h
+++ b/chromium/device/fido/public_key_credential_rp_entity.h
@@ -23,7 +23,7 @@ namespace device {
 struct COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialRpEntity {
  public:
   static absl::optional<PublicKeyCredentialRpEntity> CreateFromCBORValue(
-      const cbor::Value& cbor);
+      const ::cbor::Value& cbor);
 
   PublicKeyCredentialRpEntity();
   explicit PublicKeyCredentialRpEntity(std::string id);
@@ -43,7 +43,7 @@ struct COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialRpEntity {
   absl::optional<GURL> icon_url;
 };
 
-cbor::Value AsCBOR(const PublicKeyCredentialRpEntity&);
+::cbor::Value AsCBOR(const PublicKeyCredentialRpEntity&);
 
 }  // namespace device
 
diff --git a/chromium/device/fido/public_key_credential_user_entity.h b/chromium/device/fido/public_key_credential_user_entity.h
index 9778dc12840..c0a3eb8e12f 100644
--- a/chromium/device/fido/public_key_credential_user_entity.h
+++ b/chromium/device/fido/public_key_credential_user_entity.h
@@ -24,7 +24,7 @@ namespace device {
 class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialUserEntity {
  public:
   static absl::optional<PublicKeyCredentialUserEntity> CreateFromCBORValue(
-      const cbor::Value& cbor);
+      const ::cbor::Value& cbor);
 
   PublicKeyCredentialUserEntity();
   explicit PublicKeyCredentialUserEntity(std::vector<uint8_t> id);
@@ -47,7 +47,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialUserEntity {
   absl::optional<GURL> icon_url;
 };
 
-cbor::Value AsCBOR(const PublicKeyCredentialUserEntity&);
+::cbor::Value AsCBOR(const PublicKeyCredentialUserEntity&);
 
 }  // namespace device
 
diff --git a/chromium/extensions/browser/api/declarative_webrequest/webrequest_condition.cc b/chromium/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
index c3b1ec69534..3004871af68 100644
--- a/chromium/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
+++ b/chromium/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
@@ -18,8 +18,6 @@ using url_matcher::URLMatcherConditionFactory;
 using url_matcher::URLMatcherConditionSet;
 using url_matcher::URLMatcherFactory;
 
-namespace keys = extensions::declarative_webrequest_constants;
-
 namespace {
 static URLMatcherConditionSet::ID g_next_id = 0;
 
@@ -38,7 +36,7 @@ const char kConditionCannotBeFulfilled[] = "A condition can never be "
 
 namespace extensions {
 
-namespace keys = declarative_webrequest_constants;
+namespace keys_wrc = declarative_webrequest_constants;
 
 //
 // WebRequestData
@@ -128,11 +126,11 @@ std::unique_ptr<WebRequestCondition> WebRequestCondition::Create(
 
   // Verify that we are dealing with a Condition whose type we understand.
   std::string instance_type;
-  if (!condition_dict->GetString(keys::kInstanceTypeKey, &instance_type)) {
+  if (!condition_dict->GetString(keys_wrc::kInstanceTypeKey, &instance_type)) {
     *error = kConditionWithoutInstanceType;
     return nullptr;
   }
-  if (instance_type != keys::kRequestMatcherType) {
+  if (instance_type != keys_wrc::kRequestMatcherType) {
     *error = kExpectedOtherConditionType;
     return nullptr;
   }
@@ -144,12 +142,12 @@ std::unique_ptr<WebRequestCondition> WebRequestCondition::Create(
        !iter.IsAtEnd(); iter.Advance()) {
     const std::string& condition_attribute_name = iter.key();
     const base::Value& condition_attribute_value = iter.value();
-    if (condition_attribute_name == keys::kInstanceTypeKey ||
+    if (condition_attribute_name == keys_wrc::kInstanceTypeKey ||
         condition_attribute_name ==
-            keys::kDeprecatedFirstPartyForCookiesUrlKey ||
-        condition_attribute_name == keys::kDeprecatedThirdPartyKey) {
+            keys_wrc::kDeprecatedFirstPartyForCookiesUrlKey ||
+        condition_attribute_name == keys_wrc::kDeprecatedThirdPartyKey) {
       // Skip this.
-    } else if (condition_attribute_name == keys::kUrlKey) {
+    } else if (condition_attribute_name == keys_wrc::kUrlKey) {
       const base::DictionaryValue* dict = NULL;
       if (!condition_attribute_value.GetAsDictionary(&dict)) {
         *error = base::StringPrintf(kInvalidTypeOfParamter,
diff --git a/chromium/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc b/chromium/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
index a781096b646..b910c003019 100644
--- a/chromium/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
+++ b/chromium/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
@@ -37,7 +37,7 @@ using base::ListValue;
 using base::Value;
 
 namespace helpers = extension_web_request_api_helpers;
-namespace keys = extensions::declarative_webrequest_constants;
+namespace keys_wrca = extensions::declarative_webrequest_constants;
 
 namespace extensions {
 
@@ -50,39 +50,39 @@ struct WebRequestConditionAttributeFactory {
 
   WebRequestConditionAttributeFactory() : factory(5) {
     factory.RegisterFactoryMethod(
-        keys::kResourceTypeKey,
+        keys_wrca::kResourceTypeKey,
         DedupingFactory<WebRequestConditionAttribute>::IS_PARAMETERIZED,
         &WebRequestConditionAttributeResourceType::Create);
 
     factory.RegisterFactoryMethod(
-        keys::kContentTypeKey,
+        keys_wrca::kContentTypeKey,
         DedupingFactory<WebRequestConditionAttribute>::IS_PARAMETERIZED,
         &WebRequestConditionAttributeContentType::Create);
     factory.RegisterFactoryMethod(
-        keys::kExcludeContentTypeKey,
+        keys_wrca::kExcludeContentTypeKey,
         DedupingFactory<WebRequestConditionAttribute>::IS_PARAMETERIZED,
         &WebRequestConditionAttributeContentType::Create);
 
     factory.RegisterFactoryMethod(
-        keys::kRequestHeadersKey,
+        keys_wrca::kRequestHeadersKey,
         DedupingFactory<WebRequestConditionAttribute>::IS_PARAMETERIZED,
         &WebRequestConditionAttributeRequestHeaders::Create);
     factory.RegisterFactoryMethod(
-        keys::kExcludeRequestHeadersKey,
+        keys_wrca::kExcludeRequestHeadersKey,
         DedupingFactory<WebRequestConditionAttribute>::IS_PARAMETERIZED,
         &WebRequestConditionAttributeRequestHeaders::Create);
 
     factory.RegisterFactoryMethod(
-        keys::kResponseHeadersKey,
+        keys_wrca::kResponseHeadersKey,
         DedupingFactory<WebRequestConditionAttribute>::IS_PARAMETERIZED,
         &WebRequestConditionAttributeResponseHeaders::Create);
     factory.RegisterFactoryMethod(
-        keys::kExcludeResponseHeadersKey,
+        keys_wrca::kExcludeResponseHeadersKey,
         DedupingFactory<WebRequestConditionAttribute>::IS_PARAMETERIZED,
         &WebRequestConditionAttributeResponseHeaders::Create);
 
     factory.RegisterFactoryMethod(
-        keys::kStagesKey,
+        keys_wrca::kStagesKey,
         DedupingFactory<WebRequestConditionAttribute>::IS_PARAMETERIZED,
         &WebRequestConditionAttributeStages::Create);
   }
@@ -137,11 +137,11 @@ WebRequestConditionAttributeResourceType::Create(
     const base::Value* value,
     std::string* error,
     bool* bad_message) {
-  DCHECK(instance_type == keys::kResourceTypeKey);
+  DCHECK(instance_type == keys_wrca::kResourceTypeKey);
   const base::ListValue* value_as_list = nullptr;
   if (!value->GetAsList(&value_as_list)) {
     *error = ErrorUtils::FormatErrorMessage(kInvalidValue,
-                                            keys::kResourceTypeKey);
+                                            keys_wrca::kResourceTypeKey);
     return nullptr;
   }
 
@@ -156,7 +156,7 @@ WebRequestConditionAttributeResourceType::Create(
         !ParseWebRequestResourceType(resource_type_string,
                                      &passed_types.back())) {
       *error = ErrorUtils::FormatErrorMessage(kInvalidValue,
-                                              keys::kResourceTypeKey);
+                                              keys_wrca::kResourceTypeKey);
       return nullptr;
     }
   }
@@ -184,7 +184,7 @@ WebRequestConditionAttributeResourceType::GetType() const {
 }
 
 std::string WebRequestConditionAttributeResourceType::GetName() const {
-  return keys::kResourceTypeKey;
+  return keys_wrca::kResourceTypeKey;
 }
 
 bool WebRequestConditionAttributeResourceType::Equals(
@@ -217,7 +217,7 @@ WebRequestConditionAttributeContentType::Create(
       const base::Value* value,
       std::string* error,
       bool* bad_message) {
-  DCHECK(name == keys::kContentTypeKey || name == keys::kExcludeContentTypeKey);
+  DCHECK(name == keys_wrca::kContentTypeKey || name == keys_wrca::kExcludeContentTypeKey);
 
   if (!value->is_list()) {
     *error = ErrorUtils::FormatErrorMessage(kInvalidValue, name);
@@ -235,7 +235,7 @@ WebRequestConditionAttributeContentType::Create(
 
   return scoped_refptr<const WebRequestConditionAttribute>(
       new WebRequestConditionAttributeContentType(
-          content_types, name == keys::kContentTypeKey));
+          content_types, name == keys_wrca::kContentTypeKey));
 }
 
 int WebRequestConditionAttributeContentType::GetStages() const {
@@ -269,7 +269,7 @@ WebRequestConditionAttributeContentType::GetType() const {
 }
 
 std::string WebRequestConditionAttributeContentType::GetName() const {
-  return (inclusive_ ? keys::kContentTypeKey : keys::kExcludeContentTypeKey);
+  return (inclusive_ ? keys_wrca::kContentTypeKey : keys_wrca::kExcludeContentTypeKey);
 }
 
 bool WebRequestConditionAttributeContentType::Equals(
@@ -464,25 +464,25 @@ HeaderMatcher::HeaderMatchTest::Create(const base::DictionaryValue* tests) {
        !it.IsAtEnd(); it.Advance()) {
     bool is_name = false;  // Is this test for header name?
     StringMatchTest::MatchType match_type;
-    if (it.key() == keys::kNamePrefixKey) {
+    if (it.key() == keys_wrca::kNamePrefixKey) {
       is_name = true;
       match_type = StringMatchTest::kPrefix;
-    } else if (it.key() == keys::kNameSuffixKey) {
+    } else if (it.key() == keys_wrca::kNameSuffixKey) {
       is_name = true;
       match_type = StringMatchTest::kSuffix;
-    } else if (it.key() == keys::kNameContainsKey) {
+    } else if (it.key() == keys_wrca::kNameContainsKey) {
       is_name = true;
       match_type = StringMatchTest::kContains;
-    } else if (it.key() == keys::kNameEqualsKey) {
+    } else if (it.key() == keys_wrca::kNameEqualsKey) {
       is_name = true;
       match_type = StringMatchTest::kEquals;
-    } else if (it.key() == keys::kValuePrefixKey) {
+    } else if (it.key() == keys_wrca::kValuePrefixKey) {
       match_type = StringMatchTest::kPrefix;
-    } else if (it.key() == keys::kValueSuffixKey) {
+    } else if (it.key() == keys_wrca::kValueSuffixKey) {
       match_type = StringMatchTest::kSuffix;
-    } else if (it.key() == keys::kValueContainsKey) {
+    } else if (it.key() == keys_wrca::kValueContainsKey) {
       match_type = StringMatchTest::kContains;
-    } else if (it.key() == keys::kValueEqualsKey) {
+    } else if (it.key() == keys_wrca::kValueEqualsKey) {
       match_type = StringMatchTest::kEquals;
     } else {
       NOTREACHED();  // JSON schema type checking should prevent this.
@@ -573,8 +573,8 @@ WebRequestConditionAttributeRequestHeaders::Create(
     const base::Value* value,
     std::string* error,
     bool* bad_message) {
-  DCHECK(name == keys::kRequestHeadersKey ||
-         name == keys::kExcludeRequestHeadersKey);
+  DCHECK(name == keys_wrca::kRequestHeadersKey ||
+         name == keys_wrca::kExcludeRequestHeadersKey);
 
   std::unique_ptr<const HeaderMatcher> header_matcher(
       PrepareHeaderMatcher(name, value, error));
@@ -583,7 +583,7 @@ WebRequestConditionAttributeRequestHeaders::Create(
 
   return scoped_refptr<const WebRequestConditionAttribute>(
       new WebRequestConditionAttributeRequestHeaders(
-          std::move(header_matcher), name == keys::kRequestHeadersKey));
+          std::move(header_matcher), name == keys_wrca::kRequestHeadersKey));
 }
 
 int WebRequestConditionAttributeRequestHeaders::GetStages() const {
@@ -616,8 +616,8 @@ WebRequestConditionAttributeRequestHeaders::GetType() const {
 }
 
 std::string WebRequestConditionAttributeRequestHeaders::GetName() const {
-  return (positive_ ? keys::kRequestHeadersKey
-                    : keys::kExcludeRequestHeadersKey);
+  return (positive_ ? keys_wrca::kRequestHeadersKey
+                    : keys_wrca::kExcludeRequestHeadersKey);
 }
 
 bool WebRequestConditionAttributeRequestHeaders::Equals(
@@ -646,8 +646,8 @@ WebRequestConditionAttributeResponseHeaders::Create(
     const base::Value* value,
     std::string* error,
     bool* bad_message) {
-  DCHECK(name == keys::kResponseHeadersKey ||
-         name == keys::kExcludeResponseHeadersKey);
+  DCHECK(name == keys_wrca::kResponseHeadersKey ||
+         name == keys_wrca::kExcludeResponseHeadersKey);
 
   std::unique_ptr<const HeaderMatcher> header_matcher(
       PrepareHeaderMatcher(name, value, error));
@@ -656,7 +656,7 @@ WebRequestConditionAttributeResponseHeaders::Create(
 
   return scoped_refptr<const WebRequestConditionAttribute>(
       new WebRequestConditionAttributeResponseHeaders(
-          std::move(header_matcher), name == keys::kResponseHeadersKey));
+          std::move(header_matcher), name == keys_wrca::kResponseHeadersKey));
 }
 
 int WebRequestConditionAttributeResponseHeaders::GetStages() const {
@@ -696,8 +696,8 @@ WebRequestConditionAttributeResponseHeaders::GetType() const {
 }
 
 std::string WebRequestConditionAttributeResponseHeaders::GetName() const {
-  return (positive_ ? keys::kResponseHeadersKey
-                    : keys::kExcludeResponseHeadersKey);
+  return (positive_ ? keys_wrca::kResponseHeadersKey
+                    : keys_wrca::kExcludeResponseHeadersKey);
 }
 
 bool WebRequestConditionAttributeResponseHeaders::Equals(
@@ -730,13 +730,13 @@ bool ParseListOfStages(const base::Value& value, int* out_stages) {
   for (const auto& entry : value.GetList()) {
     if (!entry.GetAsString(&stage_name))
       return false;
-    if (stage_name == keys::kOnBeforeRequestEnum) {
+    if (stage_name == keys_wrca::kOnBeforeRequestEnum) {
       stages |= ON_BEFORE_REQUEST;
-    } else if (stage_name == keys::kOnBeforeSendHeadersEnum) {
+    } else if (stage_name == keys_wrca::kOnBeforeSendHeadersEnum) {
       stages |= ON_BEFORE_SEND_HEADERS;
-    } else if (stage_name == keys::kOnHeadersReceivedEnum) {
+    } else if (stage_name == keys_wrca::kOnHeadersReceivedEnum) {
       stages |= ON_HEADERS_RECEIVED;
-    } else if (stage_name == keys::kOnAuthRequiredEnum) {
+    } else if (stage_name == keys_wrca::kOnAuthRequiredEnum) {
       stages |= ON_AUTH_REQUIRED;
     } else {
       NOTREACHED();  // JSON schema checks prevent getting here.
@@ -756,12 +756,12 @@ WebRequestConditionAttributeStages::Create(const std::string& name,
                                            const base::Value* value,
                                            std::string* error,
                                            bool* bad_message) {
-  DCHECK(name == keys::kStagesKey);
+  DCHECK(name == keys_wrca::kStagesKey);
 
   int allowed_stages = 0;
   if (!ParseListOfStages(*value, &allowed_stages)) {
     *error = ErrorUtils::FormatErrorMessage(kInvalidValue,
-                                                     keys::kStagesKey);
+                                                     keys_wrca::kStagesKey);
     return nullptr;
   }
 
@@ -785,7 +785,7 @@ WebRequestConditionAttributeStages::GetType() const {
 }
 
 std::string WebRequestConditionAttributeStages::GetName() const {
-  return keys::kStagesKey;
+  return keys_wrca::kStagesKey;
 }
 
 bool WebRequestConditionAttributeStages::Equals(
diff --git a/chromium/extensions/browser/api/web_request/upload_data_presenter.cc b/chromium/extensions/browser/api/web_request/upload_data_presenter.cc
index 017234ad638..63cd0800186 100644
--- a/chromium/extensions/browser/api/web_request/upload_data_presenter.cc
+++ b/chromium/extensions/browser/api/web_request/upload_data_presenter.cc
@@ -19,7 +19,7 @@ using base::DictionaryValue;
 using base::ListValue;
 using base::Value;
 
-namespace keys = extension_web_request_api_constants;
+namespace keys_udp = extension_web_request_api_constants;
 
 namespace {
 
@@ -83,7 +83,7 @@ std::unique_ptr<base::Value> RawDataPresenter::Result() {
 }
 
 void RawDataPresenter::FeedNextBytes(const char* bytes, size_t size) {
-  subtle::AppendKeyValuePair(keys::kRequestBodyRawBytesKey,
+  subtle::AppendKeyValuePair(keys_udp::kRequestBodyRawBytesKey,
                              base::Value::ToUniquePtrValue(base::Value(
                                  base::as_bytes(base::make_span(bytes, size)))),
                              list_.get());
@@ -91,7 +91,7 @@ void RawDataPresenter::FeedNextBytes(const char* bytes, size_t size) {
 
 void RawDataPresenter::FeedNextFile(const std::string& filename) {
   // Insert the file path instead of the contents, which may be too large.
-  subtle::AppendKeyValuePair(keys::kRequestBodyRawFileKey,
+  subtle::AppendKeyValuePair(keys_udp::kRequestBodyRawFileKey,
                              std::make_unique<base::Value>(filename),
                              list_.get());
 }
diff --git a/chromium/extensions/browser/api/web_request/web_request_api.cc b/chromium/extensions/browser/api/web_request/web_request_api.cc
index b7d804c359f..27740a22e44 100644
--- a/chromium/extensions/browser/api/web_request/web_request_api.cc
+++ b/chromium/extensions/browser/api/web_request/web_request_api.cc
@@ -97,7 +97,7 @@ using extensions::mojom::APIPermissionID;
 
 namespace activity_log = activity_log_web_request_constants;
 namespace helpers = extension_web_request_api_helpers;
-namespace keys = extension_web_request_api_constants;
+namespace keys_wra = extension_web_request_api_constants;
 using URLLoaderFactoryType =
     content::ContentBrowserClient::URLLoaderFactoryType;
 using DNRRequestAction = extensions::declarative_net_request::RequestAction;
@@ -139,15 +139,15 @@ const char kWebRequestEventPrefix[] = "webRequest.";
 // handled as a normal event (as opposed to a WebRequestEvent at the bindings
 // layer).
 const char* const kWebRequestEvents[] = {
-    keys::kOnBeforeRedirectEvent,
+    keys_wra::kOnBeforeRedirectEvent,
     web_request::OnBeforeRequest::kEventName,
-    keys::kOnBeforeSendHeadersEvent,
-    keys::kOnCompletedEvent,
+    keys_wra::kOnBeforeSendHeadersEvent,
+    keys_wra::kOnCompletedEvent,
     web_request::OnErrorOccurred::kEventName,
-    keys::kOnSendHeadersEvent,
-    keys::kOnAuthRequiredEvent,
-    keys::kOnResponseStartedEvent,
-    keys::kOnHeadersReceivedEvent,
+    keys_wra::kOnSendHeadersEvent,
+    keys_wra::kOnAuthRequiredEvent,
+    keys_wra::kOnResponseStartedEvent,
+    keys_wra::kOnHeadersReceivedEvent,
 };
 
 const char* GetRequestStageAsString(
@@ -156,23 +156,23 @@ const char* GetRequestStageAsString(
     case ExtensionWebRequestEventRouter::kInvalidEvent:
       return "Invalid";
     case ExtensionWebRequestEventRouter::kOnBeforeRequest:
-      return keys::kOnBeforeRequest;
+      return keys_wra::kOnBeforeRequest;
     case ExtensionWebRequestEventRouter::kOnBeforeSendHeaders:
-      return keys::kOnBeforeSendHeaders;
+      return keys_wra::kOnBeforeSendHeaders;
     case ExtensionWebRequestEventRouter::kOnSendHeaders:
-      return keys::kOnSendHeaders;
+      return keys_wra::kOnSendHeaders;
     case ExtensionWebRequestEventRouter::kOnHeadersReceived:
-      return keys::kOnHeadersReceived;
+      return keys_wra::kOnHeadersReceived;
     case ExtensionWebRequestEventRouter::kOnBeforeRedirect:
-      return keys::kOnBeforeRedirect;
+      return keys_wra::kOnBeforeRedirect;
     case ExtensionWebRequestEventRouter::kOnAuthRequired:
-      return keys::kOnAuthRequired;
+      return keys_wra::kOnAuthRequired;
     case ExtensionWebRequestEventRouter::kOnResponseStarted:
-      return keys::kOnResponseStarted;
+      return keys_wra::kOnResponseStarted;
     case ExtensionWebRequestEventRouter::kOnErrorOccurred:
-      return keys::kOnErrorOccurred;
+      return keys_wra::kOnErrorOccurred;
     case ExtensionWebRequestEventRouter::kOnCompleted:
-      return keys::kOnCompleted;
+      return keys_wra::kOnCompleted;
   }
   NOTREACHED();
   return "Not reached";
@@ -191,23 +191,23 @@ ExtensionWebRequestEventRouter::EventTypes GetEventTypeFromEventName(
   static base::NoDestructor<const base::flat_map<
       base::StringPiece, ExtensionWebRequestEventRouter::EventTypes>>
       kRequestStageMap(
-          {{keys::kOnBeforeRequest,
+          {{keys_wra::kOnBeforeRequest,
             ExtensionWebRequestEventRouter::kOnBeforeRequest},
-           {keys::kOnBeforeSendHeaders,
+           {keys_wra::kOnBeforeSendHeaders,
             ExtensionWebRequestEventRouter::kOnBeforeSendHeaders},
-           {keys::kOnSendHeaders,
+           {keys_wra::kOnSendHeaders,
             ExtensionWebRequestEventRouter::kOnSendHeaders},
-           {keys::kOnHeadersReceived,
+           {keys_wra::kOnHeadersReceived,
             ExtensionWebRequestEventRouter::kOnHeadersReceived},
-           {keys::kOnBeforeRedirect,
+           {keys_wra::kOnBeforeRedirect,
             ExtensionWebRequestEventRouter::kOnBeforeRedirect},
-           {keys::kOnAuthRequired,
+           {keys_wra::kOnAuthRequired,
             ExtensionWebRequestEventRouter::kOnAuthRequired},
-           {keys::kOnResponseStarted,
+           {keys_wra::kOnResponseStarted,
             ExtensionWebRequestEventRouter::kOnResponseStarted},
-           {keys::kOnErrorOccurred,
+           {keys_wra::kOnErrorOccurred,
             ExtensionWebRequestEventRouter::kOnErrorOccurred},
-           {keys::kOnCompleted, ExtensionWebRequestEventRouter::kOnCompleted}});
+           {keys_wra::kOnCompleted, ExtensionWebRequestEventRouter::kOnCompleted}});
 
   DCHECK_EQ(kRequestStageMap->size(), base::size(kWebRequestEvents));
 
@@ -265,13 +265,13 @@ bool IsRequestFromExtension(const WebRequestInfo& request,
 bool FromHeaderDictionary(const base::DictionaryValue* header_value,
                           std::string* name,
                           std::string* out_value) {
-  if (!header_value->GetString(keys::kHeaderNameKey, name))
+  if (!header_value->GetString(keys_wra::kHeaderNameKey, name))
     return false;
 
   // We require either a "value" or a "binaryValue" entry.
-  const base::Value* value = header_value->FindKey(keys::kHeaderValueKey);
+  const base::Value* value = header_value->FindKey(keys_wra::kHeaderValueKey);
   const base::Value* binary_value =
-      header_value->FindKey(keys::kHeaderBinaryValueKey);
+      header_value->FindKey(keys_wra::kHeaderBinaryValueKey);
   if (!((value != nullptr) ^ (binary_value != nullptr))) {
     return false;
   }
@@ -369,18 +369,18 @@ events::HistogramValue GetEventHistogramValue(const std::string& event_name) {
     events::HistogramValue histogram_value;
     const char* const event_name;
   } values_and_names[] = {
-      {events::WEB_REQUEST_ON_BEFORE_REDIRECT, keys::kOnBeforeRedirectEvent},
+      {events::WEB_REQUEST_ON_BEFORE_REDIRECT, keys_wra::kOnBeforeRedirectEvent},
       {events::WEB_REQUEST_ON_BEFORE_REQUEST,
        web_request::OnBeforeRequest::kEventName},
       {events::WEB_REQUEST_ON_BEFORE_SEND_HEADERS,
-       keys::kOnBeforeSendHeadersEvent},
-      {events::WEB_REQUEST_ON_COMPLETED, keys::kOnCompletedEvent},
+       keys_wra::kOnBeforeSendHeadersEvent},
+      {events::WEB_REQUEST_ON_COMPLETED, keys_wra::kOnCompletedEvent},
       {events::WEB_REQUEST_ON_ERROR_OCCURRED,
        web_request::OnErrorOccurred::kEventName},
-      {events::WEB_REQUEST_ON_SEND_HEADERS, keys::kOnSendHeadersEvent},
-      {events::WEB_REQUEST_ON_AUTH_REQUIRED, keys::kOnAuthRequiredEvent},
-      {events::WEB_REQUEST_ON_RESPONSE_STARTED, keys::kOnResponseStartedEvent},
-      {events::WEB_REQUEST_ON_HEADERS_RECEIVED, keys::kOnHeadersReceivedEvent}};
+      {events::WEB_REQUEST_ON_SEND_HEADERS, keys_wra::kOnSendHeadersEvent},
+      {events::WEB_REQUEST_ON_AUTH_REQUIRED, keys_wra::kOnAuthRequiredEvent},
+      {events::WEB_REQUEST_ON_RESPONSE_STARTED, keys_wra::kOnResponseStartedEvent},
+      {events::WEB_REQUEST_ON_HEADERS_RECEIVED, keys_wra::kOnHeadersReceivedEvent}};
   static_assert(base::size(kWebRequestEvents) == base::size(values_and_names),
                 "kWebRequestEvents and values_and_names must be the same");
   for (const ValueAndName& value_and_name : values_and_names) {
@@ -933,7 +933,7 @@ bool ExtensionWebRequestEventRouter::RequestFilter::InitFromValue(
         if (!urls_value->GetString(i, &url) ||
             pattern.Parse(url) != URLPattern::ParseResult::kSuccess) {
           *error = ErrorUtils::FormatErrorMessage(
-              keys::kInvalidRequestFilterUrl, url);
+              keys_wra::kInvalidRequestFilterUrl, url);
           return false;
         }
         urls.AddPattern(pattern);
@@ -1156,7 +1156,7 @@ int ExtensionWebRequestEventRouter::OnBeforeSendHeaders(
   bool initialize_blocked_requests = false;
 
   initialize_blocked_requests |=
-      ProcessDeclarativeRules(browser_context, keys::kOnBeforeSendHeadersEvent,
+      ProcessDeclarativeRules(browser_context, keys_wra::kOnBeforeSendHeadersEvent,
                               request, ON_BEFORE_SEND_HEADERS, nullptr);
 
   DCHECK(request->dnr_actions);
@@ -1169,7 +1169,7 @@ int ExtensionWebRequestEventRouter::OnBeforeSendHeaders(
 
   int extra_info_spec = 0;
   RawListeners listeners =
-      GetMatchingListeners(browser_context, keys::kOnBeforeSendHeadersEvent,
+      GetMatchingListeners(browser_context, keys_wra::kOnBeforeSendHeadersEvent,
                            request, &extra_info_spec);
   if (!listeners.empty() &&
       !GetAndSetSignaled(request->id, kOnBeforeSendHeaders)) {
@@ -1218,7 +1218,7 @@ void ExtensionWebRequestEventRouter::OnSendHeaders(
 
   int extra_info_spec = 0;
   RawListeners listeners = GetMatchingListeners(
-      browser_context, keys::kOnSendHeadersEvent, request, &extra_info_spec);
+      browser_context, keys_wra::kOnSendHeadersEvent, request, &extra_info_spec);
   if (listeners.empty())
     return;
 
@@ -1250,12 +1250,12 @@ int ExtensionWebRequestEventRouter::OnHeadersReceived(
       });
 
   initialize_blocked_requests |= ProcessDeclarativeRules(
-      browser_context, keys::kOnHeadersReceivedEvent, request,
+      browser_context, keys_wra::kOnHeadersReceivedEvent, request,
       ON_HEADERS_RECEIVED, original_response_headers);
 
   int extra_info_spec = 0;
   RawListeners listeners =
-      GetMatchingListeners(browser_context, keys::kOnHeadersReceivedEvent,
+      GetMatchingListeners(browser_context, keys_wra::kOnHeadersReceivedEvent,
                            request, &extra_info_spec);
 
   if (!listeners.empty() &&
@@ -1310,7 +1310,7 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
 
   int extra_info_spec = 0;
   RawListeners listeners = GetMatchingListeners(
-      browser_context, keys::kOnAuthRequiredEvent, request, &extra_info_spec);
+      browser_context, keys_wra::kOnAuthRequiredEvent, request, &extra_info_spec);
   if (listeners.empty())
     return AuthRequiredResponse::AUTH_REQUIRED_RESPONSE_NO_ACTION;
 
@@ -1349,7 +1349,7 @@ void ExtensionWebRequestEventRouter::OnBeforeRedirect(
 
   int extra_info_spec = 0;
   RawListeners listeners = GetMatchingListeners(
-      browser_context, keys::kOnBeforeRedirectEvent, request, &extra_info_spec);
+      browser_context, keys_wra::kOnBeforeRedirectEvent, request, &extra_info_spec);
   if (listeners.empty())
     return;
 
@@ -1357,7 +1357,7 @@ void ExtensionWebRequestEventRouter::OnBeforeRedirect(
       CreateEventDetails(*request, extra_info_spec));
   event_details->SetResponseHeaders(*request, request->response_headers.get());
   event_details->SetResponseSource(*request);
-  event_details->SetString(keys::kRedirectUrlKey, new_location.spec());
+  event_details->SetString(keys_wra::kRedirectUrlKey, new_location.spec());
 
   DispatchEvent(browser_context, request, listeners, std::move(event_details));
 }
@@ -1377,7 +1377,7 @@ void ExtensionWebRequestEventRouter::OnResponseStarted(
 
   int extra_info_spec = 0;
   RawListeners listeners =
-      GetMatchingListeners(browser_context, keys::kOnResponseStartedEvent,
+      GetMatchingListeners(browser_context, keys_wra::kOnResponseStartedEvent,
                            request, &extra_info_spec);
   if (listeners.empty())
     return;
@@ -1416,7 +1416,7 @@ void ExtensionWebRequestEventRouter::OnCompleted(
 
   int extra_info_spec = 0;
   RawListeners listeners = GetMatchingListeners(
-      browser_context, keys::kOnCompletedEvent, request, &extra_info_spec);
+      browser_context, keys_wra::kOnCompletedEvent, request, &extra_info_spec);
   if (listeners.empty())
     return;
 
@@ -1478,8 +1478,8 @@ void ExtensionWebRequestEventRouter::OnErrorOccurred(
   if (started)
     event_details->SetResponseSource(*request);
   else
-    event_details->SetBoolean(keys::kFromCache, request->response_from_cache);
-  event_details->SetString(keys::kErrorKey, net::ErrorToString(net_error));
+    event_details->SetBoolean(keys_wra::kFromCache, request->response_from_cache);
+  event_details->SetString(keys_wra::kErrorKey, net::ErrorToString(net_error));
 
   DispatchEvent(browser_context, request, listeners, std::move(event_details));
 }
@@ -2221,8 +2221,8 @@ void ExtensionWebRequestEventRouter::SendMessages(
     for (const std::string& message : messages) {
       std::unique_ptr<WebRequestEventDetails> event_details(CreateEventDetails(
           *blocked_request.request, /* extra_info_spec */ 0));
-      event_details->SetString(keys::kMessageKey, message);
-      event_details->SetString(keys::kStageKey,
+      event_details->SetString(keys_wra::kMessageKey, message);
+      event_details->SetString(keys_wra::kStageKey,
                                GetRequestStageAsString(blocked_request.event));
       SendOnMessageEventOnUI(browser_context, delta.extension_id,
                              blocked_request.request->is_web_view,
@@ -2597,7 +2597,7 @@ WebRequestInternalAddEventListenerFunction::Run() {
          (ExtraInfoSpec::BLOCKING | ExtraInfoSpec::ASYNC_BLOCKING)) &&
         !extension->permissions_data()->HasAPIPermission(
             APIPermissionID::kWebRequestBlocking)) {
-      return RespondNow(Error(keys::kBlockingPermissionRequired));
+      return RespondNow(Error(keys_wra::kBlockingPermissionRequired));
     }
 
     // We allow to subscribe to patterns that are broader than the host
@@ -2618,7 +2618,7 @@ WebRequestInternalAddEventListenerFunction::Run() {
             ->withheld_permissions()
             .explicit_hosts()
             .is_empty()) {
-      return RespondNow(Error(keys::kHostPermissionsRequired));
+      return RespondNow(Error(keys_wra::kHostPermissionsRequired));
     }
   }
 
@@ -2681,7 +2681,7 @@ WebRequestInternalEventHandledFunction::Run() {
 
     const base::Value* redirect_url_value = value->FindKey("redirectUrl");
     const base::Value* auth_credentials_value =
-        value->FindKey(keys::kAuthCredentialsKey);
+        value->FindKey(keys_wra::kAuthCredentialsKey);
     const base::Value* request_headers_value = value->FindKey("requestHeaders");
     const base::Value* response_headers_value =
         value->FindKey("responseHeaders");
@@ -2695,7 +2695,7 @@ WebRequestInternalEventHandledFunction::Run() {
          request_headers_value || response_headers_value)) {
       OnError(event_name, sub_event_name, request_id, render_process_id,
               web_view_instance_id, std::move(response));
-      return RespondNow(Error(keys::kInvalidPublicSessionBlockingResponse));
+      return RespondNow(Error(keys_wra::kInvalidPublicSessionBlockingResponse));
     }
 
     const base::Value* cancel_value = value->FindKey("cancel");
@@ -2704,7 +2704,7 @@ WebRequestInternalEventHandledFunction::Run() {
       if (value->DictSize() != 1) {
         OnError(event_name, sub_event_name, request_id, render_process_id,
                 web_view_instance_id, std::move(response));
-        return RespondNow(Error(keys::kInvalidBlockingResponse));
+        return RespondNow(Error(keys_wra::kInvalidBlockingResponse));
       }
 
       EXTENSION_FUNCTION_VALIDATE(cancel_value->is_bool());
@@ -2718,7 +2718,7 @@ WebRequestInternalEventHandledFunction::Run() {
       if (!response->new_url.is_valid()) {
         OnError(event_name, sub_event_name, request_id, render_process_id,
                 web_view_instance_id, std::move(response));
-        return RespondNow(Error(keys::kInvalidRedirectUrl, new_url_str));
+        return RespondNow(Error(keys_wra::kInvalidRedirectUrl, new_url_str));
       }
     }
 
@@ -2729,7 +2729,7 @@ WebRequestInternalEventHandledFunction::Run() {
         // Allow only one of the keys, not both.
         OnError(event_name, sub_event_name, request_id, render_process_id,
                 web_view_instance_id, std::move(response));
-        return RespondNow(Error(keys::kInvalidHeaderKeyCombination));
+        return RespondNow(Error(keys_wra::kInvalidHeaderKeyCombination));
       }
 
       base::ListValue* headers_value = NULL;
@@ -2737,11 +2737,11 @@ WebRequestInternalEventHandledFunction::Run() {
       std::unique_ptr<helpers::ResponseHeaders> response_headers;
       if (has_request_headers) {
         request_headers = std::make_unique<net::HttpRequestHeaders>();
-        EXTENSION_FUNCTION_VALIDATE(value->GetList(keys::kRequestHeadersKey,
+        EXTENSION_FUNCTION_VALIDATE(value->GetList(keys_wra::kRequestHeadersKey,
                                                    &headers_value));
       } else {
         response_headers = std::make_unique<helpers::ResponseHeaders>();
-        EXTENSION_FUNCTION_VALIDATE(value->GetList(keys::kResponseHeadersKey,
+        EXTENSION_FUNCTION_VALIDATE(value->GetList(keys_wra::kResponseHeadersKey,
                                                    &headers_value));
       }
 
@@ -2756,17 +2756,17 @@ WebRequestInternalEventHandledFunction::Run() {
           base::JSONWriter::Write(*header_value, &serialized_header);
           OnError(event_name, sub_event_name, request_id, render_process_id,
                   web_view_instance_id, std::move(response));
-          return RespondNow(Error(keys::kInvalidHeader, serialized_header));
+          return RespondNow(Error(keys_wra::kInvalidHeader, serialized_header));
         }
         if (!net::HttpUtil::IsValidHeaderName(name)) {
           OnError(event_name, sub_event_name, request_id, render_process_id,
                   web_view_instance_id, std::move(response));
-          return RespondNow(Error(keys::kInvalidHeaderName));
+          return RespondNow(Error(keys_wra::kInvalidHeaderName));
         }
         if (!net::HttpUtil::IsValidHeaderValue(value)) {
           OnError(event_name, sub_event_name, request_id, render_process_id,
                   web_view_instance_id, std::move(response));
-          return RespondNow(Error(keys::kInvalidHeaderValue, name));
+          return RespondNow(Error(keys_wra::kInvalidHeaderValue, name));
         }
         if (has_request_headers)
           request_headers->SetHeader(name, value);
@@ -2786,9 +2786,9 @@ WebRequestInternalEventHandledFunction::Run() {
       std::u16string username;
       std::u16string password;
       EXTENSION_FUNCTION_VALIDATE(
-          credentials_value->GetString(keys::kUsernameKey, &username));
+          credentials_value->GetString(keys_wra::kUsernameKey, &username));
       EXTENSION_FUNCTION_VALIDATE(
-          credentials_value->GetString(keys::kPasswordKey, &password));
+          credentials_value->GetString(keys_wra::kPasswordKey, &password));
       response->auth_credentials = net::AuthCredentials(username, password);
     }
   }
diff --git a/chromium/extensions/browser/api/web_request/web_request_info.cc b/chromium/extensions/browser/api/web_request/web_request_info.cc
index dcf804bc6b4..e5f1276c8f6 100644
--- a/chromium/extensions/browser/api/web_request/web_request_info.cc
+++ b/chromium/extensions/browser/api/web_request/web_request_info.cc
@@ -29,7 +29,7 @@
 #include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/url_loader.h"
 
-namespace keys = extension_web_request_api_constants;
+namespace keys_wri = extension_web_request_api_constants;
 
 namespace extensions {
 
@@ -125,8 +125,8 @@ std::unique_ptr<base::DictionaryValue> CreateRequestBodyData(
       &raw_data_presenter      // 2: any data at all? (Non-specific.)
   };
   // Keys for the results of the corresponding presenters.
-  static const char* const kKeys[] = {keys::kRequestBodyFormDataKey,
-                                      keys::kRequestBodyRawKey};
+  static const char* const kKeys[] = {keys_wri::kRequestBodyFormDataKey,
+                                      keys_wri::kRequestBodyRawKey};
   bool some_succeeded = false;
   if (!data_sources.empty()) {
     for (size_t i = 0; i < base::size(presenters); ++i) {
@@ -141,7 +141,7 @@ std::unique_ptr<base::DictionaryValue> CreateRequestBodyData(
   }
 
   if (!some_succeeded)
-    request_body_data->SetString(keys::kRequestBodyErrorKey, "Unknown error.");
+    request_body_data->SetString(keys_wri::kRequestBodyErrorKey, "Unknown error.");
 
   return request_body_data;
 }
diff --git a/chromium/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc b/chromium/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
index 7dcbef5fc11..be76fa780eb 100644
--- a/chromium/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
+++ b/chromium/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
@@ -46,25 +46,25 @@ namespace {
 // This shutdown notifier makes sure the proxy is destroyed if an incognito
 // browser context is destroyed. This is needed because WebRequestAPI only
 // clears the proxies when the original browser context is destroyed.
-class ShutdownNotifierFactory
+class ShutdownNotifierFactory2
     : public BrowserContextKeyedServiceShutdownNotifierFactory {
  public:
-  static ShutdownNotifierFactory* GetInstance() {
-    static base::NoDestructor<ShutdownNotifierFactory> factory;
+  static ShutdownNotifierFactory2* GetInstance() {
+    static base::NoDestructor<ShutdownNotifierFactory2> factory;
     return factory.get();
   }
 
  private:
-  friend class base::NoDestructor<ShutdownNotifierFactory>;
+  friend class base::NoDestructor<ShutdownNotifierFactory2>;
 
-  ShutdownNotifierFactory()
+  ShutdownNotifierFactory2()
       : BrowserContextKeyedServiceShutdownNotifierFactory(
             "WebRequestProxyingURLLoaderFactory") {
     DependsOn(PermissionHelper::GetFactoryInstance());
   }
-  ~ShutdownNotifierFactory() override {}
+  ~ShutdownNotifierFactory2() override {}
 
-  DISALLOW_COPY_AND_ASSIGN(ShutdownNotifierFactory);
+  DISALLOW_COPY_AND_ASSIGN(ShutdownNotifierFactory2);
 };
 
 // Creates simulated net::RedirectInfo when an extension redirects a request,
@@ -1136,7 +1136,7 @@ WebRequestProxyingURLLoaderFactory::WebRequestProxyingURLLoaderFactory(
   // canceled when |shutdown_notifier_subscription_| is destroyed, and
   // |proxies_| owns this.
   shutdown_notifier_subscription_ =
-      ShutdownNotifierFactory::GetInstance()
+      ShutdownNotifierFactory2::GetInstance()
           ->Get(browser_context)
           ->Subscribe(base::BindRepeating(&WebRequestAPI::ProxySet::RemoveProxy,
                                           base::Unretained(proxies_), this));
diff --git a/chromium/extensions/common/manifest_handlers/shared_module_info.cc b/chromium/extensions/common/manifest_handlers/shared_module_info.cc
index 1c94352a03a..2ce922fa9ef 100644
--- a/chromium/extensions/common/manifest_handlers/shared_module_info.cc
+++ b/chromium/extensions/common/manifest_handlers/shared_module_info.cc
@@ -36,7 +36,7 @@ namespace {
 
 const char kSharedModule[] = "shared_module";
 
-using ManifestKeys = api::shared_module::ManifestKeys;
+using ManifestKeys2 = api::shared_module::ManifestKeys;
 
 static base::LazyInstance<SharedModuleInfo>::DestructorAtExit
     g_empty_shared_module_info = LAZY_INSTANCE_INITIALIZER;
@@ -131,8 +131,8 @@ SharedModuleHandler::SharedModuleHandler() = default;
 SharedModuleHandler::~SharedModuleHandler() = default;
 
 bool SharedModuleHandler::Parse(Extension* extension, std::u16string* error) {
-  ManifestKeys manifest_keys;
-  if (!ManifestKeys::ParseFromDictionary(
+  ManifestKeys2 manifest_keys;
+  if (!ManifestKeys2::ParseFromDictionary(
           extension->manifest()->available_values(), &manifest_keys, error)) {
     return false;
   }
@@ -212,8 +212,8 @@ bool SharedModuleHandler::Validate(
 }
 
 base::span<const char* const> SharedModuleHandler::Keys() const {
-  static constexpr const char* kKeys[] = {ManifestKeys::kImport,
-                                          ManifestKeys::kExport};
+  static constexpr const char* kKeys[] = {ManifestKeys2::kImport,
+                                          ManifestKeys2::kExport};
   return kKeys;
 }
 
diff --git a/chromium/gpu/command_buffer/service/BUILD.gn b/chromium/gpu/command_buffer/service/BUILD.gn
index 9a7a5ba74e0..65b09454024 100644
--- a/chromium/gpu/command_buffer/service/BUILD.gn
+++ b/chromium/gpu/command_buffer/service/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/jumbo.gni")
 import("//build/config/ui.gni")
 import("//gpu/vulkan/features.gni")
 import("//skia/features.gni")
@@ -26,9 +25,9 @@ group("gles2") {
 }
 
 if (is_component_build) {
-  link_target_type = "jumbo_source_set"
+  link_target_type = "source_set"
 } else {
-  link_target_type = "jumbo_static_library"
+  link_target_type = "static_library"
 }
 target(link_target_type, "service_sources") {
   # External code should depend on this via //gpu/command_buffer/service above
@@ -496,7 +495,7 @@ proto_library("disk_cache_proto") {
 }
 
 if (is_android) {
-  jumbo_static_library("android_texture_owner_test_support") {
+  static_library("android_texture_owner_test_support") {
     testonly = true
     sources = [
       "mock_abstract_texture.cc",
diff --git a/chromium/gpu/config/BUILD.gn b/chromium/gpu/config/BUILD.gn
index 02fe2e3ff92..0934432eb55 100644
--- a/chromium/gpu/config/BUILD.gn
+++ b/chromium/gpu/config/BUILD.gn
@@ -5,7 +5,6 @@
 import("//build/config/chrome_build.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/chromeos/ui_mode.gni")
-import("//build/config/jumbo.gni")
 import("//build/config/python.gni")
 import("//build/config/ui.gni")
 import("//gpu/vulkan/features.gni")
@@ -114,7 +113,7 @@ if (enable_vulkan) {
   }
 }
 
-jumbo_source_set("config_sources") {
+source_set("config_sources") {
   # External code should depend on this via //gpu/config above rather than
   # depending on this directly or the component build will break.
   visibility = [ "//gpu/*" ]
diff --git a/chromium/media/filters/media_file_checker.cc b/chromium/media/filters/media_file_checker.cc
index a0f2848bbc6..2ae23e02fcb 100644
--- a/chromium/media/filters/media_file_checker.cc
+++ b/chromium/media/filters/media_file_checker.cc
@@ -29,7 +29,7 @@ void OnMediaFileCheckerError(bool* called) {
   *called = false;
 }
 
-struct Decoder {
+struct DecoderStruct {
   std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> context;
   std::unique_ptr<FFmpegDecodingLoop> loop;
 };
@@ -59,7 +59,7 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) {
 
   // Remember the codec context for any decodable audio or video streams.
   bool found_streams = false;
-  std::vector<Decoder> stream_contexts(format_context->nb_streams);
+  std::vector<DecoderStruct> stream_contexts(format_context->nb_streams);
   for (size_t i = 0; i < format_context->nb_streams; ++i) {
     AVCodecParameters* cp = format_context->streams[i]->codecpar;
 
diff --git a/chromium/mojo/public/tools/bindings/mojom.gni b/chromium/mojo/public/tools/bindings/mojom.gni
index efc60c71a08..3df85f1a192 100644
--- a/chromium/mojo/public/tools/bindings/mojom.gni
+++ b/chromium/mojo/public/tools/bindings/mojom.gni
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/jumbo.gni")
 import("//build/config/python.gni")
 import("//third_party/closure_compiler/closure_args.gni")
 import("//third_party/closure_compiler/compile_js.gni")
@@ -919,7 +918,7 @@ template("mojom") {
   }
 
   shared_cpp_sources_target_name = "${target_name}_shared_cpp_sources"
-  jumbo_source_set(shared_cpp_sources_target_name) {
+  source_set(shared_cpp_sources_target_name) {
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
@@ -1481,7 +1480,7 @@ template("mojom") {
       sources_target_name = output_target_name
     }
 
-    target("jumbo_" + sources_target_type, sources_target_name) {
+    target(sources_target_type, sources_target_name) {
       if (defined(output_name_override)) {
         output_name = output_name_override
       }
diff --git a/chromium/services/network/public/cpp/BUILD.gn b/chromium/services/network/public/cpp/BUILD.gn
index 0499bd7ef48..a271128add2 100644
--- a/chromium/services/network/public/cpp/BUILD.gn
+++ b/chromium/services/network/public/cpp/BUILD.gn
@@ -301,6 +301,11 @@ jumbo_component("cpp_base") {
     "web_transport_error_mojom_traits.cc",
     "web_transport_error_mojom_traits.h",
   ]
+  jumbo_excluded_sources = [
+    "network_ipc_param_traits.cc",
+    "p2p_param_traits.cc",
+    "url_request_mojom_traits.cc"
+  ]
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
diff --git a/chromium/services/network/web_bundle_url_loader_factory.cc b/chromium/services/network/web_bundle_url_loader_factory.cc
index b59582c043b..da417483c0a 100644
--- a/chromium/services/network/web_bundle_url_loader_factory.cc
+++ b/chromium/services/network/web_bundle_url_loader_factory.cc
@@ -25,7 +25,7 @@ namespace network {
 
 namespace {
 
-constexpr size_t kBlockedBodyAllocationSize = 1;
+constexpr size_t kBlockedBodyAllocationSize2 = 1;
 
 void DeleteProducerAndRunCallback(
     std::unique_ptr<mojo::DataPipeProducer> producer,
@@ -123,7 +123,7 @@ class WebBundleURLLoaderClient : public network::mojom::URLLoaderClient {
     options.struct_size = sizeof(MojoCreateDataPipeOptions);
     options.flags = MOJO_CREATE_DATA_PIPE_FLAG_NONE;
     options.element_num_bytes = 1;
-    options.capacity_num_bytes = kBlockedBodyAllocationSize;
+    options.capacity_num_bytes = kBlockedBodyAllocationSize2;
     mojo::ScopedDataPipeProducerHandle producer;
     mojo::ScopedDataPipeConsumerHandle consumer;
     MojoResult result = mojo::CreateDataPipe(&options, producer, consumer);
diff --git a/chromium/storage/browser/BUILD.gn b/chromium/storage/browser/BUILD.gn
index b161551eb41..2a0d469bf75 100644
--- a/chromium/storage/browser/BUILD.gn
+++ b/chromium/storage/browser/BUILD.gn
@@ -218,6 +218,10 @@ jumbo_component("browser") {
     "quota/usage_tracker.h",
   ]
 
+  jumbo_excluded_sources = [
+    "file_system/local_file_stream_reader.cc",
+  ]
+
   defines = [ "IS_STORAGE_BROWSER_IMPL" ]
   configs += [
     "//build/config:precompiled_headers",
diff --git a/chromium/storage/browser/quota/quota_settings.cc b/chromium/storage/browser/quota/quota_settings.cc
index 13958ce112c..925c1fc661b 100644
--- a/chromium/storage/browser/quota/quota_settings.cc
+++ b/chromium/storage/browser/quota/quota_settings.cc
@@ -24,14 +24,14 @@ namespace storage {
 
 namespace {
 
-const int64_t kMBytes = 1024 * 1024;
+const int64_t _kMBytes = 1024 * 1024;
 const int kRandomizedPercentage = 10;
 const double kDefaultPerHostRatio = 0.75;
 const double kIncognitoQuotaRatioLowerBound = 0.15;
 const double kIncognitoQuotaRatioUpperBound = 0.2;
 
 // Skews |value| by +/- |percent|.
-int64_t RandomizeByPercent(int64_t value, int percent) {
+int64_t MyRandomizeByPercent(int64_t value, int percent) {
   double random_percent = (base::RandDouble() - 0.5) * percent * 2;
   return value + (value * (random_percent / 100.0));
 }
@@ -116,7 +116,7 @@ absl::optional<QuotaSettings> CalculateNominalDynamicSettings(
   // SessionOnly (or ephemeral) origins are allotted a fraction of what
   // normal origins are provided, and the amount is capped to a hard limit.
   const double kSessionOnlyHostQuotaRatio = 0.1;  // 10%
-  const int64_t kMaxSessionOnlyHostQuota = 300 * kMBytes;
+  const int64_t kMaxSessionOnlyHostQuota = 300 * _kMBytes;
 
   QuotaSettings settings;
 
@@ -143,7 +143,7 @@ absl::optional<QuotaSettings> CalculateNominalDynamicSettings(
                static_cast<int64_t>(total * kMustRemainAvailableRatio));
   settings.per_host_quota = pool_size * kPerHostTemporaryRatio;
   settings.session_only_per_host_quota = std::min(
-      RandomizeByPercent(kMaxSessionOnlyHostQuota, kRandomizedPercentage),
+      MyRandomizeByPercent(kMaxSessionOnlyHostQuota, kRandomizedPercentage),
       static_cast<int64_t>(settings.per_host_quota *
                            kSessionOnlyHostQuotaRatio));
   settings.refresh_interval = base::TimeDelta::FromSeconds(60);
diff --git a/chromium/third_party/blink/common/frame/user_activation_state.cc b/chromium/third_party/blink/common/frame/user_activation_state.cc
index 5ec774f5ce4..a8a878ada00 100644
--- a/chromium/third_party/blink/common/frame/user_activation_state.cc
+++ b/chromium/third_party/blink/common/frame/user_activation_state.cc
@@ -14,7 +14,7 @@ namespace blink {
 // The expiry time should be long enough to allow network round trips even in a
 // very slow connection (to support xhr-like calls with user activation), yet
 // not too long to make an "unattended" page feel activated.
-constexpr base::TimeDelta kActivationLifespan = base::TimeDelta::FromSeconds(5);
+constexpr base::TimeDelta kActivationLifespan2 = base::TimeDelta::FromSeconds(5);
 
 UserActivationState::UserActivationState()
     : first_notification_type_(UserActivationNotificationType::kNone),
@@ -78,7 +78,7 @@ void UserActivationState::RecordPreconsumptionUma() const {
 }
 
 void UserActivationState::ActivateTransientState() {
-  transient_state_expiry_time_ = base::TimeTicks::Now() + kActivationLifespan;
+  transient_state_expiry_time_ = base::TimeTicks::Now() + kActivationLifespan2;
 }
 
 void UserActivationState::DeactivateTransientState() {
diff --git a/chromium/third_party/blink/common/user_agent/user_agent_metadata.cc b/chromium/third_party/blink/common/user_agent/user_agent_metadata.cc
index f4fcbcdc54c..9e104985bae 100644
--- a/chromium/third_party/blink/common/user_agent/user_agent_metadata.cc
+++ b/chromium/third_party/blink/common/user_agent/user_agent_metadata.cc
@@ -10,7 +10,7 @@
 namespace blink {
 
 namespace {
-constexpr uint32_t kVersion = 2u;
+constexpr uint32_t kVersionUA = 2u;
 }  // namespace
 
 UserAgentBrandVersion::UserAgentBrandVersion(
@@ -47,7 +47,7 @@ absl::optional<std::string> UserAgentMetadata::Marshal(
   if (!in)
     return absl::nullopt;
   base::Pickle out;
-  out.WriteUInt32(kVersion);
+  out.WriteUInt32(kVersionUA);
 
   out.WriteUInt32(in->brand_version_list.size());
   for (const auto& brand_version : in->brand_version_list) {
@@ -75,7 +75,7 @@ absl::optional<UserAgentMetadata> UserAgentMetadata::Demarshal(
 
   uint32_t version;
   UserAgentMetadata out;
-  if (!in.ReadUInt32(&version) || version != kVersion)
+  if (!in.ReadUInt32(&version) || version != kVersionUA)
     return absl::nullopt;
 
   uint32_t brand_version_size;
diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py
index 45bc422d5b2..a36a3f6c7b4 100644
--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py
+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py
@@ -185,6 +185,7 @@ def generate_callback_interface(callback_interface_identifier):
          cg_context,
          FN_INSTALL_INTERFACE_TEMPLATE,
          class_name=class_name,
+         api_class_name=class_name,
          trampoline_var_name=None,
          constructor_entries=[],
          supplemental_install_node=SequenceNode(),
diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
index ddf6e213ef5..761561fe47a 100644
--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
@@ -5349,7 +5349,7 @@ ${prototype_object}->GetPrototype().As<v8::Object>()->Delete(
     return SequenceNode(nodes) if nodes else None
 
 
-def make_install_interface_template(cg_context, function_name, class_name,
+def make_install_interface_template(cg_context, function_name, class_name, api_class_name,
                                     trampoline_var_name, constructor_entries,
                                     supplemental_install_node,
                                     install_unconditional_func_name,
@@ -5450,7 +5450,7 @@ def make_install_interface_template(cg_context, function_name, class_name,
     for entry in constructor_entries:
         set_callback = _format(
             "${interface_function_template}->SetCallHandler({});",
-            entry.ctor_callback_name)
+            api_class_name + "Callbacks::" + entry.ctor_callback_name)
         set_length = _format("${interface_function_template}->SetLength({});",
                              entry.ctor_func_length)
         if entry.world == CodeGenContext.MAIN_WORLD:
@@ -5843,6 +5843,7 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As<v8::Object>();\
         if unconditional_entries:
             body.append(
                 CxxBlockNode([
+                    TextNode("using namespace ${class_name}Callbacks;"),
                     make_table_func(table_name, unconditional_entries),
                     TextNode(installer_call_text),
                 ]))
@@ -5852,6 +5853,7 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As<v8::Object>();\
                 CxxUnlikelyIfNode(
                     cond=conditional,
                     body=[
+                        TextNode("using namespace ${class_name}Callbacks;"),
                         make_table_func(table_name, entries),
                         TextNode(installer_call_text),
                     ]))
@@ -6003,6 +6005,8 @@ def make_indexed_and_named_property_callbacks_and_install_node(cg_context):
                 map(lambda flag: "int32_t({})".format(flag), flags))))
         pattern = """\
 // Named interceptors
+{{
+using namespace ${class_name}Callbacks;
 ${instance_object_template}->SetHandler(
     v8::NamedPropertyHandlerConfiguration(
         {impl_bridge}::NamedPropertyGetterCallback,
@@ -6023,7 +6027,9 @@ interface.indexed_and_named_properties.named_getter.extended_attributes:
         {impl_bridge}::NamedPropertyDefinerCallback,
         {impl_bridge}::NamedPropertyDescriptorCallback,
         v8::Local<v8::Value>(),
-        {property_handler_flags}));"""
+        {property_handler_flags}));
+}}
+"""
         install_node.append(
             F(pattern,
               impl_bridge=impl_bridge,
@@ -6062,6 +6068,8 @@ interface.indexed_and_named_properties.named_getter.extended_attributes:
         property_handler_flags = flags[0]
         pattern = """\
 // Indexed interceptors
+{{
+using namespace ${class_name}Callbacks;
 ${instance_object_template}->SetHandler(
     v8::IndexedPropertyHandlerConfiguration(
         {impl_bridge}::IndexedPropertyGetterCallback,
@@ -6076,7 +6084,8 @@ ${instance_object_template}->SetHandler(
         {impl_bridge}::IndexedPropertyDefinerCallback,
         {impl_bridge}::IndexedPropertyDescriptorCallback,
         v8::Local<v8::Value>(),
-        {property_handler_flags}));"""
+        {property_handler_flags}));
+}}"""
         install_node.append(
             F(pattern,
               impl_bridge=impl_bridge,
@@ -6137,6 +6146,8 @@ def make_named_properties_object_callbacks_and_install_node(cg_context):
         callback_defs.append(EmptyNode())
 
     text = """\
+{{
+using namespace ${class_name}Callbacks;
 // Named interceptors
 ${npo_prototype_template}->SetHandler(
     v8::NamedPropertyHandlerConfiguration(
@@ -6162,7 +6173,8 @@ ${npo_prototype_template}->SetHandler(
         NamedPropsObjIndexedDefinerCallback,
         NamedPropsObjIndexedDescriptorCallback,
         v8::Local<v8::Value>(),
-        v8::PropertyHandlerFlags::kNone));"""
+        v8::PropertyHandlerFlags::kNone));
+}}"""
     install_node.append(TextNode(text))
 
     return callback_defs, install_node
@@ -6301,6 +6313,8 @@ def make_cross_origin_property_callbacks_and_install_node(
 
     text = """\
 // Cross origin properties
+{{
+using namespace ${class_name}Callbacks;
 ${instance_object_template}->SetAccessCheckCallbackAndHandler(
     CrossOriginAccessCheckCallback,
     v8::NamedPropertyHandlerConfiguration(
@@ -6326,6 +6340,7 @@ ${instance_object_template}->SetAccessCheckCallbackAndHandler(
     v8::External::New(
         ${isolate},
         const_cast<WrapperTypeInfo*>(${class_name}::GetWrapperTypeInfo())));
+}}
 """
     install_node.append(TextNode(text))
     install_node.accumulate(
@@ -6358,6 +6373,8 @@ ${instance_object_template}->SetAccessCheckCallbackAndHandler(
         callback_defs.append(EmptyNode())
 
     text = """\
+{{
+using namespace ${class_name}Callbacks;
 // Same origin interceptors
 ${instance_object_template}->SetHandler(
     v8::IndexedPropertyHandlerConfiguration(
@@ -6370,6 +6387,7 @@ ${instance_object_template}->SetHandler(
         SameOriginIndexedDescriptorCallback,
         v8::Local<v8::Value>(),
         v8::PropertyHandlerFlags::kNone));
+}}
 """
     install_node.append(TextNode(text))
 
@@ -6485,6 +6503,7 @@ def make_wrapper_type_info(cg_context, function_name,
         cg_context.template_bindings())
 
     pattern = """\
+namespace ${class_name}Callbacks {{ }}
 // Construction of WrapperTypeInfo may require non-trivial initialization due
 // to cross-component address resolution in order to load the pointer to the
 // parent interface's WrapperTypeInfo.  We ignore this issue because the issue
@@ -6690,6 +6709,7 @@ def _make_v8_context_snapshot_get_reference_table_function(
                                                                            )),
             filter(None, callback_names)))
     table_node = ListNode([
+        TextNode("using namespace ${class_name}Callbacks;"),
         TextNode("static const intptr_t kReferenceTable[] = {"),
         ListNode(entry_nodes),
         TextNode("};"),
@@ -7137,6 +7157,7 @@ def generate_class_like(class_like):
          cg_context,
          FN_INSTALL_INTERFACE_TEMPLATE,
          class_name=impl_class_name,
+         api_class_name=api_class_name,
          trampoline_var_name=tp_install_interface_template,
          constructor_entries=constructor_entries,
          supplemental_install_node=supplemental_install_node,
@@ -7354,7 +7375,7 @@ def generate_class_like(class_like):
                                                     class_like.identifier)
     impl_source_blink_ns.body.extend([
         CxxNamespaceNode(
-            name="",
+            name=api_class_name + "Callbacks",
             body=[
                 # Enclose the implementations with a namespace just in order to
                 # include the class_like name in a stacktrace, such as
diff --git a/chromium/third_party/blink/renderer/core/BUILD.gn b/chromium/third_party/blink/renderer/core/BUILD.gn
index e04c132a1d9..3903e695276 100644
--- a/chromium/third_party/blink/renderer/core/BUILD.gn
+++ b/chromium/third_party/blink/renderer/core/BUILD.gn
@@ -5,6 +5,7 @@
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
+import("//build/config/jumbo.gni")
 import("//build/config/ui.gni")
 import("//build/toolchain/toolchain.gni")
 import("//printing/buildflags/buildflags.gni")
@@ -121,7 +122,7 @@ source_set("core_common") {
   sources = [ "core_export.h" ]
 }
 
-source_set("prerequisites") {
+jumbo_source_set("prerequisites") {
   public_deps = [
     "//services/network/public/cpp:cpp",
     "//services/network/public/mojom",
@@ -169,7 +170,7 @@ source_set("prerequisites") {
   ]
 }
 
-component("core") {
+jumbo_component("core") {
   output_name = "blink_core"
 
   visibility = []  # Allow re-assignment of list.
diff --git a/chromium/third_party/blink/renderer/core/animation/BUILD.gn b/chromium/third_party/blink/renderer/core/animation/BUILD.gn
index efc1cfc7c81..86784eaffbf 100644
--- a/chromium/third_party/blink/renderer/core/animation/BUILD.gn
+++ b/chromium/third_party/blink/renderer/core/animation/BUILD.gn
@@ -281,6 +281,9 @@ blink_core_sources("animation") {
     "worklet_animation_controller.cc",
     "worklet_animation_controller.h",
   ]
+  jumbo_excluded_sources = [
+    "css_transform_interpolation_type.cc",
+  ]
 
   deps = [
     ":buildflags",
diff --git a/chromium/third_party/blink/renderer/core/frame/sticky_ad_detector.cc b/chromium/third_party/blink/renderer/core/frame/sticky_ad_detector.cc
index ae803ab8891..de42afc62c8 100644
--- a/chromium/third_party/blink/renderer/core/frame/sticky_ad_detector.cc
+++ b/chromium/third_party/blink/renderer/core/frame/sticky_ad_detector.cc
@@ -22,8 +22,8 @@ namespace blink {
 
 namespace {
 
-constexpr base::TimeDelta kFireInterval = base::TimeDelta::FromSeconds(1);
-constexpr double kLargeAdSizeToViewportSizeThreshold = 0.3;
+constexpr base::TimeDelta kFireInterval2 = base::TimeDelta::FromSeconds(1);
+constexpr double kLargeAdSizeToViewportSizeThreshold2 = 0.3;
 
 // An sticky element should have a non-default position w.r.t. the viewport. The
 // main page should also be scrollable.
@@ -71,7 +71,7 @@ void StickyAdDetector::MaybeFireDetection(LocalFrame* main_frame) {
   if (last_detection_time_.has_value() &&
       base::FeatureList::IsEnabled(
           features::kFrequencyCappingForLargeStickyAdDetection) &&
-      current_time < last_detection_time_.value() + kFireInterval) {
+      current_time < last_detection_time_.value() + kFireInterval2) {
     return;
   }
 
@@ -120,7 +120,7 @@ void StickyAdDetector::MaybeFireDetection(LocalFrame* main_frame) {
 
   bool is_large =
       (overlay_rect.Size().Area() >
-       main_frame_size.Area() * kLargeAdSizeToViewportSizeThreshold);
+       main_frame_size.Area() * kLargeAdSizeToViewportSizeThreshold2);
 
   bool is_main_page_scrollable =
       element->GetDocument().GetLayoutView()->HasScrollableOverflowY();
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_theme.cc b/chromium/third_party/blink/renderer/core/layout/layout_theme.cc
index 3018b856f19..e0653b8c3ce 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_theme.cc
+++ b/chromium/third_party/blink/renderer/core/layout/layout_theme.cc
@@ -743,7 +743,7 @@ String LayoutTheme::DisplayNameForFile(const File& file) const {
 
 bool LayoutTheme::SupportsCalendarPicker(const AtomicString& type) const {
   DCHECK(RuntimeEnabledFeatures::InputMultipleFieldsUIEnabled());
-  if (features::IsFormControlsRefreshEnabled() &&
+  if (::features::IsFormControlsRefreshEnabled() &&
       type == input_type_names::kTime)
     return true;
 
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_theme_default.cc b/chromium/third_party/blink/renderer/core/layout/layout_theme_default.cc
index 4f4845e7c44..c5b6b5d79e0 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_theme_default.cc
+++ b/chromium/third_party/blink/renderer/core/layout/layout_theme_default.cc
@@ -66,7 +66,7 @@ String LayoutThemeDefault::ExtraDefaultStyleSheet() {
   String windows_style_sheet =
       UncompressResourceAsASCIIString(IDR_UASTYLE_THEME_WIN_CSS);
   String controls_refresh_style_sheet =
-      features::IsFormControlsRefreshEnabled()
+      ::features::IsFormControlsRefreshEnabled()
           ? UncompressResourceAsASCIIString(
                 IDR_UASTYLE_THEME_CONTROLS_REFRESH_CSS)
           : String();
@@ -108,7 +108,7 @@ Color LayoutThemeDefault::PlatformInactiveSelectionForegroundColor(
 IntSize LayoutThemeDefault::SliderTickSize() const {
   // The value should be synchronized with a -webkit-slider-container rule in
   // html.css.
-  if (features::IsFormControlsRefreshEnabled())
+  if (::features::IsFormControlsRefreshEnabled())
     return IntSize(1, 4);
   else
     return IntSize(1, 6);
@@ -117,7 +117,7 @@ IntSize LayoutThemeDefault::SliderTickSize() const {
 int LayoutThemeDefault::SliderTickOffsetFromTrackCenter() const {
   // The value should be synchronized with a -webkit-slider-container rule in
   // html.css and LayoutThemeAndroid::ExtraDefaultStyleSheet().
-  if (features::IsFormControlsRefreshEnabled())
+  if (::features::IsFormControlsRefreshEnabled())
     return 7;
   else
     return -16;
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc b/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc
index 2eaee00d1f7..fa1938f1966 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc
@@ -80,10 +80,10 @@ LayoutUnit NGFlexLayoutAlgorithm::MainAxisContentExtent(
 
 namespace {
 
-enum AxisEdge { kStart, kCenter, kEnd };
+enum class LocalAxisEdge { kStart, kCenter, kEnd };
 
 // Maps the resolved justify-content value to a static-position edge.
-AxisEdge MainAxisStaticPositionEdge(const ComputedStyle& style,
+LocalAxisEdge MainAxisStaticPositionEdge(const ComputedStyle& style,
                                     bool is_column) {
   const StyleContentAlignmentData justify =
       FlexLayoutAlgorithm::ResolvedJustifyContent(style);
@@ -93,18 +93,18 @@ AxisEdge MainAxisStaticPositionEdge(const ComputedStyle& style,
                              : style.ResolvedIsRowReverseFlexDirection();
 
   if (content_position == ContentPosition::kFlexEnd)
-    return is_reverse_flex ? AxisEdge::kStart : AxisEdge::kEnd;
+    return is_reverse_flex ? LocalAxisEdge::kStart : LocalAxisEdge::kEnd;
 
   if (content_position == ContentPosition::kCenter ||
       justify.Distribution() == ContentDistributionType::kSpaceAround ||
       justify.Distribution() == ContentDistributionType::kSpaceEvenly)
-    return AxisEdge::kCenter;
+    return LocalAxisEdge::kCenter;
 
-  return is_reverse_flex ? AxisEdge::kEnd : AxisEdge::kStart;
+  return is_reverse_flex ? LocalAxisEdge::kEnd : LocalAxisEdge::kStart;
 }
 
 // Maps the resolved alignment value to a static-position edge.
-AxisEdge CrossAxisStaticPositionEdge(const ComputedStyle& style,
+LocalAxisEdge CrossAxisStaticPositionEdge(const ComputedStyle& style,
                                      const ComputedStyle& child_style) {
   ItemPosition alignment =
       FlexLayoutAlgorithm::AlignmentForChild(style, child_style);
@@ -112,16 +112,16 @@ AxisEdge CrossAxisStaticPositionEdge(const ComputedStyle& style,
   // kFlexEnd, but not kStretch. kStretch is supposed to act like kFlexStart.
   if (style.FlexWrap() == EFlexWrap::kWrapReverse &&
       alignment == ItemPosition::kStretch) {
-    return AxisEdge::kEnd;
+    return LocalAxisEdge::kEnd;
   }
 
   if (alignment == ItemPosition::kFlexEnd)
-    return AxisEdge::kEnd;
+    return LocalAxisEdge::kEnd;
 
   if (alignment == ItemPosition::kCenter)
-    return AxisEdge::kCenter;
+    return LocalAxisEdge::kCenter;
 
-  return AxisEdge::kStart;
+  return LocalAxisEdge::kStart;
 }
 
 LayoutUnit ComputeSizeFromAspectRatio(LayoutUnit extent,
@@ -132,12 +132,12 @@ LayoutUnit ComputeSizeFromAspectRatio(LayoutUnit extent,
 }  // namespace
 
 void NGFlexLayoutAlgorithm::HandleOutOfFlowPositioned(NGBlockNode child) {
-  AxisEdge main_axis_edge = MainAxisStaticPositionEdge(Style(), is_column_);
-  AxisEdge cross_axis_edge =
+  LocalAxisEdge main_axis_edge = MainAxisStaticPositionEdge(Style(), is_column_);
+  LocalAxisEdge cross_axis_edge =
       CrossAxisStaticPositionEdge(Style(), child.Style());
 
-  AxisEdge inline_axis_edge = is_column_ ? cross_axis_edge : main_axis_edge;
-  AxisEdge block_axis_edge = is_column_ ? main_axis_edge : cross_axis_edge;
+  LocalAxisEdge inline_axis_edge = is_column_ ? cross_axis_edge : main_axis_edge;
+  LocalAxisEdge block_axis_edge = is_column_ ? main_axis_edge : cross_axis_edge;
 
   using InlineEdge = NGLogicalStaticPosition::InlineEdge;
   using BlockEdge = NGLogicalStaticPosition::BlockEdge;
@@ -147,9 +147,9 @@ void NGFlexLayoutAlgorithm::HandleOutOfFlowPositioned(NGBlockNode child) {
   LogicalOffset offset = BorderScrollbarPadding().StartOffset();
 
   // Determine the static-position based off the axis-edge.
-  if (inline_axis_edge == AxisEdge::kStart) {
+  if (inline_axis_edge == LocalAxisEdge::kStart) {
     inline_edge = InlineEdge::kInlineStart;
-  } else if (inline_axis_edge == AxisEdge::kCenter) {
+  } else if (inline_axis_edge == LocalAxisEdge::kCenter) {
     inline_edge = InlineEdge::kInlineCenter;
     offset.inline_offset += ChildAvailableSize().inline_size / 2;
   } else {
@@ -159,9 +159,9 @@ void NGFlexLayoutAlgorithm::HandleOutOfFlowPositioned(NGBlockNode child) {
 
   // We may not know the final block-size of the fragment yet. This will be
   // adjusted within the |NGContainerFragmentBuilder| once set.
-  if (block_axis_edge == AxisEdge::kStart) {
+  if (block_axis_edge == LocalAxisEdge::kStart) {
     block_edge = BlockEdge::kBlockStart;
-  } else if (block_axis_edge == AxisEdge::kCenter) {
+  } else if (block_axis_edge == LocalAxisEdge::kCenter) {
     block_edge = BlockEdge::kBlockCenter;
     offset.block_offset -= BorderScrollbarPadding().BlockSum() / 2;
   } else {
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/mathml/ng_math_scripts_layout_algorithm.cc b/chromium/third_party/blink/renderer/core/layout/ng/mathml/ng_math_scripts_layout_algorithm.cc
index 771d5a55af0..1f0790bbcec 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/mathml/ng_math_scripts_layout_algorithm.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/mathml/ng_math_scripts_layout_algorithm.cc
@@ -15,7 +15,7 @@ namespace {
 
 using MathConstants = OpenTypeMathSupport::MathConstants;
 
-static bool IsPrescriptDelimiter(const NGBlockNode& blockNode) {
+bool MyIsPrescriptDelimiter(const NGBlockNode& blockNode) {
   auto* node = blockNode.GetDOMNode();
   return node && IsA<MathMLElement>(node) &&
          node->HasTagName(mathml_names::kMprescriptsTag);
@@ -147,7 +147,7 @@ void NGMathScriptsLayoutAlgorithm::GatherChildren(
       case MathScriptType::kMultiscripts: {
         // The structure of mmultiscripts is specified here:
         // https://mathml-refresh.github.io/mathml-core/#prescripts-and-tensor-indices-mmultiscripts
-        if (IsPrescriptDelimiter(block_child)) {
+        if (MyIsPrescriptDelimiter(block_child)) {
           if (!number_of_scripts_is_even || *prescripts) {
             NOTREACHED();
             return;
diff --git a/chromium/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc b/chromium/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc
index 195ecbfdb1a..bf4d16bbebd 100644
--- a/chromium/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc
+++ b/chromium/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc
@@ -25,7 +25,7 @@
 namespace blink {
 
 const char kAbortErrorMessage[] = "The Bluetooth operation was cancelled.";
-const char kInactiveDocumentError[] = "Document not active";
+const char kInactiveDocumentError2[] = "Document not active";
 const char kInvalidStateErrorMessage[] =
     "Pending watch advertisements operation.";
 
@@ -110,7 +110,7 @@ ScriptPromise BluetoothDevice::watchAdvertisements(
     ExceptionState& exception_state) {
   ExecutionContext* context = GetExecutionContext();
   if (!context) {
-    exception_state.ThrowTypeError(kInactiveDocumentError);
+    exception_state.ThrowTypeError(kInactiveDocumentError2);
     return ScriptPromise();
   }
 
diff --git a/chromium/third_party/blink/renderer/modules/breakout_box/media_stream_audio_track_underlying_source.cc b/chromium/third_party/blink/renderer/modules/breakout_box/media_stream_audio_track_underlying_source.cc
index 218df8dc44f..b4f6d953cef 100644
--- a/chromium/third_party/blink/renderer/modules/breakout_box/media_stream_audio_track_underlying_source.cc
+++ b/chromium/third_party/blink/renderer/modules/breakout_box/media_stream_audio_track_underlying_source.cc
@@ -13,7 +13,7 @@
 namespace blink {
 
 namespace {
-class PlaceholderTransferringOptimizer
+class PlaceholderTransferringOptimizer2
     : public ReadableStreamTransferringOptimizer {
   UnderlyingSourceBase* PerformInProcessOptimization(
       ScriptState* script_state) override {
@@ -92,7 +92,7 @@ void MediaStreamAudioTrackUnderlyingSource::OnSetFormat(
 
 std::unique_ptr<ReadableStreamTransferringOptimizer>
 MediaStreamAudioTrackUnderlyingSource::GetTransferringOptimizer() {
-  return std::make_unique<PlaceholderTransferringOptimizer>();
+  return std::make_unique<PlaceholderTransferringOptimizer2>();
 }
 
 }  // namespace blink
diff --git a/chromium/third_party/blink/renderer/modules/canvas/BUILD.gn b/chromium/third_party/blink/renderer/modules/canvas/BUILD.gn
index 4c7dfb33a46..d8a2362e931 100644
--- a/chromium/third_party/blink/renderer/modules/canvas/BUILD.gn
+++ b/chromium/third_party/blink/renderer/modules/canvas/BUILD.gn
@@ -54,6 +54,10 @@ blink_modules_sources("canvas") {
     "offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc",
     "offscreencanvas2d/offscreen_canvas_rendering_context_2d.h",
   ]
+  jumbo_excluded_sources = [
+    "imagebitmap/image_bitmap_rendering_context_base.cc",
+    "offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc",
+  ]
 
   deps = [ "//third_party/blink/renderer/modules/webcodecs" ]
   allow_circular_includes_from =
diff --git a/chromium/third_party/blink/renderer/modules/credentialmanager/otp_credential.cc b/chromium/third_party/blink/renderer/modules/credentialmanager/otp_credential.cc
index cd021b57ae4..8b7ef3d51eb 100644
--- a/chromium/third_party/blink/renderer/modules/credentialmanager/otp_credential.cc
+++ b/chromium/third_party/blink/renderer/modules/credentialmanager/otp_credential.cc
@@ -9,12 +9,12 @@
 
 namespace blink {
 
-namespace {
-constexpr char kOtpCredentialType[] = "otp";
+namespace i {
+constexpr static char kOtpCredentialType[] = "otp";
 }
 
 OTPCredential::OTPCredential(const String& code)
-    : Credential(String(), kOtpCredentialType), code_(code) {}
+    : Credential(String(), i::kOtpCredentialType), code_(code) {}
 
 bool OTPCredential::IsOTPCredential() const {
   return true;
diff --git a/chromium/third_party/blink/renderer/modules/mediastream/BUILD.gn b/chromium/third_party/blink/renderer/modules/mediastream/BUILD.gn
index a70cc927e4d..9d60a029cd8 100644
--- a/chromium/third_party/blink/renderer/modules/mediastream/BUILD.gn
+++ b/chromium/third_party/blink/renderer/modules/mediastream/BUILD.gn
@@ -102,6 +102,13 @@ blink_modules_sources("mediastream") {
     "webmediaplayer_ms_compositor.cc",
     "webmediaplayer_ms_compositor.h",
   ]
+
+  jumbo_excluded_sources = [
+    "input_device_info.cc",
+    "processed_local_audio_source.cc",
+    "user_media_processor.cc",
+  ]
+
   deps = [
     "//build:chromecast_buildflags",
     "//build:chromeos_buildflags",
diff --git a/chromium/third_party/blink/renderer/modules/peerconnection/BUILD.gn b/chromium/third_party/blink/renderer/modules/peerconnection/BUILD.gn
index fdf4c79d246..5be481669a8 100644
--- a/chromium/third_party/blink/renderer/modules/peerconnection/BUILD.gn
+++ b/chromium/third_party/blink/renderer/modules/peerconnection/BUILD.gn
@@ -140,6 +140,10 @@ blink_modules_sources("peerconnection") {
     "webrtc_set_description_observer.h",
   ]
 
+  jumbo_excluded_sources = [
+    "rtc_rtp_sender_impl.cc"
+  ]
+
   public_deps = [ "//third_party/webrtc_overrides:webrtc_component" ]
   deps = [
     "//jingle:webrtc_glue",
diff --git a/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn
index cfbf4dcb50f..abe158d44ba 100644
--- a/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn
+++ b/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn
@@ -68,6 +68,7 @@ blink_modules_sources("webcodecs") {
     "webcodecs_logger.cc",
     "webcodecs_logger.h",
   ]
+  jumbo_excluded_sources = [ "video_decoder_broker.cc" ]
   deps = [
     "//media",
     "//media/mojo:buildflags",
diff --git a/chromium/third_party/blink/renderer/modules/webcodecs/decoder_template.cc b/chromium/third_party/blink/renderer/modules/webcodecs/decoder_template.cc
index 921a079961f..91dab62d31c 100644
--- a/chromium/third_party/blink/renderer/modules/webcodecs/decoder_template.cc
+++ b/chromium/third_party/blink/renderer/modules/webcodecs/decoder_template.cc
@@ -51,7 +51,7 @@ namespace blink {
 
 namespace {
 
-constexpr const char kCategory[] = "media";
+constexpr const char kCategory2[] = "media";
 
 base::AtomicSequenceNumber g_sequence_num_for_counters;
 
@@ -463,7 +463,7 @@ void DecoderTemplate<Traits>::Shutdown(DOMException* exception) {
   if (IsClosed())
     return;
 
-  TRACE_EVENT1(kCategory, GetTraceNames()->shutdown.c_str(), "has_exception",
+  TRACE_EVENT1(kCategory2, GetTraceNames()->shutdown.c_str(), "has_exception",
                !!exception);
 
   // Abort pending work (otherwise it will never complete)
@@ -503,7 +503,7 @@ void DecoderTemplate<Traits>::Shutdown(DOMException* exception) {
   }
 
   bool trace_enabled = false;
-  TRACE_EVENT_CATEGORY_GROUP_ENABLED(kCategory, &trace_enabled);
+  TRACE_EVENT_CATEGORY_GROUP_ENABLED(kCategory2, &trace_enabled);
   if (trace_enabled) {
     for (auto& pending_decode : pending_decodes_)
       pending_decode.value->decode_trace.reset();
@@ -686,17 +686,17 @@ void DecoderTemplate<Traits>::OnOutput(uint32_t reset_generation,
 
   OutputType* blink_output = std::move(output_or_error).value();
 
-  TRACE_EVENT_BEGIN1(kCategory, GetTraceNames()->output.c_str(), "timestamp",
+  TRACE_EVENT_BEGIN1(kCategory2, GetTraceNames()->output.c_str(), "timestamp",
                      blink_output->timestamp());
 
   output_cb_->InvokeAndReportException(nullptr, blink_output);
 
-  TRACE_EVENT_END0(kCategory, GetTraceNames()->output.c_str());
+  TRACE_EVENT_END0(kCategory2, GetTraceNames()->output.c_str());
 }
 
 template <typename Traits>
 void DecoderTemplate<Traits>::TraceQueueSizes() const {
-  TRACE_COUNTER_ID2(kCategory, GetTraceNames()->requests_counter.c_str(),
+  TRACE_COUNTER_ID2(kCategory2, GetTraceNames()->requests_counter.c_str(),
                     trace_counter_id_, "decodes", num_pending_decodes_, "other",
                     requests_.size() - num_pending_decodes_);
 }
@@ -755,7 +755,7 @@ void DecoderTemplate<Traits>::Request::StartTracing() {
   DCHECK(!is_tracing);
   is_tracing = true;
 #endif
-  TRACE_EVENT_NESTABLE_ASYNC_BEGIN0(kCategory, TraceNameFromType(), this);
+  TRACE_EVENT_NESTABLE_ASYNC_BEGIN0(kCategory2, TraceNameFromType(), this);
 }
 
 template <typename Traits>
@@ -764,7 +764,7 @@ void DecoderTemplate<Traits>::Request::EndTracing(bool shutting_down) {
   DCHECK(is_tracing);
   is_tracing = false;
 #endif
-  TRACE_EVENT_NESTABLE_ASYNC_END1(kCategory, TraceNameFromType(), this,
+  TRACE_EVENT_NESTABLE_ASYNC_END1(kCategory2, TraceNameFromType(), this,
                                   "completed", !shutting_down);
 }
 
diff --git a/chromium/third_party/blink/renderer/modules/webcodecs/encoder_base.cc b/chromium/third_party/blink/renderer/modules/webcodecs/encoder_base.cc
index c9be01f1fae..d7615195b00 100644
--- a/chromium/third_party/blink/renderer/modules/webcodecs/encoder_base.cc
+++ b/chromium/third_party/blink/renderer/modules/webcodecs/encoder_base.cc
@@ -40,9 +40,9 @@
 namespace blink {
 
 namespace {
-constexpr const char kCategory[] = "media";
+constexpr const char kCategory3[] = "media";
 
-base::AtomicSequenceNumber g_sequence_num_for_counters;
+base::AtomicSequenceNumber g_sequence_num_for_counters2;
 }  // namespace
 
 // static
@@ -60,7 +60,7 @@ EncoderBase<Traits>::EncoderBase(ScriptState* script_state,
     : ExecutionContextLifecycleObserver(ExecutionContext::From(script_state)),
       state_(V8CodecState::Enum::kUnconfigured),
       script_state_(script_state),
-      trace_counter_id_(g_sequence_num_for_counters.GetNext()) {
+      trace_counter_id_(g_sequence_num_for_counters2.GetNext()) {
   // TODO(crbug.com/1151005): Use a real MediaLog in worker contexts too.
   if (IsMainThread()) {
     logger_ = std::make_unique<CodecLogger>(
@@ -199,7 +199,7 @@ void EncoderBase<Traits>::reset(ExceptionState& exception_state) {
   if (ThrowIfCodecStateClosed(state_, "reset", exception_state))
     return;
 
-  TRACE_EVENT0(kCategory, GetTraceNames()->reset.c_str());
+  TRACE_EVENT0(kCategory3, GetTraceNames()->reset.c_str());
 
   state_ = V8CodecState(V8CodecState::Enum::kUnconfigured);
   ResetInternal();
@@ -227,7 +227,7 @@ void EncoderBase<Traits>::HandleError(DOMException* ex) {
   if (state_.AsEnum() == V8CodecState::Enum::kClosed)
     return;
 
-  TRACE_EVENT0(kCategory, GetTraceNames()->handle_error.c_str());
+  TRACE_EVENT0(kCategory3, GetTraceNames()->handle_error.c_str());
 
   // Save a temp before we clear the callback.
   V8WebCodecsErrorCallback* error_callback = error_callback_.Get();
@@ -344,7 +344,7 @@ bool EncoderBase<Traits>::HasPendingActivity() const {
 
 template <typename Traits>
 void EncoderBase<Traits>::TraceQueueSizes() const {
-  TRACE_COUNTER_ID2(kCategory, GetTraceNames()->requests_counter.c_str(),
+  TRACE_COUNTER_ID2(kCategory3, GetTraceNames()->requests_counter.c_str(),
                     trace_counter_id_, "encodes", requested_encodes_, "other",
                     requests_.size() - requested_encodes_);
 }
@@ -392,7 +392,7 @@ void EncoderBase<Traits>::Request::StartTracingVideoEncode(bool is_keyframe) {
   DCHECK(!is_tracing);
   is_tracing = true;
 #endif
-  TRACE_EVENT_NESTABLE_ASYNC_BEGIN1(kCategory, TraceNameFromType(), this,
+  TRACE_EVENT_NESTABLE_ASYNC_BEGIN1(kCategory3, TraceNameFromType(), this,
                                     "key_frame", is_keyframe);
 }
 
@@ -402,7 +402,7 @@ void EncoderBase<Traits>::Request::StartTracing() {
   DCHECK(!is_tracing);
   is_tracing = true;
 #endif
-  TRACE_EVENT_NESTABLE_ASYNC_BEGIN0(kCategory, TraceNameFromType(), this);
+  TRACE_EVENT_NESTABLE_ASYNC_BEGIN0(kCategory3, TraceNameFromType(), this);
 }
 
 template <typename Traits>
@@ -411,7 +411,7 @@ void EncoderBase<Traits>::Request::EndTracing(bool aborted) {
   DCHECK(is_tracing);
   is_tracing = false;
 #endif
-  TRACE_EVENT_NESTABLE_ASYNC_END1(kCategory, TraceNameFromType(), this,
+  TRACE_EVENT_NESTABLE_ASYNC_END1(kCategory3, TraceNameFromType(), this,
                                   "aborted", aborted);
 }
 
diff --git a/chromium/third_party/blink/renderer/modules/webcodecs/gpu_factories_retriever.cc b/chromium/third_party/blink/renderer/modules/webcodecs/gpu_factories_retriever.cc
index 0445d415e7f..9c20f7039e4 100644
--- a/chromium/third_party/blink/renderer/modules/webcodecs/gpu_factories_retriever.cc
+++ b/chromium/third_party/blink/renderer/modules/webcodecs/gpu_factories_retriever.cc
@@ -14,21 +14,21 @@ namespace blink {
 
 namespace {
 
-media::GpuVideoAcceleratorFactories* GetGpuFactoriesOnMainThread() {
+media::GpuVideoAcceleratorFactories* GetGpuFactoriesOnMainThread2() {
   DCHECK(IsMainThread());
   return Platform::Current()->GetGpuFactories();
 }
 
 void RetrieveGpuFactories(OutputCB result_callback) {
   if (IsMainThread()) {
-    std::move(result_callback).Run(GetGpuFactoriesOnMainThread());
+    std::move(result_callback).Run(GetGpuFactoriesOnMainThread2());
     return;
   }
 
   Thread::MainThread()->GetTaskRunner()->PostTaskAndReplyWithResult(
       FROM_HERE,
       ConvertToBaseOnceCallback(
-          CrossThreadBindOnce(&GetGpuFactoriesOnMainThread)),
+          CrossThreadBindOnce(&GetGpuFactoriesOnMainThread2)),
       ConvertToBaseOnceCallback(std::move(result_callback)));
 }
 
diff --git a/chromium/third_party/blink/renderer/modules/webcodecs/video_decoder.cc b/chromium/third_party/blink/renderer/modules/webcodecs/video_decoder.cc
index ae87cbf06a5..61823914b5c 100644
--- a/chromium/third_party/blink/renderer/modules/webcodecs/video_decoder.cc
+++ b/chromium/third_party/blink/renderer/modules/webcodecs/video_decoder.cc
@@ -51,7 +51,7 @@ namespace blink {
 
 namespace {
 
-media::GpuVideoAcceleratorFactories* GetGpuFactoriesOnMainThread() {
+media::GpuVideoAcceleratorFactories* GetGpuFactoriesOnMainThread3() {
   DCHECK(IsMainThread());
   return Platform::Current()->GetGpuFactories();
 }
@@ -448,7 +448,7 @@ ScriptPromise VideoDecoder::IsAcceleratedConfigSupported(
     Thread::MainThread()->GetTaskRunner()->PostTaskAndReplyWithResult(
         FROM_HERE,
         ConvertToBaseOnceCallback(
-            CrossThreadBindOnce(&GetGpuFactoriesOnMainThread)),
+            CrossThreadBindOnce(&GetGpuFactoriesOnMainThread3)),
         ConvertToBaseOnceCallback(std::move(on_gpu_factories_cb)));
   }
 
diff --git a/chromium/third_party/blink/renderer/modules/webgpu/BUILD.gn b/chromium/third_party/blink/renderer/modules/webgpu/BUILD.gn
index b243f9fab31..1b6d248b411 100644
--- a/chromium/third_party/blink/renderer/modules/webgpu/BUILD.gn
+++ b/chromium/third_party/blink/renderer/modules/webgpu/BUILD.gn
@@ -81,6 +81,8 @@ blink_modules_sources("webgpu") {
     "gpu_validation_error.cc",
     "gpu_validation_error.h",
   ]
+  jumbo_excluded_sources = [ "dawn_enum_conversions.cc" ]
+
   deps = [
     "//gpu/command_buffer/client:webgpu_interface",
     "//services/metrics/public/cpp:ukm_builders",
diff --git a/chromium/third_party/blink/renderer/modules/xr/xr_transient_input_hit_test_source.cc b/chromium/third_party/blink/renderer/modules/xr/xr_transient_input_hit_test_source.cc
index 30e2199b178..7da5faa4b67 100644
--- a/chromium/third_party/blink/renderer/modules/xr/xr_transient_input_hit_test_source.cc
+++ b/chromium/third_party/blink/renderer/modules/xr/xr_transient_input_hit_test_source.cc
@@ -12,7 +12,7 @@
 #include "device/vr/public/mojom/vr_service.mojom-blink.h"
 
 namespace {
-const char* kCannotCancelHitTestSource =
+const char* kCannotCancelHitTestSource2 =
     "Hit test source could not be canceled. Ensure that it was not already "
     "canceled.";
 }
@@ -35,7 +35,7 @@ void XRTransientInputHitTestSource::cancel(ExceptionState& exception_state) {
 
   if (!xr_session_->RemoveHitTestSource(this)) {
     exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError,
-                                      kCannotCancelHitTestSource);
+                                      kCannotCancelHitTestSource2);
   }
 }
 
diff --git a/chromium/third_party/blink/renderer/platform/BUILD.gn b/chromium/third_party/blink/renderer/platform/BUILD.gn
index bec4599ae66..70974aa52a1 100644
--- a/chromium/third_party/blink/renderer/platform/BUILD.gn
+++ b/chromium/third_party/blink/renderer/platform/BUILD.gn
@@ -1567,6 +1567,15 @@ jumbo_component("platform") {
     }
   }
 
+  jumbo_excluded_sources = [
+    "fonts/font_matching_metrics.cc",
+    "mediastream/media_stream_audio_source.cc",
+    "mediastream/media_stream_audio_track.cc",
+    "peerconnection/rtc_video_decoder_adapter.cc",
+    "peerconnection/rtc_video_decoder_factory.cc",
+    "webrtc/legacy_webrtc_video_frame_adapter.cc",
+  ]
+
   if (is_mac) {
     sources += [
       "audio/mac/fft_frame_mac.cc",
@@ -1827,6 +1836,10 @@ jumbo_component("platform") {
       "peerconnection/video_codec_factory.cc",
       "peerconnection/video_codec_factory.h",
     ]
+    jumbo_excluded_sources -= [
+      "peerconnection/rtc_video_decoder_adapter.cc",
+      "peerconnection/rtc_video_decoder_factory.cc",
+    ]
     deps -= [
       "//third_party/webrtc_overrides:webrtc_component"
     ]
diff --git a/chromium/third_party/blink/renderer/platform/audio/hrtf_panner.cc b/chromium/third_party/blink/renderer/platform/audio/hrtf_panner.cc
index d919afc57a2..d50b09c3f00 100644
--- a/chromium/third_party/blink/renderer/platform/audio/hrtf_panner.cc
+++ b/chromium/third_party/blink/renderer/platform/audio/hrtf_panner.cc
@@ -37,7 +37,7 @@ namespace blink {
 // The value of 2 milliseconds is larger than the largest delay which exists in
 // any HRTFKernel from the default HRTFDatabase (0.0136 seconds).
 // We ASSERT the delay values used in process() with this value.
-const double kMaxDelayTimeSeconds = 0.002;
+const double kMaxDelayTimeSeconds2 = 0.002;
 
 const int kUninitializedAzimuth = -1;
 
@@ -57,8 +57,8 @@ HRTFPanner::HRTFPanner(float sample_rate,
       convolver_r1_(FftSizeForSampleRate(sample_rate)),
       convolver_l2_(FftSizeForSampleRate(sample_rate)),
       convolver_r2_(FftSizeForSampleRate(sample_rate)),
-      delay_line_l_(kMaxDelayTimeSeconds, sample_rate, render_quantum_frames),
-      delay_line_r_(kMaxDelayTimeSeconds, sample_rate, render_quantum_frames),
+      delay_line_l_(kMaxDelayTimeSeconds2, sample_rate, render_quantum_frames),
+      delay_line_r_(kMaxDelayTimeSeconds2, sample_rate, render_quantum_frames),
       temp_l1_(render_quantum_frames),
       temp_r1_(render_quantum_frames),
       temp_l2_(render_quantum_frames),
@@ -247,10 +247,10 @@ void HRTFPanner::Pan(double desired_azimuth,
     DCHECK(kernel_r1);
     DCHECK(kernel_l2);
     DCHECK(kernel_r2);
-    DCHECK_LT(frame_delay_l1 / SampleRate(), kMaxDelayTimeSeconds);
-    DCHECK_LT(frame_delay_r1 / SampleRate(), kMaxDelayTimeSeconds);
-    DCHECK_LT(frame_delay_l2 / SampleRate(), kMaxDelayTimeSeconds);
-    DCHECK_LT(frame_delay_r2 / SampleRate(), kMaxDelayTimeSeconds);
+    DCHECK_LT(frame_delay_l1 / SampleRate(), kMaxDelayTimeSeconds2);
+    DCHECK_LT(frame_delay_r1 / SampleRate(), kMaxDelayTimeSeconds2);
+    DCHECK_LT(frame_delay_l2 / SampleRate(), kMaxDelayTimeSeconds2);
+    DCHECK_LT(frame_delay_r2 / SampleRate(), kMaxDelayTimeSeconds2);
 
     // Crossfade inter-aural delays based on transitions.
     double frame_delay_l =
@@ -363,7 +363,7 @@ double HRTFPanner::TailTime() const {
   // the tailTime of the HRTFPanner is the sum of the tailTime of the
   // DelayKernel and the tailTime of the FFTConvolver, which is
   // MaxDelayTimeSeconds and fftSize() / 2, respectively.
-  return kMaxDelayTimeSeconds +
+  return kMaxDelayTimeSeconds2 +
          (FftSize() / 2) / static_cast<double>(SampleRate());
 }
 
diff --git a/chromium/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc b/chromium/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc
index c3527d34dc2..a11e5b387a9 100644
--- a/chromium/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc
+++ b/chromium/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc
@@ -61,11 +61,11 @@ namespace blink {
 
 namespace {
 
-constexpr hb_feature_t CreateFeature(char c1,
-                                     char c2,
-                                     char c3,
-                                     char c4,
-                                     uint32_t value = 0) {
+constexpr hb_feature_t CreateFeature2(char c1,
+                                      char c2,
+                                      char c3,
+                                      char c4,
+                                      uint32_t value = 0) {
   return {HB_TAG(c1, c2, c3, c4), value, 0 /* start */,
           static_cast<unsigned>(-1) /* end */};
 }
@@ -695,12 +695,12 @@ CapsFeatureSettingsScopedOverlay::CapsFeatureSettingsScopedOverlay(
 
 void CapsFeatureSettingsScopedOverlay::OverlayCapsFeatures(
     FontDescription::FontVariantCaps variant_caps) {
-  static constexpr hb_feature_t smcp = CreateFeature('s', 'm', 'c', 'p', 1);
-  static constexpr hb_feature_t pcap = CreateFeature('p', 'c', 'a', 'p', 1);
-  static constexpr hb_feature_t c2sc = CreateFeature('c', '2', 's', 'c', 1);
-  static constexpr hb_feature_t c2pc = CreateFeature('c', '2', 'p', 'c', 1);
-  static constexpr hb_feature_t unic = CreateFeature('u', 'n', 'i', 'c', 1);
-  static constexpr hb_feature_t titl = CreateFeature('t', 'i', 't', 'l', 1);
+  static constexpr hb_feature_t smcp = CreateFeature2('s', 'm', 'c', 'p', 1);
+  static constexpr hb_feature_t pcap = CreateFeature2('p', 'c', 'a', 'p', 1);
+  static constexpr hb_feature_t c2sc = CreateFeature2('c', '2', 's', 'c', 1);
+  static constexpr hb_feature_t c2pc = CreateFeature2('c', '2', 'p', 'c', 1);
+  static constexpr hb_feature_t unic = CreateFeature2('u', 'n', 'i', 'c', 1);
+  static constexpr hb_feature_t titl = CreateFeature2('t', 'i', 't', 'l', 1);
   if (variant_caps == FontDescription::kSmallCaps ||
       variant_caps == FontDescription::kAllSmallCaps) {
     PrependCounting(smcp);
diff --git a/chromium/third_party/blink/renderer/platform/graphics/canvas_resource_params.cc b/chromium/third_party/blink/renderer/platform/graphics/canvas_resource_params.cc
index 5e67058c90b..c757b5924e6 100644
--- a/chromium/third_party/blink/renderer/platform/graphics/canvas_resource_params.cc
+++ b/chromium/third_party/blink/renderer/platform/graphics/canvas_resource_params.cc
@@ -20,7 +20,7 @@ namespace {
 
 // The CanvasColorSpace value definitions are specified in the CSS Color Level 4
 // specification.
-gfx::ColorSpace CanvasColorSpaceToGfxColorSpace(CanvasColorSpace color_space) {
+gfx::ColorSpace CanvasColorSpaceToGfxColorSpace2(CanvasColorSpace color_space) {
   switch (color_space) {
     case CanvasColorSpace::kSRGB:
       return gfx::ColorSpace::CreateSRGB();
@@ -65,11 +65,11 @@ gfx::ColorSpace CanvasResourceParams::GetSamplerGfxColorSpace() const {
   // TODO(ccameron): If we add support for uint8srgb as a pixel format, this
   // will need to take into account whether or not this texture will be sampled
   // in linear or nonlinear space.
-  return CanvasColorSpaceToGfxColorSpace(color_space_);
+  return CanvasColorSpaceToGfxColorSpace2(color_space_);
 }
 
 gfx::ColorSpace CanvasResourceParams::GetStorageGfxColorSpace() const {
-  return CanvasColorSpaceToGfxColorSpace(color_space_);
+  return CanvasColorSpaceToGfxColorSpace2(color_space_);
 }
 
 sk_sp<SkColorSpace> CanvasResourceParams::GetSkColorSpace() const {
diff --git a/chromium/third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.cc b/chromium/third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.cc
index b3c1fef3d25..73b210ece28 100644
--- a/chromium/third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.cc
+++ b/chromium/third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.cc
@@ -29,7 +29,7 @@
 namespace blink {
 namespace {
 
-constexpr size_t kDefaultMaxBufferedBodyBytesPerRequest = 100 * 1000;
+constexpr size_t kDefaultMaxBufferedBodyBytesPerRequestX = 100 * 1000;
 constexpr base::TimeDelta kGracePeriodToFinishLoadingWhileInBackForwardCache =
     base::TimeDelta::FromSeconds(15);
 
@@ -167,7 +167,7 @@ class MojoURLLoaderClient::BodyBuffer final
                           std::move(task_runner)),
         max_bytes_drained_(GetLoadingTasksUnfreezableParamAsInt(
             "max_buffered_bytes",
-            kDefaultMaxBufferedBodyBytesPerRequest)) {
+            kDefaultMaxBufferedBodyBytesPerRequestX)) {
     pipe_drainer_ =
         std::make_unique<mojo::DataPipeDrainer>(this, std::move(readable));
     writable_watcher_.Watch(
diff --git a/chromium/third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc b/chromium/third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc
index c346490cdf4..0d428506a2c 100644
--- a/chromium/third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc
+++ b/chromium/third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc
@@ -120,7 +120,7 @@ network::mojom::LoadTimingInfo ToMojoLoadTiming(
 // This is complementary to ConvertNetPriorityToWebKitPriority, defined in
 // service_worker_context_client.cc.
 // TODO(yhirano): Move this to blink/platform/loader.
-net::RequestPriority ConvertWebKitPriorityToNetPriority(
+net::RequestPriority ConvertWebKitPriorityToNetPriority2(
     const WebURLRequest::Priority& priority) {
   switch (priority) {
     case WebURLRequest::Priority::kVeryHigh:
@@ -501,7 +501,7 @@ void WebURLLoader::Context::DidChangePriority(
     int intra_priority_value) {
   if (request_id_ != -1) {
     net::RequestPriority net_priority =
-        ConvertWebKitPriorityToNetPriority(new_priority);
+        ConvertWebKitPriorityToNetPriority2(new_priority);
     resource_request_sender_->DidChangePriority(net_priority,
                                                 intra_priority_value);
     // TODO(https://crbug.com/1137682): Change this to
diff --git a/chromium/third_party/blink/renderer/platform/loader/web_url_request_util.cc b/chromium/third_party/blink/renderer/platform/loader/web_url_request_util.cc
index 3ae478c40e2..39c20454ccd 100644
--- a/chromium/third_party/blink/renderer/platform/loader/web_url_request_util.cc
+++ b/chromium/third_party/blink/renderer/platform/loader/web_url_request_util.cc
@@ -27,6 +27,7 @@
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/public/platform/web_url_request.h"
 #include "third_party/blink/renderer/platform/loader/mixed_content.h"
+#include "third_party/blink/renderer/platform/wtf/assertions.h"
 #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h"
 #include "third_party/blink/renderer/platform/wtf/text/string_builder.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
diff --git a/chromium/third_party/blink/renderer/platform/peerconnection/webrtc_decoding_info_handler.cc b/chromium/third_party/blink/renderer/platform/peerconnection/webrtc_decoding_info_handler.cc
index f85bb0664c7..f2bf9fd96d0 100644
--- a/chromium/third_party/blink/renderer/platform/peerconnection/webrtc_decoding_info_handler.cc
+++ b/chromium/third_party/blink/renderer/platform/peerconnection/webrtc_decoding_info_handler.cc
@@ -45,7 +45,7 @@ webrtc::SdpVideoFormat::Parameters ConvertToSdpVideoFormatParameters(
 }
 
 // Composes elements of set<string> to a string with ", " delimiter.
-String StringHashSetToString(const HashSet<String>& string_set) {
+String StringHashSetToString2(const HashSet<String>& string_set) {
   String result;
   String delim;
   for (auto& s : string_set) {
@@ -85,7 +85,7 @@ WebrtcDecodingInfoHandler::WebrtcDecodingInfoHandler(
   }
   DVLOG(2) << String::Format(
       "supported_audio_codecs_:[%s]",
-      StringHashSetToString(supported_audio_codecs_).Utf8().c_str());
+      StringHashSetToString2(supported_audio_codecs_).Utf8().c_str());
 }
 
 WebrtcDecodingInfoHandler::~WebrtcDecodingInfoHandler() = default;
diff --git a/chromium/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller.cc b/chromium/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller.cc
index 01ad6416811..40f8316918b 100644
--- a/chromium/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller.cc
+++ b/chromium/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller.cc
@@ -58,7 +58,7 @@ ElasticOverscrollController::ElasticOverscrollController(
 std::unique_ptr<ElasticOverscrollController>
 ElasticOverscrollController::Create(cc::ScrollElasticityHelper* helper) {
 #if defined(OS_WIN)
-  return base::FeatureList::IsEnabled(features::kElasticOverscrollWin)
+  return base::FeatureList::IsEnabled(::features::kElasticOverscrollWin)
              ? std::make_unique<ElasticOverscrollControllerBezier>(helper)
              : nullptr;
 #endif
diff --git a/chromium/third_party/blink/renderer/platform/widget/input/widget_input_handler_manager.cc b/chromium/third_party/blink/renderer/platform/widget/input/widget_input_handler_manager.cc
index 859a13b76ad..a1fb6541d12 100644
--- a/chromium/third_party/blink/renderer/platform/widget/input/widget_input_handler_manager.cc
+++ b/chromium/third_party/blink/renderer/platform/widget/input/widget_input_handler_manager.cc
@@ -422,7 +422,7 @@ void WidgetInputHandlerManager::LogInputTimingUMA() {
 
 void WidgetInputHandlerManager::DispatchScrollGestureToCompositor(
     std::unique_ptr<WebGestureEvent> event) {
-  DCHECK(base::FeatureList::IsEnabled(features::kScrollUnification));
+  DCHECK(base::FeatureList::IsEnabled(::features::kScrollUnification));
   std::unique_ptr<WebCoalescedInputEvent> web_scoped_gesture_event =
       std::make_unique<WebCoalescedInputEvent>(std::move(event),
                                                ui::LatencyInfo());
@@ -437,7 +437,7 @@ void WidgetInputHandlerManager::DispatchScrollGestureToCompositor(
 void WidgetInputHandlerManager::
     HandleInputEventWithLatencyOnInputHandlingThread(
         std::unique_ptr<WebCoalescedInputEvent> event) {
-  DCHECK(base::FeatureList::IsEnabled(features::kScrollUnification));
+  DCHECK(base::FeatureList::IsEnabled(::features::kScrollUnification));
   DCHECK(input_handler_proxy_);
   input_handler_proxy_->HandleInputEventWithLatencyInfo(
       std::move(event), nullptr, base::DoNothing());
diff --git a/chromium/ui/base/ime/win/BUILD.gn b/chromium/ui/base/ime/win/BUILD.gn
index b6cb95fcf81..5e82201f9b2 100644
--- a/chromium/ui/base/ime/win/BUILD.gn
+++ b/chromium/ui/base/ime/win/BUILD.gn
@@ -34,6 +34,7 @@ jumbo_component("win") {
     "virtual_keyboard_debounce_timer.cc",
     "virtual_keyboard_debounce_timer.h",
   ]
+  jumbo_excluded_sources = [ "tsf_text_store.cc" ]
 
   defines = [ "IS_UI_BASE_IME_WIN_IMPL" ]
 
diff --git a/chromium/ui/base/x/BUILD.gn b/chromium/ui/base/x/BUILD.gn
index 338055d94df..97e767b1c7d 100644
--- a/chromium/ui/base/x/BUILD.gn
+++ b/chromium/ui/base/x/BUILD.gn
@@ -2,14 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/jumbo.gni")
 import("//build/config/linux/gtk/gtk.gni")
 import("//build/config/ozone.gni")
 import("//build/config/ui.gni")
 
 assert(use_x11 || ozone_platform_x11)
 
-jumbo_component("x") {
+component("x") {
   output_name = "ui_base_x"
 
   sources = [
diff --git a/chromium/ui/color/BUILD.gn b/chromium/ui/color/BUILD.gn
index 71daf9741bb..b0c1eba7fed 100644
--- a/chromium/ui/color/BUILD.gn
+++ b/chromium/ui/color/BUILD.gn
@@ -4,7 +4,6 @@
 
 import("//build/buildflag_header.gni")
 import("//build/config/chromeos/ui_mode.gni")
-import("//build/config/jumbo.gni")
 import("//testing/test.gni")
 import("//ui/base/ui_features.gni")
 
@@ -25,7 +24,7 @@ source_set("color_headers") {
   ]
 }
 
-jumbo_component("color") {
+component("color") {
   sources = [
     "color_mixer.cc",
     "color_provider.cc",
@@ -78,7 +77,7 @@ test("color_unittests") {
   ]
 }
 
-jumbo_component("mixers") {
+component("mixers") {
   sources = [
     "color_mixers.h",
     "color_provider_manager.cc",
diff --git a/chromium/ui/events/blink/web_input_event_builders_win.cc b/chromium/ui/events/blink/web_input_event_builders_win.cc
index 155402fcb09..47a3eafc94f 100644
--- a/chromium/ui/events/blink/web_input_event_builders_win.cc
+++ b/chromium/ui/events/blink/web_input_event_builders_win.cc
@@ -21,7 +21,7 @@ namespace ui {
 
 static const unsigned long kDefaultScrollLinesPerWheelDelta = 3;
 static const unsigned long kDefaultScrollCharsPerWheelDelta = 1;
-static const unsigned long kScrollPercentPerLineOrChar = 5;
+static const unsigned long kMyScrollPercentPerLineOrChar = 5;
 
 // WebMouseEvent --------------------------------------------------------------
 
@@ -315,7 +315,7 @@ WebMouseWheelEvent WebMouseWheelEventBuilder::Build(
       // the percentage amount (out of 1, i.e. 1 == 100%) the targeted scroller
       // should scroll. This percentage will be resolved against the size of
       // the scroller in the renderer process.
-      scroll_delta *= kScrollPercentPerLineOrChar / 100.f;
+      scroll_delta *= kMyScrollPercentPerLineOrChar / 100.f;
       result.delta_units = ui::ScrollGranularity::kScrollByPercentage;
     } else {
       // Convert wheel delta amount to a number of pixels to scroll.
diff --git a/chromium/ui/gfx/transform_operations.cc b/chromium/ui/gfx/transform_operations.cc
index 849979e0dec..dfed7bfe742 100644
--- a/chromium/ui/gfx/transform_operations.cc
+++ b/chromium/ui/gfx/transform_operations.cc
@@ -139,7 +139,7 @@ bool TransformOperations::IsTranslation() const {
   return true;
 }
 
-static SkScalar TanDegrees(double degrees) {
+static SkScalar TanDegrees2(double degrees) {
   return SkDoubleToScalar(std::tan(DegToRad(degrees)));
 }
 
@@ -163,8 +163,8 @@ bool TransformOperations::ScaleComponent(SkScalar* scale) const {
       case TransformOperation::TRANSFORM_OPERATION_SKEWX:
       case TransformOperation::TRANSFORM_OPERATION_SKEWY:
       case TransformOperation::TRANSFORM_OPERATION_SKEW: {
-        SkScalar x_component = TanDegrees(operation.skew.x);
-        SkScalar y_component = TanDegrees(operation.skew.y);
+        SkScalar x_component = TanDegrees2(operation.skew.x);
+        SkScalar y_component = TanDegrees2(operation.skew.y);
         SkScalar x_scale = std::sqrt(x_component * x_component + 1);
         SkScalar y_scale = std::sqrt(y_component * y_component + 1);
         operations_scale *= std::max(x_scale, y_scale);
diff --git a/chromium/ui/native_theme/BUILD.gn b/chromium/ui/native_theme/BUILD.gn
index 1748f087568..92f10160c2c 100644
--- a/chromium/ui/native_theme/BUILD.gn
+++ b/chromium/ui/native_theme/BUILD.gn
@@ -2,11 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/jumbo.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
-jumbo_component("native_theme") {
+component("native_theme") {
   sources = [
     "caption_style.cc",
     "caption_style.h",
@@ -87,7 +86,7 @@ jumbo_component("native_theme") {
 }
 
 if (is_win) {
-  jumbo_component("native_theme_browser") {
+  component("native_theme_browser") {
     defines = [ "NATIVE_THEME_IMPLEMENTATION" ]
 
     # These files cannot work in the renderer on Windows.
@@ -108,11 +107,11 @@ if (is_win) {
     libs = [ "uxtheme.lib" ]
   }
 } else {
-  jumbo_source_set("native_theme_browser") {
+  source_set("native_theme_browser") {
   }
 }
 
-jumbo_source_set("test_support") {
+source_set("test_support") {
   testonly = true
 
   deps = [
diff --git a/chromium/v8/src/deoptimizer/translated-state.cc b/chromium/v8/src/deoptimizer/translated-state.cc
index abbc0104a8f..7f511ca58ad 100644
--- a/chromium/v8/src/deoptimizer/translated-state.cc
+++ b/chromium/v8/src/deoptimizer/translated-state.cc
@@ -681,7 +681,7 @@ TranslatedFrame TranslatedFrame::JavaScriptBuiltinContinuationWithCatchFrame(
 
 namespace {
 
-uint16_t InternalFormalParameterCountWithReceiver(SharedFunctionInfo sfi) {
+uint16_t InternalFormalParameterCountWithReceiver2(SharedFunctionInfo sfi) {
   static constexpr int kTheReceiver = 1;
   return sfi.internal_formal_parameter_count() + kTheReceiver;
 }
@@ -696,7 +696,7 @@ int TranslatedFrame::GetValueCount() {
   switch (kind()) {
     case kUnoptimizedFunction: {
       int parameter_count =
-          InternalFormalParameterCountWithReceiver(raw_shared_info_);
+          InternalFormalParameterCountWithReceiver2(raw_shared_info_);
       static constexpr int kTheContext = 1;
       static constexpr int kTheAccumulator = 1;
       return height() + parameter_count + kTheContext + kTheFunction +
@@ -749,7 +749,7 @@ TranslatedFrame TranslatedState::CreateNextTranslatedFrame(
       if (trace_file != nullptr) {
         std::unique_ptr<char[]> name = shared_info.DebugNameCStr();
         PrintF(trace_file, "  reading input frame %s", name.get());
-        int arg_count = InternalFormalParameterCountWithReceiver(shared_info);
+        int arg_count = InternalFormalParameterCountWithReceiver2(shared_info);
         PrintF(trace_file,
                " => bytecode_offset=%d, args=%d, height=%d, retval=%i(#%i); "
                "inputs:\n",
@@ -1991,7 +1991,7 @@ TranslatedFrame* TranslatedState::GetArgumentsInfoFromJSFrameIndex(
           *args_count = frames_[i].ValueAt(height - 1)->GetSmiValue();
           DCHECK_EQ(*args_count, 1);
         } else {
-          *args_count = InternalFormalParameterCountWithReceiver(
+          *args_count = InternalFormalParameterCountWithReceiver2(
               *frames_[i].shared_info());
         }
         return &(frames_[i]);
diff --git a/chromium/v8/src/heap/cppgc/marker.cc b/chromium/v8/src/heap/cppgc/marker.cc
index d26fd580df9..eab10f4fd3c 100644
--- a/chromium/v8/src/heap/cppgc/marker.cc
+++ b/chromium/v8/src/heap/cppgc/marker.cc
@@ -89,9 +89,9 @@ void ResetRememberedSet(HeapBase& heap) {
 #endif
 }
 
-static constexpr size_t kDefaultDeadlineCheckInterval = 150u;
+static constexpr size_t kDefaultMarkerDeadlineCheckInterval = 150u;
 
-template <size_t kDeadlineCheckInterval = kDefaultDeadlineCheckInterval,
+template <size_t kDeadlineCheckInterval = kDefaultMarkerDeadlineCheckInterval,
           typename WorklistLocal, typename Callback>
 bool DrainWorklistWithBytesAndTimeDeadline(MarkingStateBase& marking_state,
                                            size_t marked_bytes_deadline,
@@ -433,7 +433,7 @@ bool MarkerBase::ProcessWorklistsWithDeadline(
     {
       StatsCollector::EnabledScope inner_scope(
           heap().stats_collector(), StatsCollector::kMarkProcessBailOutObjects);
-      if (!DrainWorklistWithBytesAndTimeDeadline<kDefaultDeadlineCheckInterval /
+      if (!DrainWorklistWithBytesAndTimeDeadline<kDefaultMarkerDeadlineCheckInterval /
                                                  5>(
               mutator_marking_state_, marked_bytes_deadline, time_deadline,
               mutator_marking_state_.concurrent_marking_bailout_worklist(),
diff --git a/chromium/v8/src/regexp/experimental/experimental-compiler.cc b/chromium/v8/src/regexp/experimental/experimental-compiler.cc
index 4d53c2c0c55..69390c4b61d 100644
--- a/chromium/v8/src/regexp/experimental/experimental-compiler.cc
+++ b/chromium/v8/src/regexp/experimental/experimental-compiler.cc
@@ -180,7 +180,7 @@ bool ExperimentalRegExpCompiler::CanBeHandled(RegExpTree* tree,
   return CanBeHandledVisitor::Check(tree, flags, capture_count);
 }
 
-namespace {
+namespace experimental {
 
 // A label in bytecode which starts with no known address. The address *must*
 // be bound with `Bind` before the label goes out of scope.
@@ -628,7 +628,7 @@ class CompileVisitor : private RegExpVisitor {
 
 ZoneList<RegExpInstruction> ExperimentalRegExpCompiler::Compile(
     RegExpTree* tree, JSRegExp::Flags flags, Zone* zone) {
-  return CompileVisitor::Compile(tree, flags, zone);
+  return experimental::CompileVisitor::Compile(tree, flags, zone);
 }
 
 }  // namespace internal
diff --git a/chromium/v8/src/torque/csa-generator.cc b/chromium/v8/src/torque/csa-generator.cc
index 2f840c1918b..812385d1432 100644
--- a/chromium/v8/src/torque/csa-generator.cc
+++ b/chromium/v8/src/torque/csa-generator.cc
@@ -921,8 +921,8 @@ void CSAGenerator::EmitInstruction(const StoreReferenceInstruction& instruction,
 }
 
 namespace {
-std::string GetBitFieldSpecialization(const Type* container,
-                                      const BitField& field) {
+std::string GetBitFieldSpecialization2(const Type* container,
+                                       const BitField& field) {
   auto smi_tagged_type =
       Type::MatchUnaryGeneric(container, TypeOracle::GetSmiTaggedGeneric());
   std::string container_type = smi_tagged_type
@@ -975,7 +975,7 @@ void CSAGenerator::EmitInstruction(const LoadBitFieldInstruction& instruction,
   out() << "    " << result_name << " = ca_.UncheckedCast<"
         << field_type->GetGeneratedTNodeTypeName()
         << ">(CodeStubAssembler(state_)." << decoder << "<"
-        << GetBitFieldSpecialization(struct_type, instruction.bit_field)
+        << GetBitFieldSpecialization2(struct_type, instruction.bit_field)
         << ">(ca_.UncheckedCast<" << struct_word_type << ">("
         << bit_field_struct << ")));\n";
 }
@@ -1017,7 +1017,7 @@ void CSAGenerator::EmitInstruction(const StoreBitFieldInstruction& instruction,
 
   std::string result_expression =
       "CodeStubAssembler(state_)." + encoder + "<" +
-      GetBitFieldSpecialization(struct_type, instruction.bit_field) +
+      GetBitFieldSpecialization2(struct_type, instruction.bit_field) +
       ">(ca_.UncheckedCast<" + struct_word_type + ">(" + bit_field_struct +
       "), ca_.UncheckedCast<" + field_word_type + ">(" + value + ")" +
       (instruction.starts_as_zero ? ", true" : "") + ")";