Update to Chromium version 104.0.5112.0 (#1012729)

- Mac: 10.13 is now the minimum required macOS version

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -7,5 +7,5 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
 
 {
-  'chromium_checkout': 'refs/tags/103.0.5060.0'
+  'chromium_checkout': 'refs/tags/104.0.5112.0'
 }

cmake/cef_variables.cmake.in

@@ -314,7 +314,7 @@ if(OS_MAC)
 
   # Find the newest available base SDK.
   execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
-  foreach(OS_VERSION 10.15 10.14 10.13 10.12 10.11)
+  foreach(OS_VERSION 10.15 10.14 10.13)
     set(SDK "${XCODE_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OS_VERSION}.sdk")
     if(NOT "${CMAKE_OSX_SYSROOT}" AND EXISTS "${SDK}" AND IS_DIRECTORY "${SDK}")
       set(CMAKE_OSX_SYSROOT ${SDK})
@@ -322,7 +322,7 @@ if(OS_MAC)
   endforeach()
 
   # Target SDK.
-  set(CEF_TARGET_SDK               "10.11")
+  set(CEF_TARGET_SDK               "10.13")
   list(APPEND CEF_COMPILER_FLAGS
     -mmacosx-version-min=${CEF_TARGET_SDK}
   )

libcef/browser/alloy/alloy_browser_host_impl.cc

@@ -1303,14 +1303,13 @@ void AlloyBrowserHostImpl::RequestMediaAccessPermission(
 
   blink::MediaStreamDevices audio_devices;
   blink::MediaStreamDevices video_devices;
-  blink::mojom::StreamDevices stream_devices;
 
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(switches::kEnableMediaStream)) {
     // Cancel the request.
     std::move(callback).Run(
-        stream_devices,
+        blink::mojom::StreamDevicesSet(),
         blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED,
         std::unique_ptr<content::MediaStreamUI>());
     return;
@@ -1352,13 +1351,18 @@ void AlloyBrowserHostImpl::RequestMediaAccessPermission(
     }
   }
 
+  blink::mojom::StreamDevicesSet stream_devices_set;
+  stream_devices_set.stream_devices.emplace_back(
+      blink::mojom::StreamDevices::New());
+  blink::mojom::StreamDevices& devices = *stream_devices_set.stream_devices[0];
+
   // At most one audio device and one video device can be used in a stream.
   if (!audio_devices.empty())
-    stream_devices.audio_device = audio_devices.front();
+    devices.audio_device = audio_devices.front();
   if (!video_devices.empty())
-    stream_devices.video_device = video_devices.front();
+    devices.video_device = video_devices.front();
 
-  std::move(callback).Run(stream_devices,
+  std::move(callback).Run(stream_devices_set,
                           blink::mojom::MediaStreamRequestResult::OK,
                           std::unique_ptr<content::MediaStreamUI>());
 }

libcef/browser/alloy/alloy_browser_main.cc

@@ -51,7 +51,6 @@
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
-#include "ui/display/screen.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/wm/core/wm_state.h"
 
@@ -267,7 +266,9 @@ int AlloyBrowserMainParts::PreCreateThreads() {
 int AlloyBrowserMainParts::PreMainMessageLoopRun() {
 #if defined(USE_AURA)
   screen_ = views::CreateDesktopScreen();
-  display::Screen::SetScreenInstance(screen_.get());
+#endif
+#if BUILDFLAG(IS_MAC)
+  screen_ = std::make_unique<display::ScopedNativeScreen>();
 #endif
 
   if (extensions::ExtensionsEnabled()) {

libcef/browser/alloy/alloy_browser_main.h

@@ -13,11 +13,9 @@
 #include "build/build_config.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_main_parts.h"
+#include "ui/display/screen.h"
 
 #if defined(USE_AURA)
-namespace display {
-class Screen;
-}
 namespace wm {
 class WMState;
 }
@@ -88,6 +86,7 @@ class AlloyBrowserMainParts : public content::BrowserMainParts {
 
   std::unique_ptr<views::ViewsDelegate> views_delegate_;
 #if BUILDFLAG(IS_MAC)
+  std::unique_ptr<display::ScopedNativeScreen> screen_;
   std::unique_ptr<views::LayoutProvider> layout_provider_;
 #endif
 };

libcef/browser/native/browser_platform_delegate_native_mac.mm

@@ -125,17 +125,17 @@ NSTimeInterval currentEventTimestamp() {
 NSUInteger NativeModifiers(int cef_modifiers) {
   NSUInteger native_modifiers = 0;
   if (cef_modifiers & EVENTFLAG_SHIFT_DOWN)
-    native_modifiers |= NSShiftKeyMask;
+    native_modifiers |= NSEventModifierFlagShift;
   if (cef_modifiers & EVENTFLAG_CONTROL_DOWN)
-    native_modifiers |= NSControlKeyMask;
+    native_modifiers |= NSEventModifierFlagControl;
   if (cef_modifiers & EVENTFLAG_ALT_DOWN)
-    native_modifiers |= NSAlternateKeyMask;
+    native_modifiers |= NSEventModifierFlagOption;
   if (cef_modifiers & EVENTFLAG_COMMAND_DOWN)
-    native_modifiers |= NSCommandKeyMask;
+    native_modifiers |= NSEventModifierFlagCommand;
   if (cef_modifiers & EVENTFLAG_CAPS_LOCK_ON)
-    native_modifiers |= NSAlphaShiftKeyMask;
+    native_modifiers |= NSEventModifierFlagCapsLock;
   if (cef_modifiers & EVENTFLAG_NUM_LOCK_ON)
-    native_modifiers |= NSNumericPadKeyMask;
+    native_modifiers |= NSEventModifierFlagNumericPad;
 
   return native_modifiers;
 }
@@ -184,10 +184,11 @@ bool CefBrowserPlatformDelegateNativeMac::CreateHostWindow() {
 
     newWnd = [[UnderlayOpenGLHostingWindow alloc]
         initWithContentRect:window_rect
-                  styleMask:(NSTitledWindowMask | NSClosableWindowMask |
+                  styleMask:(NSWindowStyleMaskTitled |
-                             NSMiniaturizableWindowMask |
+                             NSWindowStyleMaskClosable |
-                             NSResizableWindowMask |
+                             NSWindowStyleMaskMiniaturizable |
-                             NSUnifiedTitleAndToolbarWindowMask)
+                             NSWindowStyleMaskResizable |
+                             NSWindowStyleMaskUnifiedTitleAndToolbar)
                     backing:NSBackingStoreBuffered
                       defer:NO];
 
@@ -351,7 +352,7 @@ void CefBrowserPlatformDelegateNativeMac::ViewText(const std::string& text) {
 bool CefBrowserPlatformDelegateNativeMac::HandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   // Give the top level menu equivalents a chance to handle the event.
-  if ([event.os_event type] == NSKeyDown)
+  if ([event.os_event type] == NSEventTypeKeyDown)
     return [[NSApp mainMenu] performKeyEquivalent:event.os_event];
   return false;
 }
@@ -389,19 +390,19 @@ CefBrowserPlatformDelegateNativeMac::TranslateWebKeyEvent(
   NSEventType event_type;
   if (key_event.character == 0 && key_event.unmodified_character == 0) {
     // Check if both character and unmodified_characther are empty to determine
-    // if this was a NSFlagsChanged event.
+    // if this was a NSEventTypeFlagsChanged event.
     // A dead key will have an empty character, but a non-empty unmodified
     // character
-    event_type = NSFlagsChanged;
+    event_type = NSEventTypeFlagsChanged;
   } else {
     switch (key_event.type) {
       case KEYEVENT_RAWKEYDOWN:
       case KEYEVENT_KEYDOWN:
       case KEYEVENT_CHAR:
-        event_type = NSKeyDown;
+        event_type = NSEventTypeKeyDown;
         break;
       case KEYEVENT_KEYUP:
-        event_type = NSKeyUp;
+        event_type = NSEventTypeKeyUp;
         break;
     }
   }

libcef/browser/native/menu_runner_mac.mm

@@ -66,7 +66,7 @@ bool CefMenuRunnerMac::RunContextMenu(
     NSPoint position = [window mouseLocationOutsideOfEventStream];
 
     NSTimeInterval eventTime = [currentEvent timestamp];
-    NSEvent* clickEvent = [NSEvent mouseEventWithType:NSRightMouseDown
+    NSEvent* clickEvent = [NSEvent mouseEventWithType:NSEventTypeRightMouseDown
                                              location:position
                                         modifierFlags:0
                                             timestamp:eventTime

libcef/browser/net_service/cookie_helper.cc

@@ -266,7 +266,7 @@ void SaveCookies(const CefBrowserContext::Getter& browser_context_getter,
     net::CookieInclusionStatus returned_status;
     std::unique_ptr<net::CanonicalCookie> cookie = net::CanonicalCookie::Create(
         request.url, cookie_string, base::Time::Now(),
-        absl::make_optional(response_date), net::CookiePartitionKey::Todo(),
+        absl::make_optional(response_date), /*partition_key=*/absl::nullopt,
         &returned_status);
     if (!returned_status.IsInclude()) {
       continue;

libcef/browser/net_service/cookie_manager_impl.cc

@@ -290,7 +290,7 @@ bool CefCookieManagerImpl::SetCookieInternal(
       expiration_time,
       base::Time(),  // Last access time.
       cookie.secure ? true : false, cookie.httponly ? true : false, same_site,
-      priority, /*same_party=*/false, net::CookiePartitionKey::Todo());
+      priority, /*same_party=*/false, /*partition_key=*/absl::nullopt);
 
   if (!canonical_cookie) {
     SetCookieCallbackImpl(

libcef/browser/net_service/proxy_url_loader_factory.cc

@@ -236,8 +236,6 @@ class InterceptedRequest : public network::mojom::URLLoader,
                         OnUploadProgressCallback callback) override;
   void OnReceiveCachedMetadata(mojo_base::BigBuffer data) override;
   void OnTransferSizeUpdated(int32_t transfer_size_diff) override;
-  void OnStartLoadingResponseBody(
-      mojo::ScopedDataPipeConsumerHandle body) override;
   void OnComplete(const network::URLLoaderCompletionStatus& status) override;
 
   // mojom::URLLoader methods:
@@ -661,13 +659,6 @@ void InterceptedRequest::OnTransferSizeUpdated(int32_t transfer_size_diff) {
   target_client_->OnTransferSizeUpdated(transfer_size_diff);
 }
 
-void InterceptedRequest::OnStartLoadingResponseBody(
-    mojo::ScopedDataPipeConsumerHandle body) {
-  target_client_->OnStartLoadingResponseBody(
-      factory_->request_handler_->OnFilterResponseBody(id_, request_,
-                                                       std::move(body)));
-}
-
 void InterceptedRequest::OnComplete(
     const network::URLLoaderCompletionStatus& status) {
   // Only wait for the original loader to possibly have a custom error if the
@@ -1053,12 +1044,11 @@ void InterceptedRequest::ContinueToResponseStarted(int error_code) {
     if (proxied_client_receiver_.is_bound())
       proxied_client_receiver_.Resume();
 
-    target_client_->OnReceiveResponse(std::move(current_response_),
+    target_client_->OnReceiveResponse(
-                                      std::move(current_body_));
+        std::move(current_response_),
+        factory_->request_handler_->OnFilterResponseBody(
+            id_, request_, std::move(current_body_)));
   }
-
-  if (stream_loader_)
-    stream_loader_->ContinueResponse(is_redirect);
 }
 
 void InterceptedRequest::OnDestroy() {

libcef/browser/net_service/stream_reader_url_loader.cc

@@ -696,42 +696,23 @@ void StreamReaderURLLoader::ContinueWithResponseHeaders(
     // |this| will be deleted.
     CleanUp();
   } else {
+    mojo::ScopedDataPipeConsumerHandle consumer_handle;
+    if (CreateDataPipe(nullptr /*options*/, producer_handle_,
+                       consumer_handle) != MOJO_RESULT_OK) {
+      RequestComplete(net::ERR_FAILED);
+      return;
+    }
+    writable_handle_watcher_.Watch(
+        producer_handle_.get(), MOJO_HANDLE_SIGNAL_WRITABLE,
+        base::BindRepeating(&StreamReaderURLLoader::OnDataPipeWritable,
+                            base::Unretained(this)));
+
     client_->OnReceiveResponse(std::move(pending_response),
-                               mojo::ScopedDataPipeConsumerHandle());
+                               std::move(consumer_handle));
+    ReadMore();
   }
 }
 
-void StreamReaderURLLoader::ContinueResponse(bool was_redirected) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  if (was_redirected) {
-    // Special case where we allow the client to perform the redirect.
-    // The client will restart the request with a new loader.
-    // |this| will be deleted.
-    CleanUp();
-  } else {
-    SendBody();
-  }
-}
-
-void StreamReaderURLLoader::SendBody() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  mojo::ScopedDataPipeConsumerHandle consumer_handle;
-  if (CreateDataPipe(nullptr /*options*/, producer_handle_, consumer_handle) !=
-      MOJO_RESULT_OK) {
-    RequestComplete(net::ERR_FAILED);
-    return;
-  }
-  writable_handle_watcher_.Watch(
-      producer_handle_.get(), MOJO_HANDLE_SIGNAL_WRITABLE,
-      base::BindRepeating(&StreamReaderURLLoader::OnDataPipeWritable,
-                          base::Unretained(this)));
-  client_->OnStartLoadingResponseBody(std::move(consumer_handle));
-
-  ReadMore();
-}
-
 void StreamReaderURLLoader::ReadMore() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!pending_buffer_.get());

libcef/browser/net_service/stream_reader_url_loader.h

@@ -126,8 +126,6 @@ class StreamReaderURLLoader : public network::mojom::URLLoader {
 
   void Start();
 
-  void ContinueResponse(bool was_redirected);
-
   // network::mojom::URLLoader methods:
   void FollowRedirect(
       const std::vector<std::string>& removed_headers,
@@ -154,7 +152,6 @@ class StreamReaderURLLoader : public network::mojom::URLLoader {
       const absl::optional<std::string>& headers,
       const absl::optional<GURL>& redirect_url);
 
-  void SendBody();
   void ReadMore();
   void OnDataPipeWritable(MojoResult result);
   void OnReaderReadCompleted(int bytes_read);

libcef/browser/prefs/browser_prefs.cc

@@ -20,6 +20,7 @@
 #include "base/values.h"
 #include "chrome/browser/accessibility/accessibility_ui.h"
 #include "chrome/browser/download/download_prefs.h"
+#include "chrome/browser/first_party_sets/first_party_sets_pref_names.h"
 #include "chrome/browser/media/media_device_id_salt.h"
 #include "chrome/browser/media/router/media_router_feature.h"
 #include "chrome/browser/net/profile_network_context_service.h"
@@ -263,6 +264,7 @@ std::unique_ptr<PrefService> CreatePrefService(Profile* profile,
     // Default profile preferences.
     AccessibilityUIMessageHandler::RegisterProfilePrefs(registry.get());
     extensions::ExtensionPrefs::RegisterProfilePrefs(registry.get());
+    first_party_sets::RegisterProfilePrefs(registry.get());
     HostContentSettingsMap::RegisterProfilePrefs(registry.get());
     language::LanguagePrefs::RegisterProfilePrefs(registry.get());
     media_router::RegisterProfilePrefs(registry.get());

libcef/browser/server_impl.cc

@@ -41,8 +41,6 @@
 
 namespace {
 
-const char kReferrerLowerCase[] = "referer";
-
 // Wrap a string in a unique_ptr to avoid extra copies.
 std::unique_ptr<std::string> CreateUniqueString(const void* data,
                                                 size_t data_size) {
@@ -78,7 +76,8 @@ CefRefPtr<CefRequest> CreateRequest(const std::string& address,
         info.headers.begin();
     for (; it != info.headers.end(); ++it) {
       // Don't include Referer in the header map.
-      if (base::LowerCaseEqualsASCII(it->first, kReferrerLowerCase)) {
+      if (base::EqualsCaseInsensitiveASCII(it->first,
+                                           net::HttpRequestHeaders::kReferer)) {
         referer = it->second;
       } else {
         header_map.insert(std::make_pair(it->first, it->second));

libcef/browser/views/panel_impl.h

@@ -61,9 +61,8 @@ CEF_PANEL_IMPL_T class CefPanelImpl : public CEF_VIEW_IMPL_D {
           views::View* view = ParentClass::content_view()->children()[i];
           CefViewAdapter* adapter = CefViewAdapter::GetFor(view);
           if (adapter) {
-            std::unique_ptr<base::DictionaryValue> child_info(
+            base::DictionaryValue child_info;
-                new base::DictionaryValue());
+            adapter->GetDebugInfo(&child_info, include_children);
-            adapter->GetDebugInfo(child_info.get(), include_children);
             children->Append(std::move(child_info));
           }
         }

libcef/common/alloy/alloy_main_delegate.cc

@@ -302,20 +302,20 @@ bool AlloyMainDelegate::BasicStartupComplete(int* exit_code) {
   std::string log_severity_str =
       command_line->GetSwitchValueASCII(switches::kLogSeverity);
   if (!log_severity_str.empty()) {
-    if (base::LowerCaseEqualsASCII(log_severity_str,
+    if (base::EqualsCaseInsensitiveASCII(log_severity_str,
-                                   switches::kLogSeverity_Verbose)) {
+                                         switches::kLogSeverity_Verbose)) {
       log_severity = logging::LOG_VERBOSE;
-    } else if (base::LowerCaseEqualsASCII(log_severity_str,
+    } else if (base::EqualsCaseInsensitiveASCII(
-                                          switches::kLogSeverity_Warning)) {
+                   log_severity_str, switches::kLogSeverity_Warning)) {
       log_severity = logging::LOG_WARNING;
-    } else if (base::LowerCaseEqualsASCII(log_severity_str,
+    } else if (base::EqualsCaseInsensitiveASCII(log_severity_str,
-                                          switches::kLogSeverity_Error)) {
+                                                switches::kLogSeverity_Error)) {
       log_severity = logging::LOG_ERROR;
-    } else if (base::LowerCaseEqualsASCII(log_severity_str,
+    } else if (base::EqualsCaseInsensitiveASCII(log_severity_str,
-                                          switches::kLogSeverity_Fatal)) {
+                                                switches::kLogSeverity_Fatal)) {
       log_severity = logging::LOG_FATAL;
-    } else if (base::LowerCaseEqualsASCII(log_severity_str,
+    } else if (base::EqualsCaseInsensitiveASCII(
-                                          switches::kLogSeverity_Disable)) {
+                   log_severity_str, switches::kLogSeverity_Disable)) {
       log_severity = LOGSEVERITY_DISABLE;
     }
   }

libcef/common/request_impl.cc

@@ -46,11 +46,9 @@
 
 namespace {
 
-const char kReferrerLowerCase[] = "referer";
+const char kCacheControlDirectiveNoCache[] = "no-cache";
-const char kCacheControlLowerCase[] = "cache-control";
+const char kCacheControlDirectiveNoStore[] = "no-store";
-const char kCacheControlDirectiveNoCacheLowerCase[] = "no-cache";
+const char kCacheControlDirectiveOnlyIfCached[] = "only-if-cached";
-const char kCacheControlDirectiveNoStoreLowerCase[] = "no-store";
-const char kCacheControlDirectiveOnlyIfCachedLowerCase[] = "only-if-cached";
 
 // Mask of values that configure the cache policy.
 const int kURCachePolicyMask =
@@ -68,8 +66,8 @@ int GetCacheControlHeaderPolicy(CefRequest::HeaderMap headerMap) {
   {
     CefRequest::HeaderMap::const_iterator it = headerMap.begin();
     for (; it != headerMap.end(); ++it) {
-      if (base::LowerCaseEqualsASCII(it->first.ToString(),
+      if (base::EqualsCaseInsensitiveASCII(
-                                     kCacheControlLowerCase)) {
+              it->first.ToString(), net::HttpRequestHeaders::kCacheControl)) {
         line = it->second;
         break;
       }
@@ -84,14 +82,14 @@ int GetCacheControlHeaderPolicy(CefRequest::HeaderMap headerMap) {
     std::vector<base::StringPiece> pieces = base::SplitStringPiece(
         line, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     for (const auto& piece : pieces) {
-      if (base::LowerCaseEqualsASCII(piece,
+      if (base::EqualsCaseInsensitiveASCII(piece,
-                                     kCacheControlDirectiveNoCacheLowerCase)) {
+                                           kCacheControlDirectiveNoCache)) {
         flags |= UR_FLAG_SKIP_CACHE;
-      } else if (base::LowerCaseEqualsASCII(
+      } else if (base::EqualsCaseInsensitiveASCII(
-                     piece, kCacheControlDirectiveOnlyIfCachedLowerCase)) {
+                     piece, kCacheControlDirectiveOnlyIfCached)) {
         flags |= UR_FLAG_ONLY_FROM_CACHE;
-      } else if (base::LowerCaseEqualsASCII(
+      } else if (base::EqualsCaseInsensitiveASCII(
-                     piece, kCacheControlDirectiveNoStoreLowerCase)) {
+                     piece, kCacheControlDirectiveNoStore)) {
         flags |= UR_FLAG_DISABLE_CACHE;
       }
     }
@@ -133,7 +131,8 @@ void GetHeaderMap(const net::HttpRequestHeaders& headers,
     const std::string& name = it.name();
 
     // Do not include Referer in the header map.
-    if (!base::LowerCaseEqualsASCII(name, kReferrerLowerCase))
+    if (!base::EqualsCaseInsensitiveASCII(name,
+                                          net::HttpRequestHeaders::kReferer))
       map.insert(std::make_pair(name, it.value()));
   };
 }
@@ -148,8 +147,10 @@ void GetHeaderMap(const CefRequest::HeaderMap& source,
     const CefString& name = it->first;
 
     // Do not include Referer in the header map.
-    if (!base::LowerCaseEqualsASCII(name.ToString(), kReferrerLowerCase))
+    if (!base::EqualsCaseInsensitiveASCII(name.ToString(),
+                                          net::HttpRequestHeaders::kReferer)) {
       map.insert(std::make_pair(name, it->second));
+    }
   }
 }
 
@@ -297,18 +298,19 @@ void CefRequestImpl::SetHeaderByName(const CefString& name,
   base::AutoLock lock_scope(lock_);
   CHECK_READONLY_RETURN_VOID();
 
-  std::string nameLower = name;
+  const std::string& nameStr = name;
-  HttpHeaderUtils::MakeASCIILower(&nameLower);
 
   // Do not include Referer in the header map.
-  if (nameLower == kReferrerLowerCase)
+  if (base::EqualsCaseInsensitiveASCII(nameStr,
+                                       net::HttpRequestHeaders::kReferer)) {
     return;
+  }
 
   Changed(kChangedHeaderMap);
 
   // There may be multiple values, so remove any first.
   for (auto it = headermap_.begin(); it != headermap_.end();) {
-    if (base::EqualsCaseInsensitiveASCII(it->first.ToString(), nameLower)) {
+    if (base::EqualsCaseInsensitiveASCII(it->first.ToString(), nameStr)) {
       if (!overwrite)
         return;
       it = headermap_.erase(it);

libcef/common/values_impl.cc

@@ -707,7 +707,7 @@ bool CefDictionaryValueImpl::Clear() {
 
 bool CefDictionaryValueImpl::HasKey(const CefString& key) {
   CEF_VALUE_VERIFY_RETURN(false, 0);
-  return const_value().HasKey(base::StringPiece(key));
+  return const_value().FindKey(base::StringPiece(key));
 }
 
 bool CefDictionaryValueImpl::GetKeys(KeyList& keys) {

libcef/renderer/alloy/alloy_content_renderer_client.cc

@@ -96,6 +96,7 @@
 #include "third_party/blink/public/web/web_element.h"
 #include "third_party/blink/public/web/web_frame.h"
 #include "third_party/blink/public/web/web_local_frame.h"
+#include "third_party/blink/public/web/web_script_controller.h"
 #include "third_party/blink/public/web/web_security_policy.h"
 #include "third_party/blink/public/web/web_view.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
@@ -258,8 +259,8 @@ void AlloyContentRendererClient::ExposeInterfacesToBrowser(
 
 void AlloyContentRendererClient::RenderThreadConnected() {
   // Register extensions last because it will trigger WebKit initialization.
-  content::RenderThread* thread = content::RenderThread::Get();
+  blink::WebScriptController::RegisterExtension(
-  thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
+      extensions_v8::LoadTimesExtension::Get());
 
   render_manager_->RenderThreadConnected();
 }

libcef/renderer/dom_node_impl.cc

@@ -80,10 +80,10 @@ bool CefDOMNodeImpl::IsEditable() {
 
     // Also return true if it has an ARIA role of 'textbox'.
     for (unsigned i = 0; i < element.AttributeCount(); ++i) {
-      if (base::LowerCaseEqualsASCII(element.AttributeLocalName(i).Utf8(),
+      if (base::EqualsCaseInsensitiveASCII(element.AttributeLocalName(i).Utf8(),
-                                     "role")) {
+                                           "role")) {
-        if (base::LowerCaseEqualsASCII(element.AttributeValue(i).Utf8(),
+        if (base::EqualsCaseInsensitiveASCII(element.AttributeValue(i).Utf8(),
-                                       "textbox")) {
+                                             "textbox")) {
           return true;
         }
         break;

libcef/renderer/frame_impl.cc

@@ -326,6 +326,11 @@ void CefFrameImpl::OnWasShown() {
   }
 }
 
+void CefFrameImpl::OnDidCommitProvisionalLoad() {
+  did_commit_provisional_load_ = true;
+  MaybeInitializeScriptContext();
+}
+
 void CefFrameImpl::OnDidFinishLoad() {
   // Ignore notifications from the embedded frame hosting a mime-type plugin.
   // We'll eventually receive a notification from the owner frame.
@@ -452,6 +457,7 @@ void CefFrameImpl::ExecuteOnLocalFrame(const std::string& function_name,
   if (!context_created_) {
     queued_context_actions_.push(
         std::make_pair(function_name, std::move(action)));
+    MaybeInitializeScriptContext();
     return;
   }
 
@@ -583,6 +589,32 @@ void CefFrameImpl::SendToBrowserFrame(const std::string& function_name,
   std::move(action).Run(browser_frame);
 }
 
+void CefFrameImpl::MaybeInitializeScriptContext() {
+  if (did_initialize_script_context_) {
+    return;
+  }
+
+  if (!did_commit_provisional_load_) {
+    // Too soon for context initialization.
+    return;
+  }
+
+  if (queued_context_actions_.empty()) {
+    // Don't need early context initialization. Avoid it due to performance
+    // consequences.
+    return;
+  }
+
+  did_initialize_script_context_ = true;
+
+  // Explicitly force creation of the script context. This occurred implicitly
+  // via DidCommitProvisionalLoad prior to https://crrev.com/5150754880a.
+  // Otherwise, a script context may never be created for a frame that doesn't
+  // contain JS code.
+  v8::HandleScope handle_scope(blink::MainThreadIsolate());
+  frame_->MainWorldScriptContext();
+}
+
 void CefFrameImpl::FrameAttachedAck() {
   // Sent from the browser process in response to ConnectBrowserFrame() sending
   // FrameAttached().
@@ -634,9 +666,9 @@ void CefFrameImpl::SendCommandWithResponse(
              blink::WebLocalFrame* frame) {
             blink::WebString response;
 
-            if (base::LowerCaseEqualsASCII(command, "getsource")) {
+            if (base::EqualsCaseInsensitiveASCII(command, "getsource")) {
               response = blink_glue::DumpDocumentMarkup(frame);
-            } else if (base::LowerCaseEqualsASCII(command, "gettext")) {
+            } else if (base::EqualsCaseInsensitiveASCII(command, "gettext")) {
               response = blink_glue::DumpDocumentText(frame);
             }
 

libcef/renderer/frame_impl.h

@@ -92,6 +92,7 @@ class CefFrameImpl
   // Forwarded from CefRenderFrameObserver.
   void OnAttached();
   void OnWasShown();
+  void OnDidCommitProvisionalLoad();
   void OnDidFinishLoad();
   void OnDraggableRegionsChanged();
   void OnContextCreated(v8::Local<v8::Context> context);
@@ -129,6 +130,8 @@ class CefFrameImpl
   void SendToBrowserFrame(const std::string& function_name,
                           BrowserFrameAction action);
 
+  void MaybeInitializeScriptContext();
+
   // cef::mojom::RenderFrame methods:
   void FrameAttachedAck() override;
   void SendMessage(const std::string& name, base::Value arguments) override;
@@ -151,6 +154,9 @@ class CefFrameImpl
   blink::WebLocalFrame* frame_;
   const int64 frame_id_;
 
+  bool did_commit_provisional_load_ = false;
+  bool did_initialize_script_context_ = false;
+
   bool context_created_ = false;
   std::queue<std::pair<std::string, LocalFrameAction>> queued_context_actions_;
 

libcef/renderer/render_frame_observer.cc

@@ -42,6 +42,8 @@ void CefRenderFrameObserver::DidCommitProvisionalLoad(
   if (!frame_)
     return;
 
+  frame_->OnDidCommitProvisionalLoad();
+
   if (frame_->GetParent() == nullptr) {
     blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
     CefRefPtr<CefBrowserImpl> browserPtr =

libcef/renderer/render_urlrequest_impl.cc

@@ -47,11 +47,13 @@ class CefWebURLLoaderClient : public blink::WebURLLoaderClient {
                    uint64_t total_bytes_to_be_sent) override;
   void DidReceiveResponse(const WebURLResponse& response) override;
   void DidReceiveData(const char* data, int dataLength) override;
-  void DidFinishLoading(base::TimeTicks finish_time,
+  void DidFinishLoading(
-                        int64_t total_encoded_data_length,
+      base::TimeTicks finish_time,
-                        int64_t total_encoded_body_length,
+      int64_t total_encoded_data_length,
-                        int64_t total_decoded_body_length,
+      int64_t total_encoded_body_length,
-                        bool should_report_corb_blocking) override;
+      int64_t total_decoded_body_length,
+      bool should_report_corb_blocking,
+      absl::optional<bool> pervasive_payload_requested) override;
   void DidFail(const WebURLError&,
                base::TimeTicks finish_time,
                int64_t total_encoded_data_length,
@@ -370,11 +372,13 @@ void CefWebURLLoaderClient::DidReceiveData(const char* data, int dataLength) {
     context_->OnDownloadData(data, dataLength);
 }
 
-void CefWebURLLoaderClient::DidFinishLoading(base::TimeTicks finish_time,
+void CefWebURLLoaderClient::DidFinishLoading(
-                                             int64_t total_encoded_data_length,
+    base::TimeTicks finish_time,
-                                             int64_t total_encoded_body_length,
+    int64_t total_encoded_data_length,
-                                             int64_t total_decoded_body_length,
+    int64_t total_encoded_body_length,
-                                             bool should_report_corb_blocking) {
+    int64_t total_decoded_body_length,
+    bool should_report_corb_blocking,
+    absl::optional<bool> pervasive_payload_requested) {
   context_->OnComplete();
 }
 

libcef/renderer/v8_impl.cc

@@ -41,6 +41,7 @@
 #include "third_party/blink/public/web/blink.h"
 #include "third_party/blink/public/web/web_frame.h"
 #include "third_party/blink/public/web/web_local_frame.h"
+#include "third_party/blink/public/web/web_script_controller.h"
 #include "url/gurl.h"
 
 namespace {
@@ -846,7 +847,7 @@ bool CefRegisterExtension(const CefString& extension_name,
   std::unique_ptr<v8::Extension> wrapper(new ExtensionWrapper(
       name->GetString(), code->GetString(), handler.get()));
 
-  content::RenderThread::Get()->RegisterExtension(std::move(wrapper));
+  blink::WebScriptController::RegisterExtension(std::move(wrapper));
   return true;
 }
 

patch/patch.cfg

@@ -163,8 +163,9 @@ patches = [
     # Modify views::View to extend SupportsUserData.
     # https://bitbucket.org/chromiumembedded/cef/issues/1749
     #
-    # Don't add TestDesktopScreenX11 dependency on Linux.
+    # Don't add TestDesktopScreenOzone dependency on Linux.
-    # Reverts ui_controls_factory_desktop_aurax11.cc changes from
+    # Reverts ui_controls_factory_desktop_aurax11.cc (now
+    # ui_controls_factory_desktop_aura_ozone.cc) changes from
     # https://codereview.chromium.org/2327623002
     #
     # Add InkDropHostView::ink_drop_mode method.
@@ -573,14 +574,9 @@ patches = [
     'name': 'linux_bluetooth_1319006',
   },
   {
-    # Linux: Fix undefined symbol
+    # Wrap base::Value::{Dict,List}}:WriteIntoTrace() with correct #ifs.
-    # ApcOnboardingCoordinatorImpl::CreateOnboardingController
+    # Fixes compile error with official cef_sandbox build on Windows.
-    # https://crrev.com/101d5657f1
+    # https://chromium-review.googlesource.com/c/chromium/src/+/3703780
-    'name': 'chrome_browser_autofill_1322387',
+    'name': 'base_values_3703780',
-  },
-  {
-    # Windows: Fix time_win.cc compile error with cef_sandbox.
-    # https://chromium-review.googlesource.com/c/chromium/src/+/3650405
-    'name': 'base_time_3650405',
   }
 ]

patch/patches/base_command_line_1872.patch

@@ -1,8 +1,8 @@
 diff --git base/command_line.cc base/command_line.cc
-index db71b62fabe5a..760a33acbc4fa 100644
+index 9ea1c437056ea..5fcea78a3325a 100644
 --- base/command_line.cc
 +++ base/command_line.cc
-@@ -338,11 +338,10 @@ void CommandLine::AppendSwitchPath(StringPiece switch_string,
+@@ -339,11 +339,10 @@ void CommandLine::AppendSwitchPath(StringPiece switch_string,
  
  void CommandLine::AppendSwitchNative(StringPiece switch_string,
                                       CommandLine::StringPieceType value) {

patch/patches/base_sandbox_2743.patch

@@ -1,5 +1,5 @@
 diff --git base/BUILD.gn base/BUILD.gn
-index 3f4eb14a38603..b5f12aaa820e5 100644
+index 3d13052ffc51f..808aa7607c890 100644
 --- base/BUILD.gn
 +++ base/BUILD.gn
 @@ -37,6 +37,7 @@ import("//build/nocompile.gni")
@@ -10,7 +10,7 @@ index 3f4eb14a38603..b5f12aaa820e5 100644
  import("//testing/libfuzzer/fuzzer_test.gni")
  import("//testing/test.gni")
  
-@@ -1905,7 +1906,11 @@ mixed_component("base") {
+@@ -1903,7 +1904,11 @@ mixed_component("base") {
      "hash/md5_constexpr_internal.h",
      "hash/sha1.h",
    ]
@@ -23,7 +23,7 @@ index 3f4eb14a38603..b5f12aaa820e5 100644
      sources += [
        "hash/md5_nacl.cc",
        "hash/md5_nacl.h",
-@@ -2051,6 +2056,12 @@ mixed_component("base") {
+@@ -2056,6 +2061,12 @@ mixed_component("base") {
        defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
      }
  

patch/patches/base_time_3650405.patch

@@ -1,13 +0,0 @@
-diff --git base/time/time_win.cc base/time/time_win.cc
-index eabcc10ad2c31..014dd169992f0 100644
---- base/time/time_win.cc
-+++ base/time/time_win.cc
-@@ -406,7 +406,7 @@ DWORD (*g_tick_function)(void) = &timeGetTimeWrapper;
- // "rollover" counter.
- union LastTimeAndRolloversState {
-   // The state as a single 32-bit opaque value.
--  std::atomic<int32_t> as_opaque_32;
-+  std::atomic<int32_t> as_opaque_32{0};
- 
-   // The state as usable values.
-   struct {

patch/patches/base_values_3703780.patch

@@ -0,0 +1,34 @@
+diff --git base/values.cc base/values.cc
+index 62e55cd83704d..42857ccc2e01d 100644
+--- base/values.cc
++++ base/values.cc
+@@ -789,12 +789,14 @@ std::string Value::Dict::DebugString() const {
+   return DebugStringImpl(*this);
+ }
+ 
++#if BUILDFLAG(ENABLE_BASE_TRACING)
+ void Value::Dict::WriteIntoTrace(perfetto::TracedValue context) const {
+   perfetto::TracedDictionary dict = std::move(context).WriteDictionary();
+   for (auto kv : *this) {
+     dict.Add(perfetto::DynamicString(kv.first), kv.second);
+   }
+ }
++#endif  // BUILDFLAG(ENABLE_BASE_TRACING)
+ 
+ Value::Dict::Dict(
+     const flat_map<std::string, std::unique_ptr<Value>>& storage) {
+@@ -999,12 +1001,14 @@ std::string Value::List::DebugString() const {
+   return DebugStringImpl(*this);
+ }
+ 
++#if BUILDFLAG(ENABLE_BASE_TRACING)
+ void Value::List::WriteIntoTrace(perfetto::TracedValue context) const {
+   perfetto::TracedArray array = std::move(context).WriteArray();
+   for (const auto& item : *this) {
+     array.Append(item);
+   }
+ }
++#endif  // BUILDFLAG(ENABLE_BASE_TRACING)
+ 
+ Value::List::List(const std::vector<Value>& storage) {
+   storage_.reserve(storage.size());

patch/patches/browser_security_policy_1081397.patch

@@ -1,8 +1,8 @@
 diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
-index bbc7c3ece4123..fe2b35d70f1f3 100644
+index 3a619b38da0c7..8bdf8ad9b1c18 100644
 --- content/browser/child_process_security_policy_impl.cc
 +++ content/browser/child_process_security_policy_impl.cc
-@@ -1743,6 +1743,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin(
+@@ -1751,6 +1751,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin(
              // DeclarativeApiTest.PersistRules.
              if (actual_process_lock.matches_scheme(url::kDataScheme))
                return true;
@@ -20,10 +20,10 @@ index bbc7c3ece4123..fe2b35d70f1f3 100644
  
            // TODO(wjmaclean): We should update the ProcessLock comparison API
 diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
-index 94fc328a7b8f1..e1de50ac9d589 100644
+index e3e73a2353312..4f2d190c000b2 100644
 --- content/browser/renderer_host/navigation_request.cc
 +++ content/browser/renderer_host/navigation_request.cc
-@@ -6208,6 +6208,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
+@@ -6312,6 +6312,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
      network::mojom::WebSandboxFlags sandbox_flags) {
    // Calculate an approximation of the origin. The sandbox/csp are ignored.
    url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this);
@@ -36,7 +36,7 @@ index 94fc328a7b8f1..e1de50ac9d589 100644
  
    // Apply sandbox flags.
    // See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag
-@@ -6241,6 +6247,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
+@@ -6345,6 +6351,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
    if (IsSameDocument() || IsPageActivation())
      return GetRenderFrameHost()->GetLastCommittedOrigin();
  

patch/patches/browser_web_ui_controller_factory.patch

@@ -13,10 +13,10 @@ index eb068fb9bb42c..4e8e6a1a7abf4 100644
  };
  
 diff --git content/public/browser/webui_config_map.h content/public/browser/webui_config_map.h
-index a979408cc95c3..230215de5cd36 100644
+index af6c1a5845697..ac003cce0f40c 100644
 --- content/public/browser/webui_config_map.h
 +++ content/public/browser/webui_config_map.h
-@@ -59,6 +59,10 @@ class CONTENT_EXPORT WebUIConfigMap {
+@@ -60,6 +60,10 @@ class CONTENT_EXPORT WebUIConfigMap {
    // Returns the size of the map, i.e. how many WebUIConfigs are registered.
    size_t GetSizeForTesting() { return configs_map_.size(); }
  

patch/patches/build.patch

@@ -1,8 +1,8 @@
 diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
-index f378b9560d153..70b31d25c3bf8 100644
+index df8610696cc6e..ab37a46457abd 100644
 --- build/config/compiler/BUILD.gn
 +++ build/config/compiler/BUILD.gn
-@@ -1836,8 +1836,6 @@ config("thin_archive") {
+@@ -1841,8 +1841,6 @@ config("thin_archive") {
    # confuses lldb.
    if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
      arflags = [ "-T" ]

patch/patches/chrome_browser.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
-index 4618d52dd4aa7..e5eace1043ed5 100644
+index f4f1725e5a0ed..59ce489a635c3 100644
 --- chrome/browser/BUILD.gn
 +++ chrome/browser/BUILD.gn
 @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
@@ -10,7 +10,7 @@ index 4618d52dd4aa7..e5eace1043ed5 100644
  import("//chrome/browser/buildflags.gni")
  import("//chrome/browser/downgrade/buildflags.gni")
  import("//chrome/common/features.gni")
-@@ -1953,6 +1954,7 @@ static_library("browser") {
+@@ -1946,6 +1947,7 @@ static_library("browser") {
      "//build:chromeos_buildflags",
      "//build/config/compiler:compiler_buildflags",
      "//cc",
@@ -18,8 +18,8 @@ index 4618d52dd4aa7..e5eace1043ed5 100644
      "//chrome:extra_resources",
      "//chrome:resources",
      "//chrome:strings",
-@@ -2629,6 +2631,10 @@ static_library("browser") {
+@@ -2482,6 +2484,10 @@ static_library("browser") {
-     deps += [ "//chrome/browser/ui/webui/connectors_internals:mojo_bindings" ]
+     ]
    }
  
 +  if (enable_cef) {

patch/patches/chrome_browser_autofill_1322387.patch

@@ -1,14 +0,0 @@
-diff --git chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator_impl.cc chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator_impl.cc
-index 4ac565d8ebdd0..9d3d610a305ab 100644
---- chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator_impl.cc
-+++ chrome/browser/autofill_assistant/password_change/apc_onboarding_coordinator_impl.cc
-@@ -38,7 +38,8 @@ void ApcOnboardingCoordinatorImpl::PerformOnboarding(Callback callback) {
-           base::Unretained(this)));
- }
- 
--std::unique_ptr<AssistantOnboardingController> CreateOnboardingController(
-+std::unique_ptr<AssistantOnboardingController>
-+ApcOnboardingCoordinatorImpl::CreateOnboardingController(
-     const AssistantOnboardingInformation& onboarding_information) {
-   return AssistantOnboardingController::Create(onboarding_information);
- }

patch/patches/chrome_browser_background_mode_1100085.patch

@@ -14,10 +14,10 @@ index d7b9aa164f161..a042abaecbce7 100644
        std::unique_ptr<BackgroundModeManager> manager) = 0;
  #endif
 diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
-index b678123304280..65e8d414dcf3c 100644
+index 0d4c13e21de4f..09168fad20462 100644
 --- chrome/browser/browser_process_impl.cc
 +++ chrome/browser/browser_process_impl.cc
-@@ -1000,18 +1000,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
+@@ -1013,18 +1013,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
    return download_request_limiter_.get();
  }
  

patch/patches/chrome_browser_browser.patch

@@ -1,19 +1,19 @@
 diff --git chrome/browser/browser_about_handler.cc chrome/browser/browser_about_handler.cc
-index 9e534ff1683f1..de406f5879be0 100644
+index 3285e422f76c1..5f35b91897b75 100644
 --- chrome/browser/browser_about_handler.cc
 +++ chrome/browser/browser_about_handler.cc
 @@ -70,6 +70,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) {
          FROM_HERE, base::BindOnce(&chrome::AttemptExit));
      return true;
    }
-+  if (base::LowerCaseEqualsASCII(spec, "chrome://ignore/")) {
++  if (base::EqualsCaseInsensitiveASCII(spec, "chrome://ignore/")) {
 +    return true;
 +  }
  
    return false;
  }
 diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
-index 87a0e51cf2dca..e13acd86314ae 100644
+index 66bece3638bf5..87e059da1256c 100644
 --- chrome/browser/ui/BUILD.gn
 +++ chrome/browser/ui/BUILD.gn
 @@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
@@ -23,8 +23,8 @@ index 87a0e51cf2dca..e13acd86314ae 100644
 +import("//cef/libcef/features/features.gni")
  import("//chrome/browser/buildflags.gni")
  import("//chrome/common/features.gni")
- import("//chromeos/assistant/assistant.gni")
+ import("//chromeos/ash/components/assistant/assistant.gni")
-@@ -365,6 +366,10 @@ static_library("ui") {
+@@ -373,6 +374,10 @@ static_library("ui") {
      "//build/config/compiler:wexit_time_destructors",
    ]
  
@@ -35,7 +35,7 @@ index 87a0e51cf2dca..e13acd86314ae 100644
    # Since browser and browser_ui actually depend on each other,
    # we must omit the dependency from browser_ui to browser.
    # However, this means browser_ui and browser should more or less
-@@ -387,6 +392,7 @@ static_library("ui") {
+@@ -395,6 +400,7 @@ static_library("ui") {
      "//build:branding_buildflags",
      "//build:chromeos_buildflags",
      "//cc/paint",
@@ -43,7 +43,7 @@ index 87a0e51cf2dca..e13acd86314ae 100644
      "//chrome:extra_resources",
      "//chrome:resources",
      "//chrome:strings",
-@@ -5410,6 +5416,7 @@ static_library("ui") {
+@@ -5461,6 +5467,7 @@ static_library("ui") {
    if (enable_basic_printing) {
      deps += [
        "//components/printing/browser",
@@ -52,7 +52,7 @@ index 87a0e51cf2dca..e13acd86314ae 100644
      ]
    }
 diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
-index fe7fafc5ee148..8a0e2dc5c7cc0 100644
+index 63d64acc72318..fd3cb52daf611 100644
 --- chrome/browser/ui/browser.cc
 +++ chrome/browser/ui/browser.cc
 @@ -264,6 +264,25 @@
@@ -81,7 +81,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
  #if BUILDFLAG(ENABLE_EXTENSIONS)
  #include "chrome/browser/extensions/extension_browser_window_helper.h"
  #endif
-@@ -510,6 +529,13 @@ Browser::Browser(const CreateParams& params)
+@@ -513,6 +532,13 @@ Browser::Browser(const CreateParams& params)
  
    tab_strip_model_->AddObserver(this);
  
@@ -95,7 +95,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
    location_bar_model_ = std::make_unique<LocationBarModelImpl>(
        location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
  
-@@ -1323,6 +1349,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
+@@ -1329,6 +1355,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
    if (exclusive_access_manager_->HandleUserKeyEvent(event))
      return content::KeyboardEventProcessingResult::HANDLED;
  
@@ -110,7 +110,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
    return window()->PreHandleKeyboardEvent(event);
  }
  
-@@ -1330,8 +1364,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
+@@ -1336,8 +1370,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
                                    const NativeWebKeyboardEvent& event) {
    DevToolsWindow* devtools_window =
        DevToolsWindow::GetInstanceForInspectedWebContents(source);
@@ -131,7 +131,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
  }
  
  bool Browser::TabsNeedBeforeUnloadFired() {
-@@ -1536,6 +1580,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
+@@ -1544,6 +1588,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
      return window->OpenURLFromTab(source, params);
    }
  
@@ -146,7 +146,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
    NavigateParams nav_params(this, params.url, params.transition);
    nav_params.FillNavigateParamsFromOpenURLParams(params);
    nav_params.source_contents = source;
-@@ -1665,6 +1717,15 @@ void Browser::AddNewContents(WebContents* source,
+@@ -1673,6 +1725,15 @@ void Browser::AddNewContents(WebContents* source,
      return;
    }
  
@@ -162,7 +162,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
    chrome::AddWebContents(this, source, std::move(new_contents), target_url,
                           disposition, initial_rect, window_action);
  }
-@@ -1683,6 +1744,8 @@ void Browser::LoadingStateChanged(WebContents* source,
+@@ -1691,6 +1752,8 @@ void Browser::LoadingStateChanged(WebContents* source,
                                    bool should_show_loading_ui) {
    ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
    UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@@ -171,7 +171,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
  }
  
  void Browser::CloseContents(WebContents* source) {
-@@ -1710,6 +1773,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
+@@ -1718,6 +1781,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
  }
  
  void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -180,7 +180,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
    if (!GetStatusBubble())
      return;
  
-@@ -1717,6 +1782,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
+@@ -1725,6 +1790,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
      GetStatusBubble()->SetURL(url);
  }
  
@@ -198,7 +198,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
  void Browser::ContentsMouseEvent(WebContents* source,
                                   bool motion,
                                   bool exited) {
-@@ -1741,6 +1817,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
+@@ -1749,6 +1825,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
    return false;
  }
  
@@ -218,7 +218,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
  void Browser::BeforeUnloadFired(WebContents* web_contents,
                                  bool proceed,
                                  bool* proceed_to_fire_unload) {
-@@ -1833,6 +1922,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
+@@ -1841,6 +1930,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
  
    // Make the tab show up in the task manager.
    task_manager::WebContentsTags::CreateForTabContents(new_contents);
@@ -229,7 +229,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
  }
  
  void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
-@@ -1877,6 +1970,8 @@ void Browser::RendererResponsive(
+@@ -1885,6 +1978,8 @@ void Browser::RendererResponsive(
  void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) {
    if (web_contents == tab_strip_model_->GetActiveWebContents())
      UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@@ -238,7 +238,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
  }
  
  content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
-@@ -1937,11 +2032,15 @@ void Browser::EnterFullscreenModeForTab(
+@@ -1945,11 +2040,15 @@ void Browser::EnterFullscreenModeForTab(
      const blink::mojom::FullscreenOptions& options) {
    exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
        requesting_frame, options.display_id);
@@ -254,7 +254,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
  }
  
  bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
-@@ -2654,13 +2753,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
+@@ -2664,13 +2763,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
  // Browser, Getters for UI (private):
  
  StatusBubble* Browser::GetStatusBubble() {
@@ -276,7 +276,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
    return window_ ? window_->GetStatusBubble() : nullptr;
  }
  
-@@ -2787,6 +2893,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
+@@ -2797,6 +2903,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
      content_translate_driver->RemoveTranslationObserver(this);
      BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
    }
@@ -286,7 +286,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
  
  void Browser::TabDetachedAtImpl(content::WebContents* contents,
 diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
-index 631c30c8f153e..bdd07951171eb 100644
+index 87859f4741386..1346cdb60631d 100644
 --- chrome/browser/ui/browser.h
 +++ chrome/browser/ui/browser.h
 @@ -22,6 +22,7 @@
@@ -308,7 +308,7 @@ index 631c30c8f153e..bdd07951171eb 100644
  #if BUILDFLAG(IS_ANDROID)
  #error This file should only be included on desktop.
  #endif
-@@ -305,6 +310,11 @@ class Browser : public TabStripModelObserver,
+@@ -316,6 +321,11 @@ class Browser : public TabStripModelObserver,
      // maximizable.
      bool can_maximize = true;
  
@@ -320,7 +320,7 @@ index 631c30c8f153e..bdd07951171eb 100644
     private:
      friend class Browser;
      friend class WindowSizerChromeOSTest;
-@@ -372,6 +382,13 @@ class Browser : public TabStripModelObserver,
+@@ -383,6 +393,13 @@ class Browser : public TabStripModelObserver,
      return creation_source_ == CreationSource::kSessionRestore;
    }
  
@@ -334,7 +334,7 @@ index 631c30c8f153e..bdd07951171eb 100644
    // Accessors ////////////////////////////////////////////////////////////////
  
    const CreateParams& create_params() const { return create_params_; }
-@@ -445,6 +462,12 @@ class Browser : public TabStripModelObserver,
+@@ -456,6 +473,12 @@ class Browser : public TabStripModelObserver,
  
    base::WeakPtr<Browser> AsWeakPtr();
  
@@ -347,7 +347,7 @@ index 631c30c8f153e..bdd07951171eb 100644
    // Get the FindBarController for this browser, creating it if it does not
    // yet exist.
    FindBarController* GetFindBarController();
-@@ -814,11 +837,19 @@ class Browser : public TabStripModelObserver,
+@@ -825,11 +848,19 @@ class Browser : public TabStripModelObserver,
    void SetContentsBounds(content::WebContents* source,
                           const gfx::Rect& bounds) override;
    void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@@ -367,7 +367,7 @@ index 631c30c8f153e..bdd07951171eb 100644
    void BeforeUnloadFired(content::WebContents* source,
                           bool proceed,
                           bool* proceed_to_fire_unload) override;
-@@ -1215,6 +1246,8 @@ class Browser : public TabStripModelObserver,
+@@ -1226,6 +1257,8 @@ class Browser : public TabStripModelObserver,
    const std::string initial_workspace_;
    bool initial_visible_on_all_workspaces_state_;
  
@@ -376,7 +376,7 @@ index 631c30c8f153e..bdd07951171eb 100644
    CreationSource creation_source_ = CreationSource::kUnknown;
  
    UnloadController unload_controller_;
-@@ -1281,6 +1314,10 @@ class Browser : public TabStripModelObserver,
+@@ -1294,6 +1327,10 @@ class Browser : public TabStripModelObserver,
    std::unique_ptr<screen_ai::AXScreenAIAnnotator> screen_ai_annotator_;
  #endif
  
@@ -388,10 +388,10 @@ index 631c30c8f153e..bdd07951171eb 100644
  
    // The following factory is used for chrome update coalescing.
 diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
-index fd72594b74be0..501ff17a214d2 100644
+index 9315a947d5cb2..0d5d14ae56026 100644
 --- chrome/browser/ui/browser_navigator.cc
 +++ chrome/browser/ui/browser_navigator.cc
-@@ -516,6 +516,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
+@@ -518,6 +518,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
    std::unique_ptr<WebContents> target_contents =
        WebContents::Create(create_params);
  

patch/patches/chrome_browser_context_menus.patch

@@ -1,8 +1,8 @@
 diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
-index fdad390f46a98..6554eea8bc247 100644
+index 95a75d011f33e..cc5dc818152f8 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -300,6 +300,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
+@@ -301,6 +301,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
    return callback.get();
  }
  
@@ -16,9 +16,9 @@ index fdad390f46a98..6554eea8bc247 100644
  enum class UmaEnumIdLookupType {
    GeneralEnumId,
    ContextSpecificEnumId,
-@@ -528,6 +535,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
+@@ -535,6 +542,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
-   if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
+     return -1;
-     return 1;
+   }
  
 +  // Match the MENU_ID_USER_FIRST to MENU_ID_USER_LAST range from cef_types.h.
 +  if (id >= 26500 && id <= 28500)
@@ -27,7 +27,7 @@ index fdad390f46a98..6554eea8bc247 100644
    id = CollapseCommandsForUMA(id);
    const auto& map = GetIdcToUmaMap(type);
    auto it = map.find(id);
-@@ -713,6 +724,14 @@ RenderViewContextMenu::RenderViewContextMenu(
+@@ -724,6 +735,14 @@ RenderViewContextMenu::RenderViewContextMenu(
    system_app_ = GetBrowser() && GetBrowser()->app_controller()
                      ? GetBrowser()->app_controller()->system_app()
                      : nullptr;
@@ -42,7 +42,7 @@ index fdad390f46a98..6554eea8bc247 100644
  }
  
  RenderViewContextMenu::~RenderViewContextMenu() = default;
-@@ -1094,6 +1113,12 @@ void RenderViewContextMenu::InitMenu() {
+@@ -1111,6 +1130,12 @@ void RenderViewContextMenu::InitMenu() {
    // menu, meaning that each menu item added/removed in this function will cause
    // it to visibly jump on the screen (see b/173569669).
    AppendQuickAnswersItems();
@@ -55,7 +55,7 @@ index fdad390f46a98..6554eea8bc247 100644
  }
  
  Profile* RenderViewContextMenu::GetProfile() const {
-@@ -2868,6 +2893,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
+@@ -2902,6 +2927,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
    execute_plugin_action_callback_ = std::move(cb);
  }
  
@@ -69,10 +69,10 @@ index fdad390f46a98..6554eea8bc247 100644
  RenderViewContextMenu::GetHandlersForLinkUrl() {
    custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers =
 diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h
-index f993ef1e145dd..6adb033077ae9 100644
+index e95f46698826c..1fcca0b68f20e 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.h
-@@ -124,6 +124,12 @@ class RenderViewContextMenu
+@@ -125,6 +125,12 @@ class RenderViewContextMenu
        base::OnceCallback<void(content::RenderFrameHost*,
                                blink::mojom::PluginActionType)> cb);
  
@@ -85,7 +85,7 @@ index f993ef1e145dd..6adb033077ae9 100644
   protected:
    Profile* GetProfile() const;
  
-@@ -339,6 +345,9 @@ class RenderViewContextMenu
+@@ -340,6 +346,9 @@ class RenderViewContextMenu
    //   built.
    bool is_protocol_submenu_valid_ = false;
  
@@ -96,10 +96,10 @@ index f993ef1e145dd..6adb033077ae9 100644
    // "Use enhanced spell check" items.
    std::unique_ptr<SpellingMenuObserver> spelling_suggestions_menu_observer_;
 diff --git chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
-index dd729e8186d03..c1bc086e34a91 100644
+index 13b73503a6a73..6e840062ff825 100644
 --- chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
 +++ chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
-@@ -139,6 +139,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
+@@ -146,6 +146,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
  bool RenderViewContextMenuViews::GetAcceleratorForCommandId(
      int command_id,
      ui::Accelerator* accel) const {
@@ -110,7 +110,7 @@ index dd729e8186d03..c1bc086e34a91 100644
    // that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do.
    switch (command_id) {
 diff --git components/renderer_context_menu/render_view_context_menu_base.cc components/renderer_context_menu/render_view_context_menu_base.cc
-index a3ba440acb3e9..48e77e93050e1 100644
+index 92bf0cec02a26..b449960a9f5dd 100644
 --- components/renderer_context_menu/render_view_context_menu_base.cc
 +++ components/renderer_context_menu/render_view_context_menu_base.cc
 @@ -378,6 +378,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const {

patch/patches/chrome_browser_dialogs_widget.patch

@@ -12,10 +12,10 @@ index a15902b583edc..2501a2d8ead5f 100644
      // on the screen, we can't actually attach to it.
      parent_window = nullptr;
 diff --git components/constrained_window/constrained_window_views.cc components/constrained_window/constrained_window_views.cc
-index d662221bcc6f7..8b139e1935e29 100644
+index df70e533d7774..ac4fc1c3da55d 100644
 --- components/constrained_window/constrained_window_views.cc
 +++ components/constrained_window/constrained_window_views.cc
-@@ -100,15 +100,24 @@ void UpdateModalDialogPosition(views::Widget* widget,
+@@ -101,15 +101,24 @@ void UpdateModalDialogPosition(views::Widget* widget,
    if (widget->HasCapture())
      return;
  
@@ -41,7 +41,7 @@ index d662221bcc6f7..8b139e1935e29 100644
      return;
    }
  
-@@ -207,7 +216,8 @@ views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog,
+@@ -215,7 +224,8 @@ views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog,
  
    return views::DialogDelegate::CreateDialogWidget(
        dialog, nullptr,
@@ -51,7 +51,7 @@ index d662221bcc6f7..8b139e1935e29 100644
  }
  
  views::Widget* CreateBrowserModalDialogViews(
-@@ -224,8 +234,13 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
+@@ -232,8 +242,13 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
  
    gfx::NativeView parent_view =
        parent ? CurrentClient()->GetDialogHostView(parent) : nullptr;
@@ -66,7 +66,7 @@ index d662221bcc6f7..8b139e1935e29 100644
  
    bool requires_positioning = dialog->use_custom_frame();
  
-@@ -238,8 +253,7 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
+@@ -246,8 +261,7 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
    if (!requires_positioning)
      return widget;
  

patch/patches/chrome_browser_profile_menu.patch

@@ -1,18 +1,3 @@
-diff --git chrome/browser/profiles/profile_window.cc chrome/browser/profiles/profile_window.cc
-index 08865f78806a7..1a516328eaff6 100644
---- chrome/browser/profiles/profile_window.cc
-+++ chrome/browser/profiles/profile_window.cc
-@@ -282,7 +282,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
-       *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
-       return;
-     case BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT:
--      *bubble_view_mode = profile->IsIncognitoProfile()
-+      *bubble_view_mode = profile->IsIncognitoProfile() ||
-+                          (profile->IsOffTheRecord() &&
-+                           profile->GetOTRProfileID().IsUniqueForCEF())
-                               ? profiles::BUBBLE_VIEW_MODE_INCOGNITO
-                               : profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
-   }
 diff --git chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
 index 4569d0afcb80a..5af2fb12f1d7a 100644
 --- chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
@@ -54,17 +39,17 @@ index 34949452d4891..43aa445b5ac3f 100644
  
    base::RecordAction(base::UserMetricsAction("IncognitoMenu_Show"));
 diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-index fa2b003a6ce6c..c1b78780fb56e 100644
+index 001e5831a0512..a0a6073c64ed8 100644
 --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
 +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -511,7 +511,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode,
+@@ -508,7 +508,9 @@ void ProfileMenuViewBase::ShowBubble(views::Button* anchor_button,
+       feature_engagement::kIPHProfileSwitchFeature);
  
    ProfileMenuViewBase* bubble = nullptr;
-   if (view_mode == profiles::BUBBLE_VIEW_MODE_INCOGNITO) {
+-  if (browser->profile()->IsIncognitoProfile()) {
--    DCHECK(browser->profile()->IsIncognitoProfile());
++  if (browser->profile()->IsIncognitoProfile() ||
-+    DCHECK(browser->profile()->IsIncognitoProfile() ||
++      (browser->profile()->IsOffTheRecord() &&
-+           (browser->profile()->IsOffTheRecord() &&
++       browser->profile()->GetOTRProfileID().IsUniqueForCEF())) {
-+            browser->profile()->GetOTRProfileID().IsUniqueForCEF()));
      bubble = new IncognitoMenuView(anchor_button, browser);
    } else {
  #if BUILDFLAG(IS_CHROMEOS_ASH)

patch/patches/chrome_browser_profiles.patch

@@ -14,7 +14,7 @@ index a9c0c34999035..5fbf5eb462e42 100644
  }
  
 diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
-index c34520bfd62fe..1358d28347098 100644
+index 02a724e47ba2e..4fa0dbefeecbc 100644
 --- chrome/browser/profiles/profile.cc
 +++ chrome/browser/profiles/profile.cc
 @@ -83,6 +83,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
@@ -85,10 +85,10 @@ index ca2561e412621..febd52df6c971 100644
    virtual bool IsSignedIn() = 0;
  
 diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
-index 2e1d353a1e34b..98a3a93c37d39 100644
+index 8b4be2abc03ec..8f53f25103358 100644
 --- chrome/browser/profiles/profile_impl.cc
 +++ chrome/browser/profiles/profile_impl.cc
-@@ -994,7 +994,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
+@@ -996,7 +996,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
  
    otr_profiles_[otr_profile_id] = std::move(otr_profile);
  
@@ -100,7 +100,7 @@ index 2e1d353a1e34b..98a3a93c37d39 100644
    return raw_otr_profile;
  }
 diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
-index e35e0cb323c8c..a2268c594d8c6 100644
+index 7d959397bcb72..188d552d065c8 100644
 --- chrome/browser/profiles/profile_manager.cc
 +++ chrome/browser/profiles/profile_manager.cc
 @@ -517,7 +517,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
@@ -113,10 +113,10 @@ index e35e0cb323c8c..a2268c594d8c6 100644
  
    zombie_metrics_timer_.Start(FROM_HERE, base::Minutes(30), this,
 diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
-index 03c2269af2180..5ee91d31bd473 100644
+index f3c58cfa9b0f8..745bff6a12b66 100644
 --- chrome/browser/profiles/profile_manager.h
 +++ chrome/browser/profiles/profile_manager.h
-@@ -151,7 +151,7 @@ class ProfileManager : public Profile::Delegate {
+@@ -153,7 +153,7 @@ class ProfileManager : public Profile::Delegate {
    // acceptable. Returns null if creation of the new profile fails.
    // TODO(bauerb): Migrate calls from other code to GetProfileByPath(), then
    // make this method private.
@@ -125,7 +125,7 @@ index 03c2269af2180..5ee91d31bd473 100644
  
    // Returns regular or off-the-record profile given its profile key.
    static Profile* GetProfileFromProfileKey(ProfileKey* profile_key);
-@@ -183,7 +183,7 @@ class ProfileManager : public Profile::Delegate {
+@@ -185,7 +185,7 @@ class ProfileManager : public Profile::Delegate {
  
    // Returns true if the profile pointer is known to point to an existing
    // profile.

patch/patches/chrome_browser_safe_browsing.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
-index 0fdd7247bf67f..a80f9a05c37b4 100644
+index ed8d055e3aaeb..ae289580cb8ff 100644
 --- chrome/browser/safe_browsing/BUILD.gn
 +++ chrome/browser/safe_browsing/BUILD.gn
 @@ -27,6 +27,7 @@ static_library("safe_browsing") {

patch/patches/chrome_browser_themes.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
-index d759fbfcd4215..156ac3dcbdda1 100644
+index 5d2c348a99b76..bfa0c77ff1aa1 100644
 --- chrome/browser/themes/theme_service.cc
 +++ chrome/browser/themes/theme_service.cc
 @@ -31,6 +31,7 @@

patch/patches/chrome_plugins.patch

@@ -125,10 +125,10 @@ index 8b72897491669..546919dd70afc 100644
    // that the X-Frame-Options protection mechanism is set to either DENY or
    // SAMEORIGIN.
 diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
-index 06315cc8f3b99..3920adc12c1c1 100644
+index d2110910a9a31..0b7f12ca2af62 100644
 --- chrome/renderer/chrome_content_renderer_client.cc
 +++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -937,6 +937,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -941,6 +941,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
  
      if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
           status == chrome::mojom::PluginStatus::kBlocked) &&
@@ -136,7 +136,7 @@ index 06315cc8f3b99..3920adc12c1c1 100644
          content_settings_agent_delegate->IsPluginTemporarilyAllowed(
              identifier)) {
        status = chrome::mojom::PluginStatus::kAllowed;
-@@ -1138,7 +1139,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1142,7 +1143,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
          render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
              plugin_auth_host.BindNewEndpointAndPassReceiver());
          plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@@ -146,7 +146,7 @@ index 06315cc8f3b99..3920adc12c1c1 100644
          break;
        }
        case chrome::mojom::PluginStatus::kBlocked: {
-@@ -1147,7 +1149,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1151,7 +1153,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
              l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
          placeholder->AllowLoading();
          RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@@ -156,7 +156,7 @@ index 06315cc8f3b99..3920adc12c1c1 100644
          break;
        }
        case chrome::mojom::PluginStatus::kBlockedByPolicy: {
-@@ -1157,7 +1160,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1161,7 +1164,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
                                         group_name));
          RenderThread::Get()->RecordAction(
              UserMetricsAction("Plugin_BlockedByPolicy"));
@@ -166,7 +166,7 @@ index 06315cc8f3b99..3920adc12c1c1 100644
          break;
        }
        case chrome::mojom::PluginStatus::kBlockedNoLoading: {
-@@ -1165,7 +1169,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1169,7 +1173,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
              IDR_BLOCKED_PLUGIN_HTML,
              l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
                                         group_name));

patch/patches/chrome_renderer.patch

@@ -1,5 +1,5 @@
 diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
-index a32f28835170c..af0507fd0de55 100644
+index 80183431d6cdb..19b76bf53cbf2 100644
 --- chrome/renderer/BUILD.gn
 +++ chrome/renderer/BUILD.gn
 @@ -5,6 +5,7 @@
@@ -10,7 +10,7 @@ index a32f28835170c..af0507fd0de55 100644
  import("//chrome/common/features.gni")
  import("//components/nacl/features.gni")
  import("//components/offline_pages/buildflags/features.gni")
-@@ -118,6 +119,7 @@ static_library("renderer") {
+@@ -120,6 +121,7 @@ static_library("renderer") {
    deps = [
      "//base/allocator:buildflags",
      "//build:chromeos_buildflags",
@@ -18,7 +18,7 @@ index a32f28835170c..af0507fd0de55 100644
      "//chrome:resources",
      "//chrome:strings",
      "//chrome/common",
-@@ -209,6 +211,10 @@ static_library("renderer") {
+@@ -210,6 +212,10 @@ static_library("renderer") {
  
    configs += [ "//build/config/compiler:wexit_time_destructors" ]
  

patch/patches/chrome_runtime.patch

@@ -1,8 +1,8 @@
 diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
-index 51d73c9eaf521..2bede66d3bbb2 100644
+index 94641fd257de9..0aa8e14458efd 100644
 --- chrome/app/chrome_main_delegate.cc
 +++ chrome/app/chrome_main_delegate.cc
-@@ -33,6 +33,7 @@
+@@ -39,6 +39,7 @@
  #include "base/trace_event/trace_event_impl.h"
  #include "build/build_config.h"
  #include "build/chromeos_buildflags.h"
@@ -10,7 +10,7 @@ index 51d73c9eaf521..2bede66d3bbb2 100644
  #include "chrome/browser/chrome_content_browser_client.h"
  #include "chrome/browser/chrome_resource_bundle_helper.h"
  #include "chrome/browser/defaults.h"
-@@ -388,6 +389,8 @@ struct MainFunction {
+@@ -446,6 +447,8 @@ struct MainFunction {
  
  // Initializes the user data dir. Must be called before InitializeLocalState().
  void InitializeUserDataDir(base::CommandLine* command_line) {
@@ -19,7 +19,7 @@ index 51d73c9eaf521..2bede66d3bbb2 100644
  #if BUILDFLAG(IS_WIN)
    // Reach out to chrome_elf for the truth on the user data directory.
    // Note that in tests, this links to chrome_elf_test_stubs.
-@@ -701,7 +704,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
+@@ -766,7 +769,9 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
    }
  
  #if BUILDFLAG(IS_WIN)
@@ -29,7 +29,7 @@ index 51d73c9eaf521..2bede66d3bbb2 100644
    base::sequence_manager::internal::ThreadControllerPowerMonitor::
        InitializeOnMainThread();
    base::InitializePlatformThreadFeatures();
-@@ -1015,6 +1020,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1114,6 +1119,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
    std::string process_type =
        command_line.GetSwitchValueASCII(switches::kProcessType);
  
@@ -37,7 +37,7 @@ index 51d73c9eaf521..2bede66d3bbb2 100644
    crash_reporter::InitializeCrashKeys();
  
  #if BUILDFLAG(IS_POSIX)
-@@ -1025,6 +1031,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1124,6 +1130,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
    InitMacCrashReporter(command_line, process_type);
    SetUpInstallerPreferences(command_line);
  #endif
@@ -45,7 +45,7 @@ index 51d73c9eaf521..2bede66d3bbb2 100644
  
  #if BUILDFLAG(IS_WIN)
    child_process_logging::Init();
-@@ -1163,6 +1170,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1316,6 +1323,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
          locale;
    }
  
@@ -53,7 +53,7 @@ index 51d73c9eaf521..2bede66d3bbb2 100644
  #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
-@@ -1195,6 +1203,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1355,6 +1363,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
    // After all the platform Breakpads have been initialized, store the command
    // line for crash reporting.
    crash_keys::SetCrashKeysFromCommandLine(command_line);
@@ -61,7 +61,7 @@ index 51d73c9eaf521..2bede66d3bbb2 100644
  
  #if BUILDFLAG(ENABLE_PDF)
    MaybePatchGdiGetFontData();
-@@ -1280,6 +1289,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1440,6 +1449,7 @@ void ChromeMainDelegate::ZygoteForked() {
      SetUpProfilingShutdownHandler();
    }
  
@@ -69,7 +69,7 @@ index 51d73c9eaf521..2bede66d3bbb2 100644
    // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
    // this up for the browser process in a different manner.
    const base::CommandLine* command_line =
-@@ -1296,6 +1306,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1456,6 +1466,7 @@ void ChromeMainDelegate::ZygoteForked() {
  
    // Reset the command line for the newly spawned process.
    crash_keys::SetCrashKeysFromCommandLine(*command_line);
@@ -78,7 +78,7 @@ index 51d73c9eaf521..2bede66d3bbb2 100644
  
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
-index aa1d901eab06e..d3a9b826150f4 100644
+index 18b522abec2a0..aeba2b49bb3e5 100644
 --- chrome/browser/chrome_browser_main.cc
 +++ chrome/browser/chrome_browser_main.cc
 @@ -52,6 +52,7 @@
@@ -89,7 +89,7 @@ index aa1d901eab06e..d3a9b826150f4 100644
  #include "chrome/browser/about_flags.h"
  #include "chrome/browser/active_use_util.h"
  #include "chrome/browser/after_startup_task_utils.h"
-@@ -1588,12 +1589,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1600,12 +1601,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
          browser_process_->local_state());
    }
  
@@ -104,7 +104,7 @@ index aa1d901eab06e..d3a9b826150f4 100644
  
  #if BUILDFLAG(IS_ANDROID)
    page_info::SetPageInfoClient(new ChromePageInfoClient());
-@@ -1741,12 +1744,15 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1753,12 +1756,15 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
    // This step is costly and is already measured in
    // Startup.StartupBrowserCreator_Start.
    // See the comment above for an explanation of |process_command_line|.
@@ -121,7 +121,7 @@ index aa1d901eab06e..d3a9b826150f4 100644
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-@@ -1774,8 +1780,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1786,8 +1792,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
  
      // Create the RunLoop for MainMessageLoopRun() to use and transfer
      // ownership of the browser's lifetime to the BrowserProcess.
@@ -134,7 +134,7 @@ index aa1d901eab06e..d3a9b826150f4 100644
          GetMainRunLoopInstance()->QuitWhenIdleClosure());
    }
 diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
-index 0cb701b8772f5..ba6c84a530b64 100644
+index 341458a637857..441708d4a301f 100644
 --- chrome/browser/chrome_browser_main_mac.mm
 +++ chrome/browser/chrome_browser_main_mac.mm
 @@ -16,6 +16,7 @@
@@ -145,7 +145,7 @@ index 0cb701b8772f5..ba6c84a530b64 100644
  #import "chrome/browser/app_controller_mac.h"
  #include "chrome/browser/apps/app_shim/app_shim_listener.h"
  #include "chrome/browser/browser_process.h"
-@@ -111,6 +112,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
+@@ -109,6 +110,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
      }
    }
  
@@ -153,7 +153,7 @@ index 0cb701b8772f5..ba6c84a530b64 100644
    // Create the app delegate. This object is intentionally leaked as a global
    // singleton. It is accessed through -[NSApp delegate].
    AppController* app_controller = [[AppController alloc] init];
-@@ -119,6 +121,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
+@@ -117,6 +119,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
    chrome::BuildMainMenu(NSApp, app_controller,
                          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false);
    [app_controller mainMenuCreated];
@@ -161,7 +161,7 @@ index 0cb701b8772f5..ba6c84a530b64 100644
  
    ui::WarmScreenCapture();
  
-@@ -180,7 +183,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
+@@ -178,7 +181,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
  }
  
  void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
@@ -172,10 +172,10 @@ index 0cb701b8772f5..ba6c84a530b64 100644
 +#endif
  }
 diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
-index 4b3f602b9ee5a..2da7f9c2e029e 100644
+index 16341698899d7..37abd9d118002 100644
 --- chrome/browser/chrome_content_browser_client.cc
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -29,6 +29,7 @@
+@@ -30,6 +30,7 @@
  #include "base/values.h"
  #include "build/build_config.h"
  #include "build/chromeos_buildflags.h"
@@ -183,7 +183,7 @@ index 4b3f602b9ee5a..2da7f9c2e029e 100644
  #include "chrome/browser/accessibility/accessibility_labels_service.h"
  #include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
  #include "chrome/browser/after_startup_task_utils.h"
-@@ -1284,6 +1285,8 @@ bool IsTopChromeWebUIURL(const GURL& url) {
+@@ -1288,6 +1289,8 @@ bool IsTopChromeWebUIURL(const GURL& url) {
  }  // namespace
  
  ChromeContentBrowserClient::ChromeContentBrowserClient() {
@@ -192,7 +192,7 @@ index 4b3f602b9ee5a..2da7f9c2e029e 100644
  #if BUILDFLAG(ENABLE_PLUGINS)
    extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart);
  #endif
-@@ -1309,6 +1312,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
+@@ -1313,6 +1316,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
    extra_parts_.clear();
  }
  
@@ -204,7 +204,7 @@ index 4b3f602b9ee5a..2da7f9c2e029e 100644
  // static
  void ChromeContentBrowserClient::RegisterLocalStatePrefs(
      PrefRegistrySimple* registry) {
-@@ -3789,9 +3797,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
+@@ -3800,9 +3808,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
                            &search::HandleNewTabURLReverseRewrite);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -216,7 +216,7 @@ index 4b3f602b9ee5a..2da7f9c2e029e 100644
  }
  
  base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
-@@ -5433,7 +5443,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
+@@ -5460,7 +5470,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
        network_service);
  }
  
@@ -225,7 +225,7 @@ index 4b3f602b9ee5a..2da7f9c2e029e 100644
      content::BrowserContext* context,
      bool in_memory,
      const base::FilePath& relative_partition_path,
-@@ -5451,6 +5461,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
+@@ -5478,6 +5488,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
      network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
      network_context_params->accept_language = GetApplicationLocale();
    }
@@ -234,7 +234,7 @@ index 4b3f602b9ee5a..2da7f9c2e029e 100644
  }
  
  std::vector<base::FilePath>
-@@ -6322,10 +6334,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
+@@ -6353,10 +6365,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
    const auto now = base::TimeTicks::Now();
    const auto timeout = GetKeepaliveTimerTimeout(context);
    keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@@ -247,7 +247,7 @@ index 4b3f602b9ee5a..2da7f9c2e029e 100644
          FROM_HERE, keepalive_deadline_ - now,
          base::BindOnce(
              &ChromeContentBrowserClient::OnKeepaliveTimerFired,
-@@ -6344,7 +6356,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
+@@ -6375,7 +6387,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
    --num_keepalive_requests_;
    if (num_keepalive_requests_ == 0) {
      DVLOG(1) << "Stopping the keepalive timer";
@@ -257,7 +257,7 @@ index 4b3f602b9ee5a..2da7f9c2e029e 100644
      // This deletes the keep alive handle attached to the timer function and
      // unblock the shutdown sequence.
    }
-@@ -6452,7 +6465,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
+@@ -6494,7 +6507,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
    const auto now = base::TimeTicks::Now();
    const auto then = keepalive_deadline_;
    if (now < then) {
@@ -267,10 +267,10 @@ index 4b3f602b9ee5a..2da7f9c2e029e 100644
          base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired,
                         weak_factory_.GetWeakPtr(),
 diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
-index d9b8140ee7d94..b6c403c23f5d1 100644
+index b619ac0c32215..d8b5452113b9e 100644
 --- chrome/browser/chrome_content_browser_client.h
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -117,6 +117,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -118,6 +118,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
  
    ~ChromeContentBrowserClient() override;
  
@@ -279,7 +279,7 @@ index d9b8140ee7d94..b6c403c23f5d1 100644
    // TODO(https://crbug.com/787567): This file is about calls from content/ out
    // to chrome/ to get values or notify about events, but both of these
    // functions are from chrome/ to chrome/ and don't involve content/ at all.
-@@ -564,7 +566,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -567,7 +569,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
        override;
    void OnNetworkServiceCreated(
        network::mojom::NetworkService* network_service) override;
@@ -288,7 +288,7 @@ index d9b8140ee7d94..b6c403c23f5d1 100644
        content::BrowserContext* context,
        bool in_memory,
        const base::FilePath& relative_partition_path,
-@@ -922,7 +924,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -909,7 +911,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
  
  #if !BUILDFLAG(IS_ANDROID)
    uint64_t num_keepalive_requests_ = 0;
@@ -298,7 +298,7 @@ index d9b8140ee7d94..b6c403c23f5d1 100644
  #endif
  
 diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
-index d6c5b0148dec9..5151337d45bf0 100644
+index a748644cef16f..7ec056730fb70 100644
 --- chrome/browser/prefs/browser_prefs.cc
 +++ chrome/browser/prefs/browser_prefs.cc
 @@ -11,6 +11,7 @@
@@ -320,7 +320,7 @@ index d6c5b0148dec9..5151337d45bf0 100644
  #if BUILDFLAG(ENABLE_EXTENSIONS)
  #include "chrome/browser/accessibility/animation_policy_prefs.h"
  #include "chrome/browser/apps/platform_apps/shortcut_manager.h"
-@@ -1288,6 +1293,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1333,6 +1338,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    SessionDataService::RegisterProfilePrefs(registry);
  #endif
  

patch/patches/chrome_runtime_views.patch

@@ -1,8 +1,8 @@
 diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
-index 6e04b7de772c7..70da576aa5086 100644
+index c582ceb80e929..f121e3084389c 100644
 --- chrome/browser/ui/browser_command_controller.cc
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -382,8 +382,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -414,8 +414,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
    // CommandUpdaterDelegate and CommandUpdater declare this function so we
    // choose to not implement CommandUpdaterDelegate inside this class and
    // therefore command_updater_ doesn't have the delegate set).
@@ -14,7 +14,7 @@ index 6e04b7de772c7..70da576aa5086 100644
  
    // No commands are enabled if there is not yet any selected tab.
    // TODO(pkasting): It seems like we should not need this, because either
-@@ -398,6 +400,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -430,6 +432,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
    DCHECK(command_updater_.IsCommandEnabled(id))
        << "Invalid/disabled command " << id;
  
@@ -28,7 +28,7 @@ index 6e04b7de772c7..70da576aa5086 100644
    // The order of commands in this switch statement must match the function
    // declaration order in browser.h!
    switch (id) {
-@@ -1032,11 +1041,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
+@@ -1067,11 +1076,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
  // BrowserCommandController, private:
  
  bool BrowserCommandController::IsShowingMainUI() {
@@ -180,11 +180,11 @@ index 9bd586697dece..80ef1f08cb463 100644
    BrowserFrame(const BrowserFrame&) = delete;
    BrowserFrame& operator=(const BrowserFrame&) = delete;
 diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
-index 01615eb5b92ed..c96ffe8bb0283 100644
+index 9c9b99da5b015..2b76e15ea42da 100644
 --- chrome/browser/ui/views/frame/browser_view.cc
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -303,11 +303,10 @@ using content::WebContents;
+@@ -301,11 +301,10 @@ using content::NativeWebKeyboardEvent;
- using views::ColumnSet;
+ using content::WebContents;
  using web_modal::WebContentsModalDialogHost;
  
 -namespace {
@@ -198,7 +198,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
  // UMA histograms that record animation smoothness for tab loading animation.
-@@ -799,11 +798,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver {
+@@ -797,11 +796,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver {
  ///////////////////////////////////////////////////////////////////////////////
  // BrowserView, public:
  
@@ -222,7 +222,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
    SetShowIcon(
        ::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
  
-@@ -845,7 +855,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
+@@ -843,7 +853,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
    }
  
    browser_->tab_strip_model()->AddObserver(this);
@@ -230,7 +230,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
  
    // Top container holds tab strip region and toolbar and lives at the front of
    // the view hierarchy.
-@@ -888,8 +897,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
+@@ -886,8 +895,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
    contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
        devtools_web_view_, contents_web_view_));
  
@@ -248,7 +248,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
  
    contents_separator_ =
        top_container_->AddChildView(std::make_unique<ContentsSeparator>());
-@@ -1776,6 +1792,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
+@@ -1780,6 +1796,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
    if (immersive_mode_controller_->IsEnabled())
      return false;
  
@@ -257,7 +257,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
    return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
  }
  
-@@ -2995,7 +3013,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
+@@ -2993,7 +3011,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
  }
  
  void BrowserView::ReparentTopContainerForEndOfImmersive() {
@@ -267,7 +267,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
    top_container()->DestroyLayer();
    AddChildViewAt(top_container(), 0);
    EnsureFocusOrder();
-@@ -3532,8 +3551,10 @@ void BrowserView::Layout() {
+@@ -3530,8 +3549,10 @@ void BrowserView::Layout() {
  
    // TODO(jamescook): Why was this in the middle of layout code?
    toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@@ -280,7 +280,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
  
    // Some of the situations when the BrowserView is laid out are:
    // - Enter/exit immersive fullscreen mode.
-@@ -3599,6 +3620,11 @@ void BrowserView::AddedToWidget() {
+@@ -3597,6 +3618,11 @@ void BrowserView::AddedToWidget() {
    SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
  #endif
  
@@ -292,7 +292,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
    toolbar_->Init();
  
    // TODO(pbos): Manage this either inside SidePanel or the corresponding button
-@@ -3660,13 +3686,9 @@ void BrowserView::AddedToWidget() {
+@@ -3658,13 +3684,9 @@ void BrowserView::AddedToWidget() {
  
    EnsureFocusOrder();
  
@@ -308,7 +308,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
    using_native_frame_ = frame_->ShouldUseNativeFrame();
  
    MaybeInitializeWebUITabStrip();
-@@ -4074,7 +4096,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
+@@ -4072,7 +4094,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
    // Undo our anti-jankiness hacks and force a re-layout.
    in_process_fullscreen_ = false;
    ToolbarSizeChanged(false);
@@ -318,7 +318,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
  }
  
  bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
-@@ -4403,6 +4426,8 @@ Profile* BrowserView::GetProfile() {
+@@ -4387,6 +4410,8 @@ Profile* BrowserView::GetProfile() {
  }
  
  void BrowserView::UpdateUIForTabFullscreen() {
@@ -327,7 +327,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
    frame()->GetFrameView()->UpdateFullscreenTopUI();
  }
  
-@@ -4425,6 +4450,8 @@ void BrowserView::HideDownloadShelf() {
+@@ -4409,6 +4434,8 @@ void BrowserView::HideDownloadShelf() {
  }
  
  bool BrowserView::CanUserExitFullscreen() const {
@@ -337,7 +337,7 @@ index 01615eb5b92ed..c96ffe8bb0283 100644
  }
  
 diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
-index 70f50e6752091..b8be336cee0fa 100644
+index f4b503d7be34d..7e1926881fae7 100644
 --- chrome/browser/ui/views/frame/browser_view.h
 +++ chrome/browser/ui/views/frame/browser_view.h
 @@ -124,11 +124,16 @@ class BrowserView : public BrowserWindow,
@@ -357,7 +357,7 @@ index 70f50e6752091..b8be336cee0fa 100644
    void set_frame(BrowserFrame* frame) { frame_ = frame; }
    BrowserFrame* frame() const { return frame_; }
  
-@@ -736,6 +741,12 @@ class BrowserView : public BrowserWindow,
+@@ -731,6 +736,12 @@ class BrowserView : public BrowserWindow,
    void MaybeRestoreSideSearchStatePerWindow(
        const std::map<std::string, std::string>& extra_data) override;
  
@@ -414,7 +414,7 @@ index bc047256f110a..b6bc9dfc0eee5 100644
  
  ContentsWebView::~ContentsWebView() {
 diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
-index 7475765f4b514..25c59d942782b 100644
+index ef5cedd707e9b..cb9ba4119f318 100644
 --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
 +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
 @@ -551,33 +551,47 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
@@ -466,7 +466,7 @@ index 7475765f4b514..25c59d942782b 100644
  }
  
 diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
-index b5ba130e6ed00..cbe6e5744d689 100644
+index 8499344e764b1..61bb8becc9e82 100644
 --- chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ chrome/browser/ui/views/toolbar/toolbar_view.cc
 @@ -168,12 +168,13 @@ auto& GetViewCommandMap() {

patch/patches/component_build.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
-index 257f8f388c59b..12d96b30af4b2 100644
+index 1407ec64d33ea..c3ceb22baed12 100644
 --- content/browser/devtools/devtools_instrumentation.h
 +++ content/browser/devtools/devtools_instrumentation.h
 @@ -97,7 +97,7 @@ bool ApplyUserAgentMetadataOverrides(
@@ -68,7 +68,7 @@ index 57072bf1263ae..0a93446e4d21c 100644
  blink::mojom::V8CacheOptions GetV8CacheOptions();
  
 diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
-index 550eac059d57e..fe18a538dc7cf 100644
+index 3c8c64d8d4dc9..1f4d7fb698782 100644
 --- third_party/blink/renderer/controller/BUILD.gn
 +++ third_party/blink/renderer/controller/BUILD.gn
 @@ -32,6 +32,7 @@ component("controller") {

patch/patches/content_2015.patch

@@ -12,10 +12,10 @@ index b75e19e7946b0..a92a7da426081 100644
                        GetContentClient()->browser()->GetUserAgent());
      version.SetString("V8-Version", V8_VERSION_STRING);
 diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
-index a1da50db3adf3..30ceb9ff65325 100644
+index 2bf604ee300d9..ded4a09961381 100644
 --- content/browser/loader/navigation_url_loader_impl.cc
 +++ content/browser/loader/navigation_url_loader_impl.cc
-@@ -682,6 +682,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
+@@ -691,6 +691,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
            resource_request_->has_user_gesture, initiating_origin,
            initiator_document_.AsRenderFrameHostIfValid(), &loader_factory);
  
@@ -34,7 +34,7 @@ index a1da50db3adf3..30ceb9ff65325 100644
          factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
              std::move(loader_factory));
 diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
-index 7af8cfe6e57aa..559239ecc2c24 100644
+index 69bcd725d0f86..a8456b3e8a941 100644
 --- content/public/browser/content_browser_client.cc
 +++ content/public/browser/content_browser_client.cc
 @@ -9,7 +9,7 @@
@@ -46,7 +46,7 @@ index 7af8cfe6e57aa..559239ecc2c24 100644
  
  #include <utility>
  
-@@ -911,7 +911,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
+@@ -916,7 +916,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
  void ContentBrowserClient::OnNetworkServiceCreated(
      network::mojom::NetworkService* network_service) {}
  
@@ -55,7 +55,7 @@ index 7af8cfe6e57aa..559239ecc2c24 100644
      BrowserContext* context,
      bool in_memory,
      const base::FilePath& relative_partition_path,
-@@ -920,6 +920,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
+@@ -925,6 +925,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
          cert_verifier_creation_params) {
    network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
    network_context_params->accept_language = "en-us,en";
@@ -64,7 +64,7 @@ index 7af8cfe6e57aa..559239ecc2c24 100644
  
  std::vector<base::FilePath>
 diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
-index d2c0f46e1a413..0ddd3c0e8ba8c 100644
+index d0b7aed3162b8..c494e9618d9dc 100644
 --- content/public/browser/content_browser_client.h
 +++ content/public/browser/content_browser_client.h
 @@ -33,6 +33,7 @@
@@ -75,7 +75,7 @@ index d2c0f46e1a413..0ddd3c0e8ba8c 100644
  #include "content/public/common/alternative_error_page_override_info.mojom-forward.h"
  #include "content/public/common/page_visibility_state.h"
  #include "content/public/common/window_container_type.mojom-forward.h"
-@@ -1682,7 +1683,7 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1690,7 +1691,7 @@ class CONTENT_EXPORT ContentBrowserClient {
    //
    // If |relative_partition_path| is the empty string, it means this needs to
    // create the default NetworkContext for the BrowserContext.
@@ -84,7 +84,7 @@ index d2c0f46e1a413..0ddd3c0e8ba8c 100644
        BrowserContext* context,
        bool in_memory,
        const base::FilePath& relative_partition_path,
-@@ -1889,6 +1890,19 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1897,6 +1898,19 @@ class CONTENT_EXPORT ContentBrowserClient {
        RenderFrameHost* initiator_document,
        mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
  
@@ -104,7 +104,7 @@ index d2c0f46e1a413..0ddd3c0e8ba8c 100644
    // Creates an OverlayWindow to be used for video or document
    // Picture-in-Picture respectively. This window will house the content shown
    // when in Picture-in-Picture mode. This will return a new OverlayWindow.
-@@ -1950,6 +1964,10 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1958,6 +1972,10 @@ class CONTENT_EXPORT ContentBrowserClient {
    // Used as part of the user agent string.
    virtual std::string GetProduct();
  
@@ -116,10 +116,10 @@ index d2c0f46e1a413..0ddd3c0e8ba8c 100644
    // on blink::features::kUserAgentReduction. Content may cache this value.
    virtual std::string GetUserAgent();
 diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
-index eb8968c2a8610..143c3aaeda88e 100644
+index 1dfe162dc69f4..93ece5d24f60f 100644
 --- content/public/renderer/content_renderer_client.h
 +++ content/public/renderer/content_renderer_client.h
-@@ -88,6 +88,9 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -92,6 +92,9 @@ class CONTENT_EXPORT ContentRendererClient {
    // binding requests from RenderProcessHost::BindReceiver().
    virtual void ExposeInterfacesToBrowser(mojo::BinderMap* binders) {}
  
@@ -129,7 +129,7 @@ index eb8968c2a8610..143c3aaeda88e 100644
    // Notifies that a new RenderFrame has been created.
    virtual void RenderFrameCreated(RenderFrame* render_frame) {}
  
-@@ -298,6 +301,10 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -302,6 +305,10 @@ class CONTENT_EXPORT ContentRendererClient {
    // This method may invalidate the frame.
    virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
  
@@ -141,10 +141,10 @@ index eb8968c2a8610..143c3aaeda88e 100644
    // started.
    virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index f81f1104399a4..ac4f20120898e 100644
+index ab74207b348f2..5cdda5796723f 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
-@@ -657,6 +657,8 @@ void RenderThreadImpl::Init() {
+@@ -609,6 +609,8 @@ void RenderThreadImpl::Init() {
        GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
            blink::URLLoaderThrottleProviderType::kFrame);
  
@@ -154,10 +154,10 @@ index f81f1104399a4..ac4f20120898e 100644
        &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
  
 diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
-index 16322f245b514..5b2617d8cc84d 100644
+index 51ab896732604..8902f5d486ab9 100644
 --- content/renderer/renderer_blink_platform_impl.cc
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -1126,6 +1126,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
+@@ -1059,6 +1059,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
  
  //------------------------------------------------------------------------------
  
@@ -170,14 +170,14 @@ index 16322f245b514..5b2617d8cc84d 100644
 +
 +//------------------------------------------------------------------------------
 +
- mojo::SharedRemote<blink::mojom::CodeCacheHost>
+ std::unique_ptr<blink::WebV8ValueConverter>
- RendererBlinkPlatformImpl::GetCodeCacheHost() {
+ RendererBlinkPlatformImpl::CreateWebV8ValueConverter() {
-   base::AutoLock lock(code_cache_host_lock_);
+   return std::make_unique<V8ValueConverterImpl>();
 diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
-index 213b0b9c28974..616cbf555afe1 100644
+index 156fb6cda9c41..17ca9be1f7e91 100644
 --- content/renderer/renderer_blink_platform_impl.h
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -262,6 +262,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -243,6 +243,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
        blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) override;
    base::PlatformThreadId GetIOThreadId() const override;
  

patch/patches/content_main_654986.patch

@@ -105,7 +105,7 @@ index bb2d3e9911958..7af313040906e 100644
  }
  
 diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
-index d7f42873cbab5..b833bfd58e583 100644
+index 892ed9c633465..018b941845a58 100644
 --- content/app/content_main_runner_impl.cc
 +++ content/app/content_main_runner_impl.cc
 @@ -42,6 +42,7 @@
@@ -116,7 +116,7 @@ index d7f42873cbab5..b833bfd58e583 100644
  #include "base/time/time.h"
  #include "base/trace_event/trace_event.h"
  #include "build/build_config.h"
-@@ -1195,6 +1196,12 @@ void ContentMainRunnerImpl::Shutdown() {
+@@ -1218,6 +1219,12 @@ void ContentMainRunnerImpl::Shutdown() {
    is_shutdown_ = true;
  }
  

patch/patches/embedder_product_override.patch

@@ -1,5 +1,5 @@
 diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
-index 6e905c33c688c..2716d2943f1a9 100644
+index acd60381a6294..f9be70d2da75f 100644
 --- components/embedder_support/user_agent_utils.cc
 +++ components/embedder_support/user_agent_utils.cc
 @@ -15,6 +15,7 @@
@@ -10,10 +10,10 @@ index 6e905c33c688c..2716d2943f1a9 100644
  #include "components/embedder_support/pref_names.h"
  #include "components/embedder_support/switches.h"
  #include "components/policy/core/common/policy_pref_names.h"
-@@ -330,6 +331,12 @@ std::string GetMajorVersionForUserAgentString(
+@@ -344,6 +345,12 @@ std::string GetMajorVersionForUserAgentString(
- 
  std::string GetProductAndVersion(
-     ForceMajorVersionToMinorPosition force_major_to_minor) {
+     ForceMajorVersionToMinorPosition force_major_to_minor,
+     UserAgentReductionEnterprisePolicyState user_agent_reduction) {
 +  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 +  if (command_line->HasSwitch(switches::kUserAgentProductAndVersion)) {
 +    return command_line->GetSwitchValueASCII(
@@ -22,4 +22,4 @@ index 6e905c33c688c..2716d2943f1a9 100644
 +
    if (ShouldForceMajorVersionToMinorPosition(force_major_to_minor)) {
      // Force major version to 99 and major version to minor version position.
-     if (base::FeatureList::IsEnabled(
+     if (ShouldReduceUserAgentMinorVersion(user_agent_reduction)) {

patch/patches/extensions_1947.patch

@@ -60,7 +60,7 @@ index 2f5f7a7645103..9ab6fc1d4a654 100644
    std::unique_ptr<StreamContainer> stream_container(
        new StreamContainer(tab_id, embedded, handler_url, extension_id,
 diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
-index 045808bde7362..0e879d052506e 100644
+index 70279e6b632ad..7d6b662e51957 100644
 --- extensions/browser/extension_host.cc
 +++ extensions/browser/extension_host.cc
 @@ -58,11 +58,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@@ -76,7 +76,7 @@ index 045808bde7362..0e879d052506e 100644
    host_contents_->SetDelegate(this);
 -  SetViewType(host_contents_.get(), host_type);
 +  SetViewType(host_contents_, host_type);
-   main_frame_host_ = host_contents_->GetMainFrame();
+   main_frame_host_ = host_contents_->GetPrimaryMainFrame();
  
    // Listen for when an extension is unloaded from the same profile, as it may
 @@ -77,6 +78,44 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@@ -161,7 +161,7 @@ index dd22bbc07fb52..c695ece6b1a47 100644
    // A pointer to the current or speculative main frame in `host_contents_`. We
    // can't access this frame through the `host_contents_` directly as it does
 diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
-index 0687fb5788120..db80a9ec293d4 100644
+index f87cf6d3bb4b6..bd2f3b576b004 100644
 --- extensions/browser/extensions_browser_client.h
 +++ extensions/browser/extensions_browser_client.h
 @@ -31,6 +31,7 @@
@@ -180,7 +180,7 @@ index 0687fb5788120..db80a9ec293d4 100644
  class ExtensionHostDelegate;
  class ExtensionSet;
  class ExtensionSystem;
-@@ -214,6 +216,14 @@ class ExtensionsBrowserClient {
+@@ -219,6 +221,14 @@ class ExtensionsBrowserClient {
    virtual std::unique_ptr<ExtensionHostDelegate>
    CreateExtensionHostDelegate() = 0;
  
@@ -196,10 +196,10 @@ index 0687fb5788120..db80a9ec293d4 100644
    // once each time the extensions system is loaded per browser_context. The
    // implementation may wish to use the BrowserContext to record the current
 diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
-index 13b1fcb8c2193..9ffbea0ac061e 100644
+index 4d09fbd93cd97..e6bc21a1adf49 100644
 --- extensions/browser/process_manager.cc
 +++ extensions/browser/process_manager.cc
-@@ -392,9 +392,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
+@@ -393,9 +393,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
      return true;  // TODO(kalman): return false here? It might break things...
  
    DVLOG(1) << "CreateBackgroundHost " << extension->id();

patch/patches/gn_config.patch

@@ -12,7 +12,7 @@ index 7d538f812d72e..9eec79395aeec 100644
        # https://crbug.com/474506.
        "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index 3fb396df0a458..2e9dbe0a18a1b 100644
+index b9b09ede17b56..b687818eb9287 100644
 --- BUILD.gn
 +++ BUILD.gn
 @@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@@ -80,7 +80,7 @@ index 839144aa1e9bd..29c8ab32398a7 100644
 +_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
 +
 diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
-index 933488c024814..44893a5e98746 100644
+index 040475bee62f4..47d7ca4ea32da 100644
 --- chrome/chrome_paks.gni
 +++ chrome/chrome_paks.gni
 @@ -5,6 +5,7 @@
@@ -91,7 +91,7 @@ index 933488c024814..44893a5e98746 100644
  import("//chrome/browser/buildflags.gni")
  import("//chrome/common/features.gni")
  import("//chromeos/components/chromebox_for_meetings/buildflags/buildflags.gni")
-@@ -76,6 +77,10 @@ template("chrome_repack_percent") {
+@@ -74,6 +75,10 @@ template("chrome_repack_percent") {
          "//ui/chromeos/resources",
        ]
      }

patch/patches/gritsettings.patch

@@ -1,8 +1,8 @@
 diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
-index 31f80388a143f..15f38c9b0e511 100644
+index 70a1901dc65dc..06656ee356527 100644
 --- tools/gritsettings/resource_ids.spec
 +++ tools/gritsettings/resource_ids.spec
-@@ -962,6 +962,15 @@
+@@ -958,6 +958,15 @@
    # END "everything else" section.
    # Everything but chrome/, components/, content/, and ios/
  

patch/patches/linux_assets_path_1936.patch

@@ -1,8 +1,8 @@
 diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc
-index b2b29e715d6e5..fc5ac660069ec 100644
+index 16d838b710d4f..206d29a01ffb9 100644
 --- content/browser/child_process_launcher_helper_linux.cc
 +++ content/browser/child_process_launcher_helper_linux.cc
-@@ -168,7 +168,7 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
+@@ -172,7 +172,7 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
  base::File OpenFileToShare(const base::FilePath& path,
                             base::MemoryMappedFile::Region* region) {
    base::FilePath exe_dir;
@@ -25,10 +25,10 @@ index e79a6e0b31091..9626ec1b9a922 100644
      if (base::PathExists(sandbox_candidate))
        sandbox_binary = sandbox_candidate;
 diff --git ui/ozone/common/egl_util.cc ui/ozone/common/egl_util.cc
-index 9ebf5d4d121a8..8783a6d2cc297 100644
+index 75c59f935976e..c0b7601ceb987 100644
 --- ui/ozone/common/egl_util.cc
 +++ ui/ozone/common/egl_util.cc
-@@ -138,7 +138,7 @@ bool LoadDefaultEGLGLES2Bindings(
+@@ -127,7 +127,7 @@ bool LoadDefaultEGLGLES2Bindings(
    if (implementation.gl == gl::kGLImplementationEGLANGLE) {
      base::FilePath module_path;
  #if !BUILDFLAG(IS_FUCHSIA)

patch/patches/linux_bluetooth_1319006.patch

@@ -1,5 +1,5 @@
 diff --git device/bluetooth/BUILD.gn device/bluetooth/BUILD.gn
-index 337047a678021..ae7a56d9cf564 100644
+index cff62632e8b48..7213089279251 100644
 --- device/bluetooth/BUILD.gn
 +++ device/bluetooth/BUILD.gn
 @@ -45,13 +45,6 @@ source_set("deprecated_experimental_mojo") {

patch/patches/linux_ui_ozone.patch

@@ -1,8 +1,8 @@
 diff --git ui/ozone/BUILD.gn ui/ozone/BUILD.gn
-index bee32267d70ee..8975d1e77858b 100644
+index b123f6093eb5d..64e4fc0fba4b5 100644
 --- ui/ozone/BUILD.gn
 +++ ui/ozone/BUILD.gn
-@@ -401,6 +401,8 @@ action("generate_test_support_constructor_list") {
+@@ -396,6 +396,8 @@ action("generate_test_support_constructor_list") {
    ]
  
    deps = [ ":generate_ozone_platform_list" ]

patch/patches/mac_gpu.patch

@@ -1,8 +1,8 @@
 diff --git ui/gl/init/gl_initializer_mac.cc ui/gl/init/gl_initializer_mac.cc
-index b1fbd1fedf16f..42948953fbac5 100644
+index fa97713916bf8..1b644227abe74 100644
 --- ui/gl/init/gl_initializer_mac.cc
 +++ ui/gl/init/gl_initializer_mac.cc
-@@ -46,11 +46,8 @@ bool InitializeOneOffForSandbox() {
+@@ -47,11 +47,8 @@ bool InitializeOneOffForSandbox() {
    // GPU-related stuff is very slow without this, probably because
    // the sandbox prevents loading graphics drivers or some such.
    std::vector<CGLPixelFormatAttribute> attribs;

patch/patches/message_loop.patch

@@ -43,10 +43,10 @@ index b7e9d215c2039..57816ea1c8b81 100644
    current_->RemoveDestructionObserver(destruction_observer);
  }
 diff --git base/task/current_thread.h base/task/current_thread.h
-index f82025cca1d17..6feb6ac241895 100644
+index 13dc0cdede8f7..4c4a85848a93a 100644
 --- base/task/current_thread.h
 +++ base/task/current_thread.h
-@@ -130,6 +130,12 @@ class BASE_EXPORT CurrentThread {
+@@ -131,6 +131,12 @@ class BASE_EXPORT CurrentThread {
    // to run. There can only be one OnNextIdleCallback at a time.
    void RegisterOnNextIdleCallback(OnceClosure on_next_idle_callback);
  
@@ -59,10 +59,10 @@ index f82025cca1d17..6feb6ac241895 100644
    // Enables nested task processing in scope of an upcoming native message loop.
    // Some unwanted message loops may occur when using common controls or printer
    // functions. Hence, nested task processing is disabled by default to avoid
-@@ -195,6 +201,13 @@ class BASE_EXPORT CurrentThread {
+@@ -196,6 +202,13 @@ class BASE_EXPORT CurrentThread {
    friend class web::WebTaskEnvironment;
  
-   sequence_manager::internal::SequenceManagerImpl* current_;
+   raw_ptr<sequence_manager::internal::SequenceManagerImpl> current_;
 +
 +#if BUILDFLAG(IS_WIN)
 + private:

patch/patches/message_pump_mac_2495.patch

@@ -1,8 +1,8 @@
 diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
-index a4f7d2429ce6c..2291b46582239 100644
+index 8ce36eaa64a86..b90c66c1c826c 100644
 --- base/message_loop/message_pump_mac.mm
 +++ base/message_loop/message_pump_mac.mm
-@@ -662,7 +662,8 @@ void MessagePumpUIApplication::Detach() {
+@@ -748,7 +748,8 @@ void MessagePumpUIApplication::Detach() {
  #else
  
  ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
@@ -12,7 +12,7 @@ index a4f7d2429ce6c..2291b46582239 100644
    DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask());
    // Pumping events in private runloop modes is known to interact badly with
    // app modal windows like NSAlert.
-@@ -672,7 +673,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
+@@ -758,7 +759,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
  }
  
  ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() {

patch/patches/mime_handler_view_guest_1565_2727.patch

@@ -12,7 +12,7 @@ index 17f203b11ce39..0a5277b686d61 100644
    virtual ~WebContentsView() = default;
  
 diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index b652f1f30ce70..6b5f004385803 100644
+index aef9d1a79fcea..015206dd88756 100644
 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 @@ -224,6 +224,8 @@ void MimeHandlerViewGuest::CreateWebContents(

patch/patches/net_cookie_flags.patch

@@ -1,19 +1,20 @@
 diff --git net/base/load_flags_list.h net/base/load_flags_list.h
-index 96d1a51ec1078..e8120a818b1f2 100644
+index 6466deac2671e..053ca5c7e55ae 100644
 --- net/base/load_flags_list.h
 +++ net/base/load_flags_list.h
-@@ -101,3 +101,6 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 15)
+@@ -110,3 +110,6 @@ LOAD_FLAG(CAN_USE_RESTRICTED_PREFETCH, 1 << 16)
- // is considered privileged, and therefore this flag must only be set from a
+ //
- // trusted process.
+ // Cannot be used together with BYPASS_CACHE, ONLY_FROM_CACHE, or DISABLE_CACHE.
- LOAD_FLAG(CAN_USE_RESTRICTED_PREFETCH, 1 << 16)
+ LOAD_FLAG(USE_SINGLE_KEYED_CACHE, 1 << 17)
 +
 +// This load will not send any cookies. For CEF usage.
-+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17)
++LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 18)
+\ No newline at end of file
 diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
-index 2db8e1bc9e5bb..680db4669dfe7 100644
+index 1975492c29ae0..0ec7ddefe932b 100644
 --- net/url_request/url_request_http_job.cc
 +++ net/url_request/url_request_http_job.cc
-@@ -1771,7 +1771,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
+@@ -1770,7 +1770,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
    // Read cookies whenever allow_credentials() is true, even if the PrivacyMode
    // is being overridden by NetworkDelegate and will eventually block them, as
    // blocked cookies still need to be logged in that case.

patch/patches/osr_fling_2745.patch

@@ -41,10 +41,10 @@ index cc4b13a7b9c67..84f3b9ed7cf49 100644
  
  }  // namespace content
 diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
-index 730ac0aaf36da..97e7e096f2473 100644
+index 18133ca758533..b7b26d5e457e3 100644
 --- content/browser/renderer_host/render_widget_host_impl.cc
 +++ content/browser/renderer_host/render_widget_host_impl.cc
-@@ -3120,6 +3120,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
+@@ -3114,6 +3114,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
        GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
  }
  
@@ -57,7 +57,7 @@ index 730ac0aaf36da..97e7e096f2473 100644
      const WebInputEvent& event) {
    if ((base::FeatureList::IsEnabled(
 diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
-index 2ae96b8164271..139bc55b0f3db 100644
+index 65297e78ee11f..589fbdae61bb5 100644
 --- content/browser/renderer_host/render_widget_host_impl.h
 +++ content/browser/renderer_host/render_widget_host_impl.h
 @@ -779,6 +779,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl

patch/patches/print_preview_123.patch

@@ -34,7 +34,7 @@ index 65a54420ca60e..27adcf4e827a4 100644
  }
  
 diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc
-index d656ccabc3899..a4b7ce6a7dcd8 100644
+index 01df55a728098..0c11458c9a5bb 100644
 --- chrome/browser/printing/print_preview_dialog_controller.cc
 +++ chrome/browser/printing/print_preview_dialog_controller.cc
 @@ -15,6 +15,7 @@
@@ -46,26 +46,10 @@ index d656ccabc3899..a4b7ce6a7dcd8 100644
  #include "chrome/browser/printing/print_view_manager.h"
  #include "chrome/browser/task_manager/web_contents_tags.h"
 diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
-index e74a2d0858c18..fbf05b7814c46 100644
+index e665eb42fad5f..6aefc4f3f4ca6 100644
 --- chrome/browser/printing/print_view_manager_base.cc
 +++ chrome/browser/printing/print_view_manager_base.cc
-@@ -223,12 +223,12 @@ void UpdatePrintSettingsOnIO(
+@@ -610,13 +610,14 @@ void PrintViewManagerBase::UpdatePrintSettings(
-     mojom::PrintManagerHost::UpdatePrintSettingsCallback callback,
-     scoped_refptr<PrintQueriesQueue> queue,
-     base::Value::Dict job_settings,
--    base::WeakPtr<PrintViewManagerBase> manager) {
-+    base::WeakPtr<PrintViewManagerBase> manager,
-+    const content::GlobalRenderFrameHostId& global_id) {
-   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-   std::unique_ptr<PrinterQuery> printer_query = queue->PopPrinterQuery(cookie);
-   if (!printer_query) {
--    printer_query =
--        queue->CreatePrinterQuery(content::GlobalRenderFrameHostId());
-+    printer_query = queue->CreatePrinterQuery(global_id);
-   }
-   auto* printer_query_ptr = printer_query.get();
-   printer_query_ptr->SetSettings(
-@@ -698,6 +698,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
        job_settings.Set(kSettingRasterizePdfDpi, value);
    }
  
@@ -73,16 +57,14 @@ index e74a2d0858c18..fbf05b7814c46 100644
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
                       weak_ptr_factory_.GetWeakPtr(), std::move(callback));
-@@ -705,7 +706,8 @@ void PrintViewManagerBase::UpdatePrintSettings(
+   std::unique_ptr<PrinterQuery> printer_query = queue_->PopPrinterQuery(cookie);
-       FROM_HERE,
+   if (!printer_query) {
-       base::BindOnce(&UpdatePrintSettingsOnIO, cookie,
+     printer_query =
-                      std::move(callback_wrapper), queue_,
+-        queue_->CreatePrinterQuery(content::GlobalRenderFrameHostId());
--                     std::move(job_settings), weak_ptr_factory_.GetWeakPtr()));
++        queue_->CreatePrinterQuery(render_frame_host->GetGlobalId());
-+                     std::move(job_settings), weak_ptr_factory_.GetWeakPtr(),
+   }
-+                     render_frame_host->GetGlobalId()));
+   auto* printer_query_ptr = printer_query.get();
- }
+   printer_query_ptr->SetSettings(
- #endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
- 
 diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h
 index 746df417a23f7..dddf164ce6c4d 100644
 --- chrome/browser/printing/print_view_manager_base.h
@@ -136,7 +118,7 @@ index f6098966f5b34..da78289b66155 100644
  }
  
 diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
-index 70a13e9c0c5e4..1eb0e9c8faa62 100644
+index 2ac094eb3a9be..0656515221072 100644
 --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
 +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
 @@ -22,6 +22,7 @@
@@ -148,7 +130,7 @@ index 70a13e9c0c5e4..1eb0e9c8faa62 100644
  #include "chrome/browser/pdf/pdf_extension_util.h"
  #include "chrome/browser/printing/background_printing_manager.h"
 @@ -96,6 +97,13 @@ const char16_t kBasicPrintShortcut[] = u"\u0028\u21e7\u2318\u0050\u0029";
- const char16_t kBasicPrintShortcut[] = u"(Ctrl+Shift+P)";
+ const char16_t kBasicPrintShortcut[] = u"(Ctrl+Alt+P)";
  #endif
  
 +const char16_t* GetBasicPrintShortcut() {
@@ -161,7 +143,7 @@ index 70a13e9c0c5e4..1eb0e9c8faa62 100644
  constexpr char kInvalidArgsForDidStartPreview[] =
      "Invalid arguments for DidStartPreview";
  constexpr char kInvalidPageNumberForDidPreviewPage[] =
-@@ -326,7 +334,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
+@@ -324,7 +332,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
    source->AddLocalizedStrings(kLocalizedStrings);
  
  #if !BUILDFLAG(IS_CHROMEOS)

patch/patches/printing_context_2196.patch

@@ -1,11 +1,11 @@
 diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
-index ee713c5686d4e..67eaba056cbed 100644
+index d9ae000f13485..ba53cde62f3ac 100644
 --- chrome/browser/printing/print_job_worker.cc
 +++ chrome/browser/printing/print_job_worker.cc
 @@ -131,6 +131,7 @@ PrintJobWorker::PrintJobWorker(content::GlobalRenderFrameHostId rfh_id)
                                    ShouldPrintingContextSkipSystemCalls())),
        thread_("Printing_Worker") {
-   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 +  printing_context_->set_render_ids(rfh_id.child_id, rfh_id.frame_routing_id);
  }
  

patch/patches/printing_pdf_3047.patch

@@ -1,8 +1,8 @@
 diff --git chrome/browser/printing/print_view_manager_common.cc chrome/browser/printing/print_view_manager_common.cc
-index fe86f14eeacb8..41858f4357f8e 100644
+index 3ab701aaad754..4bb32940701c5 100644
 --- chrome/browser/printing/print_view_manager_common.cc
 +++ chrome/browser/printing/print_view_manager_common.cc
-@@ -53,6 +53,8 @@ bool StoreFullPagePlugin(content::WebContents** result,
+@@ -44,6 +44,8 @@ bool StoreFullPagePlugin(content::WebContents** result,
  }
  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
@@ -11,8 +11,8 @@ index fe86f14eeacb8..41858f4357f8e 100644
  // Pick the right RenderFrameHost based on the WebContents.
  content::RenderFrameHost* GetRenderFrameHostToUse(
      content::WebContents* contents) {
-@@ -68,8 +70,6 @@ content::RenderFrameHost* GetRenderFrameHostToUse(
+@@ -57,8 +59,6 @@ content::RenderFrameHost* GetRenderFrameHostToUse(
-   return contents->GetMainFrame();
+   return GetFrameToPrint(contents);
  }
  
 -}  // namespace

patch/patches/renderer_host_1070713.patch

@@ -1,8 +1,8 @@
 diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
-index dcd62488bd523..aec680b370a1c 100644
+index 1f6d9be104324..f377ecfac504c 100644
 --- content/browser/renderer_host/render_view_host_impl.cc
 +++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -658,6 +658,8 @@ bool RenderViewHostImpl::IsRenderViewLive() const {
+@@ -662,6 +662,8 @@ bool RenderViewHostImpl::IsRenderViewLive() const {
  }
  
  void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {

patch/patches/resource_bundle_2512.patch

@@ -1,8 +1,8 @@
 diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
-index 2888b12d19d4b..c11ee9978a69e 100644
+index 2222f4adfbe86..3d93ad0e45608 100644
 --- ui/base/resource/resource_bundle.cc
 +++ ui/base/resource/resource_bundle.cc
-@@ -906,6 +906,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
+@@ -908,6 +908,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
      : delegate_(delegate),
        locale_resources_data_lock_(new base::Lock),
        max_scale_factor_(k100Percent) {
@@ -15,7 +15,7 @@ index 2888b12d19d4b..c11ee9978a69e 100644
    mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
        switches::kMangleLocalizedStrings);
  }
-@@ -915,6 +921,11 @@ ResourceBundle::~ResourceBundle() {
+@@ -917,6 +923,11 @@ ResourceBundle::~ResourceBundle() {
    UnloadLocaleResources();
  }
  

patch/patches/rwh_background_color_1984.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
-index dc52cc54d2a60..331c1ff446498 100644
+index 870cdf73fd5ee..5714d4912b84e 100644
 --- content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -5,6 +5,7 @@
@@ -27,7 +27,7 @@ index dc52cc54d2a60..331c1ff446498 100644
  }
  
  absl::optional<DisplayFeature> RenderWidgetHostViewAura::GetDisplayFeature() {
-@@ -2220,6 +2223,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
+@@ -2221,6 +2224,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
    // This needs to happen only after |window_| has been initialized using
    // Init(), because it needs to have the layer.
    window_->SetEmbedFrameSinkId(frame_sink_id_);

patch/patches/services_network_2622.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
-index 7ac922c8fd84d..0f41d66ded494 100644
+index 122c7aac0fe18..f8017f174292d 100644
 --- chrome/browser/net/profile_network_context_service.cc
 +++ chrome/browser/net/profile_network_context_service.cc
 @@ -22,6 +22,7 @@
@@ -10,7 +10,7 @@ index 7ac922c8fd84d..0f41d66ded494 100644
  #include "chrome/browser/browser_features.h"
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/content_settings/cookie_settings_factory.h"
-@@ -741,7 +742,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
+@@ -745,7 +746,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
  
    // Configure on-disk storage for non-OTR profiles. OTR profiles just use
    // default behavior (in memory storage, default sizes).
@@ -31,7 +31,7 @@ index 7ac922c8fd84d..0f41d66ded494 100644
      PrefService* local_state = g_browser_process->local_state();
      // Configure the HTTP cache path and size.
      base::FilePath base_cache_path;
-@@ -754,7 +767,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
+@@ -758,7 +771,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
          base_cache_path.Append(chrome::kCacheDirname);
      network_context_params->http_cache_max_size =
          local_state->GetInteger(prefs::kDiskCacheSize);
@@ -42,10 +42,10 @@ index 7ac922c8fd84d..0f41d66ded494 100644
          ::network::mojom::NetworkContextFilePaths::New();
  
 diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
-index 5f54517f7a690..19aec446150de 100644
+index 644e5fc13712a..51e6c0c24ff30 100644
 --- net/cookies/cookie_monster.cc
 +++ net/cookies/cookie_monster.cc
-@@ -547,6 +547,25 @@ void CookieMonster::SetCookieableSchemes(
+@@ -540,6 +540,25 @@ void CookieMonster::SetCookieableSchemes(
    MaybeRunCookieCallback(std::move(callback), true);
  }
  
@@ -72,7 +72,7 @@ index 5f54517f7a690..19aec446150de 100644
  void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
    DCHECK(thread_checker_.CalledOnValidThread());
 diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
-index 659a346d80d58..af8c88c5671aa 100644
+index d2cfebf4900dd..c908d17d881e9 100644
 --- net/cookies/cookie_monster.h
 +++ net/cookies/cookie_monster.h
 @@ -209,6 +209,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@@ -101,10 +101,10 @@ index c143a7381df95..da14e2b0b1c81 100644
    // reset to null.
    const CookieAccessDelegate* cookie_access_delegate() const {
 diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
-index 07c1fb882adc8..a1477e43e9ae4 100644
+index 77c0984d364c6..df7ff7d7355b5 100644
 --- services/network/cookie_manager.cc
 +++ services/network/cookie_manager.cc
-@@ -368,14 +368,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
+@@ -387,14 +387,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
  void CookieManager::AllowFileSchemeCookies(
      bool allow,
      AllowFileSchemeCookiesCallback callback) {
@@ -123,10 +123,10 @@ index 07c1fb882adc8..a1477e43e9ae4 100644
  
  void CookieManager::SetForceKeepSessionState() {
 diff --git services/network/network_context.cc services/network/network_context.cc
-index 812cfebfbe4f9..36579b8a53d06 100644
+index 89bbba4956965..1b12c7a0c0e25 100644
 --- services/network/network_context.cc
 +++ services/network/network_context.cc
-@@ -2362,17 +2362,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2367,17 +2367,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          network_service_->network_quality_estimator());
    }
  
@@ -134,13 +134,13 @@ index 812cfebfbe4f9..36579b8a53d06 100644
 -    std::unique_ptr<net::CookieMonster> cookie_store =
 -        std::make_unique<net::CookieMonster>(
 -            session_cleanup_cookie_store.get(), net_log,
--            network_service_->first_party_sets_manager()->is_enabled());
+-            first_party_sets_access_delegate_.is_enabled());
 -    if (params_->persist_session_cookies)
 -      cookie_store->SetPersistSessionCookies(true);
 +  std::unique_ptr<net::CookieMonster> cookie_store =
 +      std::make_unique<net::CookieMonster>(
 +          session_cleanup_cookie_store.get(), net_log,
-+          network_service_->first_party_sets_manager()->is_enabled());
++          first_party_sets_access_delegate_.is_enabled());
 +  if (session_cleanup_cookie_store && params_->persist_session_cookies)
 +    cookie_store->SetPersistSessionCookies(true);
  
@@ -157,10 +157,10 @@ index 812cfebfbe4f9..36579b8a53d06 100644
      trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
  
 diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
-index cc3f99007db46..8ef96d9b6effa 100644
+index cd28ac0510e13..06a9dd17e776d 100644
 --- services/network/public/mojom/network_context.mojom
 +++ services/network/public/mojom/network_context.mojom
-@@ -335,6 +335,9 @@ struct NetworkContextParams {
+@@ -336,6 +336,9 @@ struct NetworkContextParams {
    // cookies. Otherwise it should be false.
    bool persist_session_cookies = false;
  

patch/patches/services_network_2718.patch

@@ -1,5 +1,5 @@
 diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
-index d6499670d3559..e5df71a345eed 100644
+index 3d3a6a0fb49ab..9a652564b85ee 100644
 --- content/browser/storage_partition_impl.cc
 +++ content/browser/storage_partition_impl.cc
 @@ -495,10 +495,6 @@ class LoginHandlerDelegate {
@@ -26,7 +26,7 @@ index d6499670d3559..e5df71a345eed 100644
    new LoginHandlerDelegate(
        std::move(auth_challenge_responder), std::move(web_contents_getter),
        auth_info, is_request_for_primary_main_frame, process_id, request_id, url,
-@@ -2790,8 +2780,12 @@ void StoragePartitionImpl::GetQuotaSettings(
+@@ -2807,8 +2797,12 @@ void StoragePartitionImpl::GetQuotaSettings(
      return;
    }
  
@@ -40,7 +40,7 @@ index d6499670d3559..e5df71a345eed 100644
        storage::GetDefaultDeviceInfoHelper(), std::move(callback));
  }
  
-@@ -2801,9 +2795,12 @@ void StoragePartitionImpl::InitNetworkContext() {
+@@ -2818,9 +2812,12 @@ void StoragePartitionImpl::InitNetworkContext() {
    cert_verifier::mojom::CertVerifierCreationParamsPtr
        cert_verifier_creation_params =
            cert_verifier::mojom::CertVerifierCreationParams::New();

patch/patches/set_resize_background_color.patch

@@ -1,9 +1,9 @@
 diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc
-index a87b20d3282a8..da0e84c73b36e 100644
+index 3a3f6e1af5a1e..bbbc69a5c84d3 100644
 --- ui/views/controls/webview/webview.cc
 +++ ui/views/controls/webview/webview.cc
-@@ -142,6 +142,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size,
+@@ -143,6 +143,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size,
-     MaybeEnableAutoResize(web_contents()->GetMainFrame());
+     MaybeEnableAutoResize(web_contents()->GetPrimaryMainFrame());
  }
  
 +void WebView::SetResizeBackgroundColor(SkColor resize_background_color) {

patch/patches/storage_incognito_2289.patch

@@ -1,8 +1,8 @@
 diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
-index 7dead74261c3a..9354249366be5 100644
+index 1beba57fbb164..448fbcb006e32 100644
 --- content/browser/blob_storage/chrome_blob_storage_context.cc
 +++ content/browser/blob_storage/chrome_blob_storage_context.cc
-@@ -120,7 +120,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
+@@ -115,7 +115,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
  
      // If we're not incognito mode, schedule all of our file tasks to enable
      // disk on the storage context.
@@ -13,10 +13,10 @@ index 7dead74261c3a..9354249366be5 100644
            {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
             base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
 diff --git content/browser/browser_context.cc content/browser/browser_context.cc
-index c8044baa920f3..c5a8ab77f1fe7 100644
+index 06b34e105411d..59b704c0d88a8 100644
 --- content/browser/browser_context.cc
 +++ content/browser/browser_context.cc
-@@ -129,7 +129,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
+@@ -130,7 +130,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
  StoragePartition* BrowserContext::GetStoragePartition(
      const StoragePartitionConfig& storage_partition_config,
      bool can_create) {
@@ -25,7 +25,7 @@ index c8044baa920f3..c5a8ab77f1fe7 100644
      // An off the record profile MUST only use in memory storage partitions.
      CHECK(storage_partition_config.in_memory());
    }
-@@ -360,7 +360,8 @@ BrowserContext::CreateVideoDecodePerfHistory() {
+@@ -365,7 +365,8 @@ BrowserContext::CreateVideoDecodePerfHistory() {
    const bool kUseInMemoryDBDefault = false;
    bool use_in_memory_db = base::GetFieldTrialParamByFeatureAsBool(
        media::kMediaCapabilitiesWithParameters, kUseInMemoryDBParamName,

patch/patches/views_1749_2102_3330.patch

@@ -119,7 +119,7 @@ index 7de6bdd643ad1..90994f096a0e0 100644
    friend class test::InkDropHostTestApi;
  
 diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
-index c443bf1a2b7e3..541dfb7ed3a02 100644
+index 2e89db6bd02de..e55d438ace669 100644
 --- ui/views/controls/button/label_button.cc
 +++ ui/views/controls/button/label_button.cc
 @@ -508,6 +508,12 @@ void LabelButton::OnThemeChanged() {
@@ -136,7 +136,7 @@ index c443bf1a2b7e3..541dfb7ed3a02 100644
    Button::StateChanged(old_state);
    ResetLabelEnabledColor();
 diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
-index 75d1292ce4d49..e22a73e3771c4 100644
+index 4f173056ba875..7b746c84c63cf 100644
 --- ui/views/controls/button/label_button.h
 +++ ui/views/controls/button/label_button.h
 @@ -133,6 +133,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
@@ -150,10 +150,10 @@ index 75d1292ce4d49..e22a73e3771c4 100644
    ImageView* image() const { return image_; }
    Label* label() const { return label_; }
 diff --git ui/views/controls/label.cc ui/views/controls/label.cc
-index 4353a8124bb78..d19ed60206824 100644
+index c748b7ed1a958..c93898b041aff 100644
 --- ui/views/controls/label.cc
 +++ ui/views/controls/label.cc
-@@ -53,12 +53,27 @@ enum LabelPropertyKey {
+@@ -52,12 +52,27 @@ enum LabelPropertyKey {
    kLabelLineHeight,
    kLabelObscured,
    kLabelAllowCharacterBreak,
@@ -181,7 +181,7 @@ index 4353a8124bb78..d19ed60206824 100644
  }  // namespace
  
  namespace views {
-@@ -426,6 +441,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
+@@ -425,6 +440,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
    OnPropertyChanged(&elide_behavior_, kPropertyEffectsPreferredSizeChanged);
  }
  
@@ -197,7 +197,7 @@ index 4353a8124bb78..d19ed60206824 100644
  std::u16string Label::GetTooltipText() const {
    return tooltip_text_;
  }
-@@ -722,6 +746,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
+@@ -721,6 +745,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
        render_text->SelectRange(stored_selection_range_);
    }
  
@@ -215,7 +215,7 @@ index 4353a8124bb78..d19ed60206824 100644
  }
  
 diff --git ui/views/controls/label.h ui/views/controls/label.h
-index 109e19fbcaa08..3568917abe6bb 100644
+index 912c7d20eb07c..26beda47cd4ce 100644
 --- ui/views/controls/label.h
 +++ ui/views/controls/label.h
 @@ -234,6 +234,10 @@ class VIEWS_EXPORT Label : public View,
@@ -641,7 +641,7 @@ index 4bec3df3f3d32..0ebb3b2ac73df 100644
    base::TimeTicks GetClosingEventTime() const override;
  
 diff --git ui/views/controls/menu/menu_runner_impl_cocoa.h ui/views/controls/menu/menu_runner_impl_cocoa.h
-index b24b07fb16b86..50859104e909c 100644
+index 27bc7381ba22c..5d13b85fcc5cf 100644
 --- ui/views/controls/menu/menu_runner_impl_cocoa.h
 +++ ui/views/controls/menu/menu_runner_impl_cocoa.h
 @@ -37,7 +37,8 @@ class VIEWS_EXPORT MenuRunnerImplCocoa : public MenuRunnerImplInterface {
@@ -655,10 +655,10 @@ index b24b07fb16b86..50859104e909c 100644
    base::TimeTicks GetClosingEventTime() const override;
  
 diff --git ui/views/controls/menu/menu_runner_impl_cocoa.mm ui/views/controls/menu/menu_runner_impl_cocoa.mm
-index 4ac619cfdb725..8c6979e80d2dc 100644
+index 6f92eb0c4f6f9..dba3c63e59b4b 100644
 --- ui/views/controls/menu/menu_runner_impl_cocoa.mm
 +++ ui/views/controls/menu/menu_runner_impl_cocoa.mm
-@@ -533,7 +533,8 @@ - (void)controllerWillAddMenu:(NSMenu*)menu fromModel:(ui::MenuModel*)model {
+@@ -511,7 +511,8 @@ void MenuRunnerImplCocoa::RunMenuAt(Widget* parent,
                                      const gfx::Rect& bounds,
                                      MenuAnchorPosition anchor,
                                      int32_t run_types,
@@ -684,7 +684,7 @@ index 54c95d830233e..408f090b55698 100644
    // Hides and cancels the menu.
    virtual void Cancel() = 0;
 diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
-index a3354482b6191..62a9a6fe32073 100644
+index 1ffec7052a314..3a2be376fb000 100644
 --- ui/views/controls/menu/menu_scroll_view_container.cc
 +++ ui/views/controls/menu/menu_scroll_view_container.cc
 @@ -259,6 +259,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
@@ -699,8 +699,32 @@ index a3354482b6191..62a9a6fe32073 100644
    arrow_ = BubbleBorderTypeFromAnchor(
        content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
  
+diff --git ui/views/test/ui_controls_factory_desktop_aura_ozone.cc ui/views/test/ui_controls_factory_desktop_aura_ozone.cc
+index bec549b841bd7..0934f19177358 100644
+--- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc
++++ ui/views/test/ui_controls_factory_desktop_aura_ozone.cc
+@@ -16,6 +16,7 @@
+ #include "base/threading/thread_task_runner_handle.h"
+ #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
++#include "cef/libcef/features/features.h"
+ #include "ui/aura/client/screen_position_client.h"
+ #include "ui/aura/env.h"
+ #include "ui/aura/test/aura_test_utils.h"
+@@ -100,9 +101,11 @@ class UIControlsDesktopOzone : public UIControlsAura {
+         aura::test::QueryLatestMousePositionRequestInHost(host);
+     host->ConvertPixelsToDIP(&root_current_location);
+ 
++#if !BUILDFLAG(ENABLE_CEF)
+     auto* screen = views::test::TestDesktopScreenOzone::GetInstance();
+     DCHECK_EQ(screen, display::Screen::GetScreen());
+     screen->set_cursor_screen_point(gfx::Point(screen_x, screen_y));
++#endif
+ 
+     if (root_location != root_current_location &&
+         ozone_ui_controls_test_helper_->ButtonDownMask() == 0 &&
 diff --git ui/views/view.h ui/views/view.h
-index 034e1652ebab1..fb215a9dcc815 100644
+index ef40c571d57c0..0fd51538fbefd 100644
 --- ui/views/view.h
 +++ ui/views/view.h
 @@ -22,6 +22,7 @@
@@ -711,7 +735,7 @@ index 034e1652ebab1..fb215a9dcc815 100644
  #include "build/build_config.h"
  #include "third_party/abseil-cpp/absl/types/optional.h"
  #include "third_party/skia/include/core/SkPath.h"
-@@ -270,7 +271,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
+@@ -271,7 +272,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
                            public ui::EventTarget,
                            public ui::EventHandler,
                            public ui::PropertyHandler,

patch/patches/views_widget.patch

@@ -1,9 +1,9 @@
 diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
-index 1bdeb27db614d..6f6b6095ce81a 100644
+index edcca00291646..2bb104005561b 100644
 --- content/browser/renderer_host/render_widget_host_view_base.cc
 +++ content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -625,6 +625,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
+@@ -652,6 +652,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
-   return screen_infos_.current().device_scale_factor;
+   return scale_override_for_capture_;
  }
  
 +void RenderWidgetHostViewBase::SetHasExternalParent(bool val) {
@@ -18,7 +18,7 @@ index 1bdeb27db614d..6f6b6095ce81a 100644
    if (!GetMouseWheelPhaseHandler())
      return;
 diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
-index 5f2abc1943e2f..07544842449a7 100644
+index 912e238c2cc03..3a7e7b2f25d00 100644
 --- content/browser/renderer_host/render_widget_host_view_base.h
 +++ content/browser/renderer_host/render_widget_host_view_base.h
 @@ -67,6 +67,7 @@ class CursorManager;
@@ -29,7 +29,7 @@ index 5f2abc1943e2f..07544842449a7 100644
  class SyntheticGestureTarget;
  class TextInputManager;
  class TouchSelectionControllerClientManager;
-@@ -132,6 +133,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -138,6 +139,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
                          const gfx::Size& max_size) override;
    void DisableAutoResize(const gfx::Size& new_size) override;
    float GetDeviceScaleFactor() const final;
@@ -38,7 +38,7 @@ index 5f2abc1943e2f..07544842449a7 100644
    TouchSelectionControllerClientManager*
    GetTouchSelectionControllerClientManager() override;
    bool ShouldVirtualKeyboardOverlayContent() override;
-@@ -168,6 +171,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -174,6 +177,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
    // Called when screen information or native widget bounds change.
    virtual void UpdateScreenInfo();
  
@@ -49,7 +49,7 @@ index 5f2abc1943e2f..07544842449a7 100644
    // Called by the TextInputManager to notify the view about being removed from
    // the list of registered views, i.e., TextInputManager is no longer tracking
    // TextInputState from this view. The RWHV should reset |text_input_manager_|
-@@ -407,6 +414,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -413,6 +420,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
                             const gfx::Rect& bounds,
                             const gfx::Rect& anchor_rect) = 0;
  
@@ -62,7 +62,7 @@ index 5f2abc1943e2f..07544842449a7 100644
    // Sets the cursor for this view to the one associated with the specified
    // cursor_type.
    virtual void UpdateCursor(const WebCursor& cursor) = 0;
-@@ -647,6 +660,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -655,6 +668,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
    // to all displays.
    gfx::Size system_cursor_size_;
  
@@ -73,7 +73,7 @@ index 5f2abc1943e2f..07544842449a7 100644
   private:
    FRIEND_TEST_ALL_PREFIXES(
        BrowserSideFlingBrowserTest,
-@@ -668,10 +685,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -676,10 +693,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
  
    void SynchronizeVisualProperties();
  
@@ -152,10 +152,10 @@ index d213587450f06..3fde9a9ce47d5 100644
    // Set the view's active state (i.e., tint state of controls).
    virtual void SetActive(bool active) = 0;
 diff --git ui/ozone/platform/x11/x11_window.cc ui/ozone/platform/x11/x11_window.cc
-index b4f36c7a98e08..588ce27d8f310 100644
+index 7371f85c84f9d..52081b786b91f 100644
 --- ui/ozone/platform/x11/x11_window.cc
 +++ ui/ozone/platform/x11/x11_window.cc
-@@ -1714,7 +1714,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
+@@ -1753,7 +1753,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
    req.border_pixel = 0;
  
    bounds_in_pixels_ = SanitizeBounds(bounds);
@@ -166,10 +166,10 @@ index b4f36c7a98e08..588ce27d8f310 100644
    req.y = bounds_in_pixels_.y();
    req.width = bounds_in_pixels_.width();
 diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc
-index 7c352dd0d992d..516623a91b0e1 100644
+index 87a4458f9fbfc..bc3edd88fac7f 100644
 --- ui/views/widget/desktop_aura/desktop_screen_win.cc
 +++ ui/views/widget/desktop_aura/desktop_screen_win.cc
-@@ -20,6 +20,8 @@ DesktopScreenWin::~DesktopScreenWin() {
+@@ -23,6 +23,8 @@ DesktopScreenWin::~DesktopScreenWin() {
  }
  
  HWND DesktopScreenWin::GetHWNDFromNativeWindow(gfx::NativeWindow window) const {
@@ -179,10 +179,10 @@ index 7c352dd0d992d..516623a91b0e1 100644
    return host ? host->GetAcceleratedWidget() : nullptr;
  }
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
-index b871dc99fb667..1101aec338f1c 100644
+index e861828b228bc..17ba3850ab447 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
-@@ -167,6 +167,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
+@@ -163,6 +163,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
    return result;
  }
  
@@ -198,10 +198,10 @@ index b871dc99fb667..1101aec338f1c 100644
 +  return DesktopWindowTreeHostPlatform::GetLocationOnScreenInPixels();
 +}
 +
- #if !BUILDFLAG(IS_CHROMEOS_LACROS)
  void DesktopWindowTreeHostLinux::DispatchEvent(ui::Event* event) {
    // In Windows, the native events sent to chrome are separated into client
-@@ -294,6 +306,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
+   // and non-client versions of events, which we record on our LocatedEvent
+@@ -288,6 +300,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
  
    properties->wayland_app_id = params.wayland_app_id;
  
@@ -211,10 +211,10 @@ index b871dc99fb667..1101aec338f1c 100644
    properties->x11_extension_delegate = this;
  }
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
-index 72d7edd5626ab..ab6d3c6f87e6d 100644
+index e6842b0848c74..d214247587d41 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
-@@ -62,6 +62,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
+@@ -57,6 +57,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
    // Disables event listening to make |dialog| modal.
    base::OnceClosure DisableEventListening();
  
@@ -223,7 +223,7 @@ index 72d7edd5626ab..ab6d3c6f87e6d 100644
   protected:
    // Overridden from DesktopWindowTreeHost:
    void Init(const Widget::InitParams& params) override;
-@@ -71,6 +73,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
+@@ -66,6 +68,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
        const gfx::Vector2d& drag_offset,
        Widget::MoveLoopSource source,
        Widget::MoveLoopEscapeBehavior escape_behavior) override;
@@ -231,8 +231,8 @@ index 72d7edd5626ab..ab6d3c6f87e6d 100644
 +  gfx::Point GetLocationOnScreenInPixels() const override;
  
    // PlatformWindowDelegate:
- #if !BUILDFLAG(IS_CHROMEOS_LACROS)
+   void DispatchEvent(ui::Event* event) override;
-@@ -119,6 +123,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
+@@ -112,6 +116,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
  
    uint32_t modal_dialog_counter_ = 0;
  
@@ -243,10 +243,10 @@ index 72d7edd5626ab..ab6d3c6f87e6d 100644
    base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this};
  };
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-index d207fe7038d6d..ed30df9c06b91 100644
+index 0ff9b8f6becc8..73e62450a9e03 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -257,8 +257,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
+@@ -260,8 +260,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
    if (properties.parent_widget) {
      window_parent_ = DesktopWindowTreeHostPlatform::GetHostForWidget(
          properties.parent_widget);
@@ -258,7 +258,7 @@ index d207fe7038d6d..ed30df9c06b91 100644
  
    // Calculate initial bounds.
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index 28d01a952a31b..e417897e8e857 100644
+index d7260950ca1ba..67664a29e3510 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 @@ -181,8 +181,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
@@ -275,7 +275,7 @@ index 28d01a952a31b..e417897e8e857 100644
  
    remove_standard_frame_ = params.remove_standard_frame;
    has_non_client_view_ = Widget::RequiresNonClientView(params.type);
-@@ -993,11 +997,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
+@@ -989,11 +993,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
  }
  
  void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
@@ -294,10 +294,10 @@ index 28d01a952a31b..e417897e8e857 100644
  
  bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-index 7abd8d3fa1ee1..7cb5eed24ab96 100644
+index 0aae49ec83b88..ab61925742ed7 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-@@ -325,6 +325,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
+@@ -324,6 +324,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
    // True if the window should have the frame removed.
    bool remove_standard_frame_;
  
@@ -309,7 +309,7 @@ index 7abd8d3fa1ee1..7cb5eed24ab96 100644
    // a reference.
    raw_ptr<corewm::TooltipWin> tooltip_;
 diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
-index 77dd782f71446..13a97760bcf6f 100644
+index 046d3cf77f70e..f730142c7d554 100644
 --- ui/views/widget/widget.cc
 +++ ui/views/widget/widget.cc
 @@ -338,7 +338,8 @@ void Widget::Init(InitParams params) {
@@ -363,7 +363,7 @@ index 77dd782f71446..13a97760bcf6f 100644
  }
  
 diff --git ui/views/widget/widget.h ui/views/widget/widget.h
-index 906d35764ca16..3049436dc059b 100644
+index d44b04c2587ca..97a9c1a22b608 100644
 --- ui/views/widget/widget.h
 +++ ui/views/widget/widget.h
 @@ -337,6 +337,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -404,10 +404,10 @@ index b3a3efd0e526f..8590a98eaf0b2 100644
        if (native_widget_delegate->IsDialogBox()) {
          *style |= DS_MODALFRAME;
 diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
-index 0a34478e9cb44..e61fca5b6e525 100644
+index 2d21f2e408004..15eca7b0db72f 100644
 --- ui/views/win/hwnd_message_handler.cc
 +++ ui/views/win/hwnd_message_handler.cc
-@@ -796,7 +796,11 @@ bool HWNDMessageHandler::IsVisible() const {
+@@ -824,7 +824,11 @@ bool HWNDMessageHandler::IsVisible() const {
  }
  
  bool HWNDMessageHandler::IsActive() const {
@@ -420,7 +420,7 @@ index 0a34478e9cb44..e61fca5b6e525 100644
  }
  
  bool HWNDMessageHandler::IsMinimized() const {
-@@ -3176,10 +3180,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -3213,10 +3217,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
    } else if (event.type() == ui::ET_MOUSEWHEEL) {
      ui::MouseWheelEvent mouse_wheel_event(msg);
      // Reroute the mouse wheel to the window under the pointer if applicable.

patch/patches/viz_osr_2575.patch

@@ -80,10 +80,10 @@ index 309422bcf8581..759549f3046f4 100644
   private:
    const HWND hwnd_;
 diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
-index fe988e3bbcf0c..e1cdb6abe8995 100644
+index 10d10f49e7a0e..9e5a6409465ab 100644
 --- components/viz/service/BUILD.gn
 +++ components/viz/service/BUILD.gn
-@@ -221,6 +221,8 @@ viz_component("service") {
+@@ -214,6 +214,8 @@ viz_component("service") {
      "transitions/transferable_resource_tracker.cc",
      "transitions/transferable_resource_tracker.h",
      "viz_service_export.h",
@@ -93,7 +93,7 @@ index fe988e3bbcf0c..e1cdb6abe8995 100644
  
    defines = [ "VIZ_SERVICE_IMPLEMENTATION" ]
 diff --git components/viz/service/display_embedder/output_surface_provider_impl.cc components/viz/service/display_embedder/output_surface_provider_impl.cc
-index 8a277c6337d44..8bf8ae706624e 100644
+index 8585790795707..995143f8b0faf 100644
 --- components/viz/service/display_embedder/output_surface_provider_impl.cc
 +++ components/viz/service/display_embedder/output_surface_provider_impl.cc
 @@ -17,6 +17,7 @@
@@ -104,15 +104,15 @@ index 8a277c6337d44..8bf8ae706624e 100644
  #include "components/viz/common/display/renderer_settings.h"
  #include "components/viz/common/frame_sinks/begin_frame_source.h"
  #include "components/viz/service/display/display_compositor_memory_and_task_controller.h"
-@@ -39,6 +40,7 @@
+@@ -29,6 +30,7 @@
+ #include "gpu/config/gpu_finch_features.h"
+ #include "gpu/ipc/common/surface_handle.h"
  #include "gpu/ipc/scheduler_sequence.h"
- #include "gpu/ipc/service/gpu_channel_manager_delegate.h"
- #include "gpu/ipc/service/image_transport_surface.h"
 +#include "mojo/public/cpp/bindings/sync_call_restrictions.h"
  #include "ui/base/ui_base_switches.h"
- #include "ui/gl/gl_context.h"
+ 
- #include "ui/gl/init/gl_factory.h"
+ #if BUILDFLAG(IS_WIN)
-@@ -247,6 +249,20 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
+@@ -142,6 +144,20 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
    if (headless_)
      return std::make_unique<SoftwareOutputDevice>();
  

patch/patches/web_contents_1257_1565.patch

@@ -1,8 +1,8 @@
 diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
-index b94e87b6f90c9..297280d7f52ca 100644
+index 33f6efe4df4ee..e07f9e28c0760 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
-@@ -3026,6 +3026,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3036,6 +3036,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
        params.main_frame_name, GetOpener(), primary_main_frame_policy);
  
@@ -15,7 +15,7 @@ index b94e87b6f90c9..297280d7f52ca 100644
    std::unique_ptr<WebContentsViewDelegate> delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3036,6 +3042,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3046,6 +3052,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_ = CreateWebContentsView(this, std::move(delegate),
                                    &render_view_host_delegate_view_);
    }
@@ -23,7 +23,7 @@ index b94e87b6f90c9..297280d7f52ca 100644
    CHECK(render_view_host_delegate_view_);
    CHECK(view_.get());
  
-@@ -3214,6 +3221,9 @@ void WebContentsImpl::RenderWidgetCreated(
+@@ -3224,6 +3231,9 @@ void WebContentsImpl::RenderWidgetCreated(
    OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
                          "render_widget_host", render_widget_host);
    created_widgets_.insert(render_widget_host);
@@ -33,7 +33,7 @@ index b94e87b6f90c9..297280d7f52ca 100644
  }
  
  void WebContentsImpl::RenderWidgetDeleted(
-@@ -3902,6 +3912,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3937,6 +3947,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    // objects.
    create_params.renderer_initiated_creation = !is_new_browsing_instance;
  
@@ -49,7 +49,7 @@ index b94e87b6f90c9..297280d7f52ca 100644
    std::unique_ptr<WebContentsImpl> new_contents;
    if (!is_guest) {
      create_params.context = view_->GetNativeView();
-@@ -7763,6 +7782,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
+@@ -7798,6 +7817,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
      // frames).
      SetFocusedFrameTree(node->frame_tree());
    }
@@ -60,7 +60,7 @@ index b94e87b6f90c9..297280d7f52ca 100644
  
  void WebContentsImpl::DidCallFocus() {
 diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
-index e82a5b71eb8a6..34a2f19d8ddca 100644
+index c98dd2d9a23a0..e62f0c0803366 100644
 --- content/public/browser/web_contents.h
 +++ content/public/browser/web_contents.h
 @@ -93,10 +93,12 @@ class BrowserContext;
@@ -88,7 +88,7 @@ index e82a5b71eb8a6..34a2f19d8ddca 100644
      // the value that'll be returned by GetLastActiveTime(). If this is left
      // default initialized then the value is not passed on to the WebContents
 diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
-index 04aa4d993b331..59ed45848f201 100644
+index 348dcde05d71e..871f0e0e22eb6 100644
 --- content/public/browser/web_contents_delegate.h
 +++ content/public/browser/web_contents_delegate.h
 @@ -57,9 +57,11 @@ class EyeDropperListener;

patch/patches/webkit_plugin_info_2015.patch

@@ -1,8 +1,8 @@
 diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
-index 3f8fbe6330051..840f9034b6edc 100644
+index e56d75ffd68c4..0965644fd6f9e 100644
 --- third_party/blink/public/platform/platform.h
 +++ third_party/blink/public/platform/platform.h
-@@ -874,6 +874,11 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -833,6 +833,11 @@ class BLINK_PLATFORM_EXPORT Platform {
        const WebURL& url,
        blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) {}
  
@@ -15,7 +15,7 @@ index 3f8fbe6330051..840f9034b6edc 100644
    static void InitializeMainThreadCommon(Platform* platform,
                                           std::unique_ptr<Thread> main_thread);
 diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc
-index 8640d6a9b1113..a9ec7176422b5 100644
+index 53bac961859ad..ee55382ce2641 100644
 --- third_party/blink/renderer/core/inspector/devtools_session.cc
 +++ third_party/blink/renderer/core/inspector/devtools_session.cc
 @@ -8,6 +8,7 @@
@@ -26,7 +26,7 @@ index 8640d6a9b1113..a9ec7176422b5 100644
  #include "third_party/blink/renderer/bindings/core/v8/script_controller.h"
  #include "third_party/blink/renderer/core/frame/local_frame.h"
  #include "third_party/blink/renderer/core/inspector/devtools_agent.h"
-@@ -148,6 +149,7 @@ DevToolsSession::DevToolsSession(
+@@ -149,6 +150,7 @@ DevToolsSession::DevToolsSession(
      for (wtf_size_t i = 0; i < agents_.size(); i++)
        agents_[i]->Restore();
    }
@@ -34,7 +34,7 @@ index 8640d6a9b1113..a9ec7176422b5 100644
  }
  
  DevToolsSession::~DevToolsSession() {
-@@ -188,6 +190,7 @@ void DevToolsSession::Detach() {
+@@ -191,6 +193,7 @@ void DevToolsSession::Detach() {
    agents_.clear();
    v8_session_.reset();
    agent_->client_->DebuggerTaskFinished();

patch/patches/webkit_popups.patch

@@ -11,7 +11,7 @@ index 5e4032ccf916f..1ccf72b56fb22 100644
    // Cancels and hides the current popup (datetime, select...) if any.
    virtual void CancelPagePopup() = 0;
 diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
-index e54cea33f84f5..192bcfa9198eb 100644
+index 3f6460ceee1e3..faebfcc06bbae 100644
 --- third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -246,8 +246,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -62,7 +62,7 @@ index 2f8e971ab224b..130ddf0ba213d 100644
    TransformationMatrix device_emulation_transform_;
  
 diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
-index 8d9c6f4c24725..584c95a4d61cb 100644
+index b05a0d8ca1db7..396343a895e82 100644
 --- third_party/blink/renderer/core/page/chrome_client_impl.cc
 +++ third_party/blink/renderer/core/page/chrome_client_impl.cc
 @@ -917,7 +917,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {

patch/patches/webui_2037.patch

@@ -1,5 +1,5 @@
 diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
-index b72354aefaf97..2d40985542b4b 100644
+index 4a978a473f39b..d10c133250860 100644
 --- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
 +++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
 @@ -10,6 +10,7 @@
@@ -29,7 +29,7 @@ index b72354aefaf97..2d40985542b4b 100644
  #include "components/prefs/pref_service.h"
  #include "components/sync/driver/sync_internals_util.h"
  #include "components/sync/driver/sync_service.h"
-@@ -331,7 +335,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
+@@ -332,7 +336,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
    response->emplace(kOsVersionTag, os_version);
  #endif
  
@@ -42,7 +42,7 @@ index b72354aefaf97..2d40985542b4b 100644
    PopulateExtensionInfoLogs(response.get());
    PopulatePowerApiLogs(response.get());
  #if BUILDFLAG(IS_WIN)
-@@ -410,6 +418,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
+@@ -414,6 +422,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
    if (!profile)
      return;
  
@@ -55,7 +55,7 @@ index b72354aefaf97..2d40985542b4b 100644
    extensions::ExtensionRegistry* extension_registry =
        extensions::ExtensionRegistry::Get(profile);
    std::string extensions_list;
-@@ -504,6 +518,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
+@@ -508,6 +522,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
  #if BUILDFLAG(IS_WIN)
  void ChromeInternalLogSource::PopulateUsbKeyboardDetected(
      SystemLogsResponse* response) {

patch/patches/win_sandbox_3210.patch

@@ -1,8 +1,8 @@
 diff --git sandbox/policy/win/sandbox_win.cc sandbox/policy/win/sandbox_win.cc
-index 7eaf2e4187b5c..7e11cde95ee76 100644
+index b1ec529d260a9..d84c44e6e0412 100644
 --- sandbox/policy/win/sandbox_win.cc
 +++ sandbox/policy/win/sandbox_win.cc
-@@ -1129,6 +1129,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
+@@ -1131,6 +1131,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
      const base::HandlesToInheritVector& handles_to_inherit,
      SandboxDelegate* delegate,
      base::Process* process) {
@@ -13,6 +13,6 @@ index 7eaf2e4187b5c..7e11cde95ee76 100644
 +                                process);
 +  }
 +
+   const base::ElapsedTimer timer;
    auto policy = g_broker_services->CreatePolicy();
-   ResultCode result = GeneratePolicyForSandboxedProcess(
+   auto time_policy_created = timer.Elapsed();
-       cmd_line, process_type, handles_to_inherit, delegate, policy.get());

tests/cefclient/browser/browser_window_osr_mac.mm

@@ -197,7 +197,7 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
 }
 
 - (void)rightMouseDown:(NSEvent*)event {
-  if ([event modifierFlags] & NSShiftKeyMask) {
+  if ([event modifierFlags] & NSEventModifierFlagShift) {
     // Start rotation effect.
     last_mouse_pos_ = cur_mouse_pos_ = [self getClickPointForEvent:event];
     rotating_ = true;
@@ -284,7 +284,7 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
   if (!browser.get() || !text_input_context_osr_mac_)
     return;
 
-  if ([event type] != NSFlagsChanged) {
+  if ([event type] != NSEventTypeFlagsChanged) {
     if (text_input_client_) {
       [text_input_client_ HandleKeyEventBeforeTextInputClient:event];
 
@@ -309,10 +309,13 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
 // interfere with other Trackpad events, this mapping is only enabled if
 // touch-events=enabled commandline is passed and caps lock key is on.
 - (void)toggleTouchEmulation:(NSEvent*)event {
-  if ([event type] == NSFlagsChanged && [event keyCode] == 0x39) {
+  if ([event type] == NSEventTypeFlagsChanged && [event keyCode] == 0x39) {
     NSUInteger flags = [event modifierFlags];
-    BOOL touch_enabled = flags & NSAlphaShiftKeyMask ? YES : NO;
+    BOOL touch_enabled = flags & NSEventModifierFlagCapsLock ? YES : NO;
-    [self setAcceptsTouchEvents:touch_enabled];
+    if (touch_enabled)
+      self.allowedTouchTypes |= NSTouchTypeMaskDirect;
+    else
+      self.allowedTouchTypes &= ~NSTouchTypeMaskDirect;
   }
 }
 
@@ -443,7 +446,7 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
   // events to the renderer.
   if ([event phase] == NSEventPhaseBegan && !endWheelMonitor_) {
     endWheelMonitor_ = [NSEvent
-        addLocalMonitorForEventsMatchingMask:NSScrollWheelMask
+        addLocalMonitorForEventsMatchingMask:NSEventMaskScrollWheel
                                      handler:^(NSEvent* blockEvent) {
                                        [self shortCircuitScrollWheelEvent:
                                                  blockEvent];
@@ -556,7 +559,7 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
 }
 
 - (void)getKeyEvent:(CefKeyEvent&)keyEvent forEvent:(NSEvent*)event {
-  if ([event type] == NSKeyDown || [event type] == NSKeyUp) {
+  if ([event type] == NSEventTypeKeyDown || [event type] == NSEventTypeKeyUp) {
     NSString* s = [event characters];
     if ([s length] > 0)
       keyEvent.character = [s characterAtIndex:0];
@@ -566,7 +569,7 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
       keyEvent.unmodified_character = [s characterAtIndex:0];
   }
 
-  if ([event type] == NSFlagsChanged) {
+  if ([event type] == NSEventTypeFlagsChanged) {
     keyEvent.character = 0;
     keyEvent.unmodified_character = 0;
   }
@@ -633,19 +636,19 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
 - (int)getModifiersForEvent:(NSEvent*)event {
   int modifiers = 0;
 
-  if ([event modifierFlags] & NSControlKeyMask)
+  if ([event modifierFlags] & NSEventModifierFlagControl)
     modifiers |= EVENTFLAG_CONTROL_DOWN;
-  if ([event modifierFlags] & NSShiftKeyMask)
+  if ([event modifierFlags] & NSEventModifierFlagShift)
     modifiers |= EVENTFLAG_SHIFT_DOWN;
-  if ([event modifierFlags] & NSAlternateKeyMask)
+  if ([event modifierFlags] & NSEventModifierFlagOption)
     modifiers |= EVENTFLAG_ALT_DOWN;
-  if ([event modifierFlags] & NSCommandKeyMask)
+  if ([event modifierFlags] & NSEventModifierFlagCommand)
     modifiers |= EVENTFLAG_COMMAND_DOWN;
-  if ([event modifierFlags] & NSAlphaShiftKeyMask)
+  if ([event modifierFlags] & NSEventModifierFlagCapsLock)
     modifiers |= EVENTFLAG_CAPS_LOCK_ON;
 
-  if ([event type] == NSKeyUp || [event type] == NSKeyDown ||
+  if ([event type] == NSEventTypeKeyUp || [event type] == NSEventTypeKeyDown ||
-      [event type] == NSFlagsChanged) {
+      [event type] == NSEventTypeFlagsChanged) {
     // Only perform this check for key events
     if ([self isKeyPadEvent:event])
       modifiers |= EVENTFLAG_IS_KEY_PAD;
@@ -658,19 +661,19 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
 
   // Mouse buttons
   switch ([event type]) {
-    case NSLeftMouseDragged:
+    case NSEventTypeLeftMouseDragged:
-    case NSLeftMouseDown:
+    case NSEventTypeLeftMouseDown:
-    case NSLeftMouseUp:
+    case NSEventTypeLeftMouseUp:
       modifiers |= EVENTFLAG_LEFT_MOUSE_BUTTON;
       break;
-    case NSRightMouseDragged:
+    case NSEventTypeRightMouseDragged:
-    case NSRightMouseDown:
+    case NSEventTypeRightMouseDown:
-    case NSRightMouseUp:
+    case NSEventTypeRightMouseUp:
       modifiers |= EVENTFLAG_RIGHT_MOUSE_BUTTON;
       break;
-    case NSOtherMouseDragged:
+    case NSEventTypeOtherMouseDragged:
-    case NSOtherMouseDown:
+    case NSEventTypeOtherMouseDown:
-    case NSOtherMouseUp:
+    case NSEventTypeOtherMouseUp:
       modifiers |= EVENTFLAG_MIDDLE_MOUSE_BUTTON;
       break;
     default:
@@ -681,39 +684,39 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
 }
 
 - (BOOL)isKeyUpEvent:(NSEvent*)event {
-  if ([event type] != NSFlagsChanged)
+  if ([event type] != NSEventTypeFlagsChanged)
-    return [event type] == NSKeyUp;
+    return [event type] == NSEventTypeKeyUp;
 
   // FIXME: This logic fails if the user presses both Shift keys at once, for
   // example: we treat releasing one of them as keyDown.
   switch ([event keyCode]) {
     case 54:  // Right Command
     case 55:  // Left Command
-      return ([event modifierFlags] & NSCommandKeyMask) == 0;
+      return ([event modifierFlags] & NSEventModifierFlagCommand) == 0;
 
     case 57:  // Capslock
-      return ([event modifierFlags] & NSAlphaShiftKeyMask) == 0;
+      return ([event modifierFlags] & NSEventModifierFlagCapsLock) == 0;
 
     case 56:  // Left Shift
     case 60:  // Right Shift
-      return ([event modifierFlags] & NSShiftKeyMask) == 0;
+      return ([event modifierFlags] & NSEventModifierFlagShift) == 0;
 
     case 58:  // Left Alt
     case 61:  // Right Alt
-      return ([event modifierFlags] & NSAlternateKeyMask) == 0;
+      return ([event modifierFlags] & NSEventModifierFlagOption) == 0;
 
     case 59:  // Left Ctrl
     case 62:  // Right Ctrl
-      return ([event modifierFlags] & NSControlKeyMask) == 0;
+      return ([event modifierFlags] & NSEventModifierFlagControl) == 0;
 
     case 63:  // Function
-      return ([event modifierFlags] & NSFunctionKeyMask) == 0;
+      return ([event modifierFlags] & NSEventModifierFlagFunction) == 0;
   }
   return false;
 }
 
 - (BOOL)isKeyPadEvent:(NSEvent*)event {
-  if ([event modifierFlags] & NSNumericPadKeyMask)
+  if ([event modifierFlags] & NSEventModifierFlagNumericPad)
     return true;
 
   switch ([event keyCode]) {
@@ -787,9 +790,9 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
   NSWindow* window = [self window];
   NSTimeInterval eventTime = [currentEvent timestamp];
 
-  NSEvent* dragEvent = [NSEvent mouseEventWithType:NSLeftMouseDragged
+  NSEvent* dragEvent = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDragged
                                           location:position
-                                     modifierFlags:NSLeftMouseDraggedMask
+                                     modifierFlags:NSEventMaskLeftMouseDragged
                                          timestamp:eventTime
                                       windowNumber:[window windowNumber]
                                            context:nil
@@ -1064,7 +1067,7 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
 
 - (void)fillPasteboard {
   DCHECK(!pasteboard_);
-  pasteboard_ = [NSPasteboard pasteboardWithName:NSDragPboard];
+  pasteboard_ = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
 #if !__has_feature(objc_arc)
   [pasteboard_ retain];
 #endif  // !__has_feature(objc_arc)

tests/cefclient/browser/root_window_mac.mm

@@ -381,9 +381,10 @@ void RootWindowMacImpl::CreateRootWindow(const CefBrowserSettings& settings,
   // Create the main window.
   window_ = [[window_class alloc]
       initWithContentRect:content_rect
-                styleMask:(NSTitledWindowMask | NSClosableWindowMask |
+                styleMask:(NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
-                           NSMiniaturizableWindowMask | NSResizableWindowMask |
+                           NSWindowStyleMaskMiniaturizable |
-                           NSUnifiedTitleAndToolbarWindowMask)
+                           NSWindowStyleMaskResizable |
+                           NSWindowStyleMaskUnifiedTitleAndToolbar)
                   backing:NSBackingStoreBuffered
                     defer:NO];
   [window_ setTitle:@"cefclient"];

tests/cefclient/browser/temp_window_mac.mm

@@ -22,7 +22,7 @@ class TempWindowMacImpl {
   TempWindowMacImpl() {
     // Create a borderless non-visible 1x1 window.
     window_ = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 1, 1)
-                                          styleMask:NSBorderlessWindowMask
+                                          styleMask:NSWindowStyleMaskBorderless
                                             backing:NSBackingStoreBuffered
                                               defer:NO];
     CHECK(window_);

tests/cefclient/browser/text_input_client_osr_mac.mm

@@ -249,7 +249,7 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
 }
 
 - (void)HandleKeyEventBeforeTextInputClient:(NSEvent*)keyEvent {
-  DCHECK([keyEvent type] == NSKeyDown);
+  DCHECK([keyEvent type] == NSEventTypeKeyDown);
   // Don't call this method recursively.
   DCHECK(!handlingKeyDown_);
 

tests/cefclient/resources/mac/Info.plist

@@ -28,7 +28,7 @@
 		<string>0</string>
 	</dict>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.11.0</string>
+	<string>10.13.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

tests/cefclient/resources/mac/helper-Info.plist

@@ -28,7 +28,7 @@
 	<key>LSFileQuarantineEnabled</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.11.0</string>
+	<string>10.13.0</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>

tests/cefsimple/mac/Info.plist

@@ -26,7 +26,7 @@
 		<string>0</string>
 	</dict>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.11.0</string>
+	<string>10.13.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

tests/cefsimple/mac/helper-Info.plist

@@ -26,7 +26,7 @@
 	<key>LSFileQuarantineEnabled</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.11.0</string>
+	<string>10.13.0</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>

tests/ceftests/cookie_unittest.cc

@@ -3,6 +3,7 @@
 // can be found in the LICENSE file.
 
 #include <algorithm>
+#include <chrono>
 #include <vector>
 
 #include "include/base/cef_callback.h"
@@ -148,6 +149,14 @@ void DeleteCookies(CefRefPtr<CefCookieManager> manager,
   event->Wait();
 }
 
+time_t GetExpiryDate() {
+  static time_t expiry_time = [] {
+    return std::chrono::system_clock::to_time_t(
+        std::chrono::system_clock::now() + std::chrono::hours(1));
+  }();
+  return expiry_time;
+}
+
 // Create a test cookie. If |withDomain| is true a domain cookie will be
 // created, otherwise a host cookie will be created.
 void CreateCookie(CefRefPtr<CefCookieManager> manager,
@@ -162,10 +171,9 @@ void CreateCookie(CefRefPtr<CefCookieManager> manager,
   CefString(&cookie.path).FromASCII(kTestPath);
   if (!sessionCookie) {
     cookie.has_expires = true;
-    cookie.expires.year = 2200;
+    // Must choose the expiry date dynamically due to the
-    cookie.expires.month = 4;
+    // "ClampCookieExpiryTo400Days" feature enabled in M104.
-    cookie.expires.day_of_week = 5;
+    EXPECT_TRUE(cef_time_from_timet(GetExpiryDate(), &cookie.expires));
-    cookie.expires.day_of_month = 11;
   }
 
   CookieVector cookies;

tests/ceftests/draggable_regions_unittest.cc

@@ -103,7 +103,9 @@ class DraggableRegionsTestHandler : public TestHandler,
     switch (step_) {
       case kStepWithRegions:
       case kStepWithChangingRegions2:
-        EXPECT_EQ(2U, regions.size());
+        EXPECT_EQ(2U, regions.size()) << step_;
+        if (regions.size() != 2U)
+          break;
         EXPECT_NEAR(50, regions[0].bounds.x, 1);
         EXPECT_NEAR(50, regions[0].bounds.y, 1);
         EXPECT_NEAR(200, regions[0].bounds.width, 1);
@@ -117,7 +119,9 @@ class DraggableRegionsTestHandler : public TestHandler,
         break;
       case kStepWithChangingRegions:
       case kStepWithChangingRegions3:
-        EXPECT_EQ(2U, regions.size());
+        EXPECT_EQ(2U, regions.size()) << step_;
+        if (regions.size() != 2U)
+          break;
         EXPECT_EQ(0, regions[0].bounds.x);
         EXPECT_EQ(0, regions[0].bounds.y);
         EXPECT_NEAR(200, regions[0].bounds.width, 1);
@@ -131,7 +135,7 @@ class DraggableRegionsTestHandler : public TestHandler,
         break;
       case kStepWithoutRegions:
       case kStepWithoutRegions2:
-        EXPECT_TRUE(regions.empty());
+        EXPECT_TRUE(regions.empty()) << step_;
         break;
     }
 

tests/ceftests/resources/mac/Info.plist

@@ -26,7 +26,7 @@
 		<string>0</string>
 	</dict>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.11.0</string>
+	<string>10.13.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

tests/ceftests/resources/mac/helper-Info.plist

@@ -26,7 +26,7 @@
 	<key>LSFileQuarantineEnabled</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.11.0</string>
+	<string>10.13.0</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>

tests/ceftests/scheme_handler_unittest.cc

@@ -1399,7 +1399,7 @@ TEST(SchemeHandlerTest, CustomStandardXHRDifferentOriginSync) {
   EXPECT_TRUE(g_TestResults.got_read);
   EXPECT_TRUE(g_TestResults.got_output);
   EXPECT_TRUE(g_TestResults.got_sub_request);
-  EXPECT_FALSE(g_TestResults.got_sub_read);
+  EXPECT_TRUE(g_TestResults.got_sub_read);
   EXPECT_FALSE(g_TestResults.got_sub_success);
 
   ClearTestSchemes();
@@ -1431,7 +1431,7 @@ TEST(SchemeHandlerTest, CustomStandardXHRDifferentOriginAsync) {
   EXPECT_TRUE(g_TestResults.got_read);
   EXPECT_TRUE(g_TestResults.got_output);
   EXPECT_TRUE(g_TestResults.got_sub_request);
-  EXPECT_FALSE(g_TestResults.got_sub_read);
+  EXPECT_TRUE(g_TestResults.got_sub_read);
   EXPECT_FALSE(g_TestResults.got_sub_success);
 
   ClearTestSchemes();
@@ -1463,7 +1463,7 @@ TEST(SchemeHandlerTest, CustomStandardFetchDifferentOrigin) {
   EXPECT_TRUE(g_TestResults.got_read);
   EXPECT_TRUE(g_TestResults.got_output);
   EXPECT_TRUE(g_TestResults.got_sub_request);
-  EXPECT_FALSE(g_TestResults.got_sub_read);
+  EXPECT_TRUE(g_TestResults.got_sub_read);
   EXPECT_FALSE(g_TestResults.got_sub_success);
 
   ClearTestSchemes();
@@ -1620,7 +1620,7 @@ TEST(SchemeHandlerTest, HttpXHRDifferentOriginSync) {
   EXPECT_TRUE(g_TestResults.got_read);
   EXPECT_TRUE(g_TestResults.got_output);
   EXPECT_TRUE(g_TestResults.got_sub_request);
-  EXPECT_FALSE(g_TestResults.got_sub_read);
+  EXPECT_TRUE(g_TestResults.got_sub_read);
   EXPECT_FALSE(g_TestResults.got_sub_success);
 
   ClearTestSchemes();
@@ -1652,7 +1652,7 @@ TEST(SchemeHandlerTest, HttpXHRDifferentOriginAsync) {
   EXPECT_TRUE(g_TestResults.got_read);
   EXPECT_TRUE(g_TestResults.got_output);
   EXPECT_TRUE(g_TestResults.got_sub_request);
-  EXPECT_FALSE(g_TestResults.got_sub_read);
+  EXPECT_TRUE(g_TestResults.got_sub_read);
   EXPECT_FALSE(g_TestResults.got_sub_success);
 
   ClearTestSchemes();
@@ -1684,7 +1684,7 @@ TEST(SchemeHandlerTest, HttpFetchDifferentOriginAsync) {
   EXPECT_TRUE(g_TestResults.got_read);
   EXPECT_TRUE(g_TestResults.got_output);
   EXPECT_TRUE(g_TestResults.got_sub_request);
-  EXPECT_FALSE(g_TestResults.got_sub_read);
+  EXPECT_TRUE(g_TestResults.got_sub_read);
   EXPECT_FALSE(g_TestResults.got_sub_success);
 
   ClearTestSchemes();
@@ -2232,7 +2232,7 @@ TEST(SchemeHandlerTest, CustomStandardXHRDifferentOriginRedirectSync) {
   EXPECT_TRUE(g_TestResults.got_output);
   EXPECT_TRUE(g_TestResults.got_sub_redirect);
   EXPECT_TRUE(g_TestResults.got_sub_request);
-  EXPECT_FALSE(g_TestResults.got_sub_read);
+  EXPECT_TRUE(g_TestResults.got_sub_read);
   EXPECT_FALSE(g_TestResults.got_sub_success);
 
   ClearTestSchemes();
@@ -2266,7 +2266,7 @@ TEST(SchemeHandlerTest, CustomStandardXHRDifferentOriginRedirectAsync) {
   EXPECT_TRUE(g_TestResults.got_output);
   EXPECT_TRUE(g_TestResults.got_sub_redirect);
   EXPECT_TRUE(g_TestResults.got_sub_request);
-  EXPECT_FALSE(g_TestResults.got_sub_read);
+  EXPECT_TRUE(g_TestResults.got_sub_read);
   EXPECT_FALSE(g_TestResults.got_sub_success);
 
   ClearTestSchemes();
@@ -2301,7 +2301,7 @@ TEST(SchemeHandlerTest, CustomStandardFetchDifferentOriginRedirect) {
   EXPECT_TRUE(g_TestResults.got_output);
   EXPECT_TRUE(g_TestResults.got_sub_redirect);
   EXPECT_TRUE(g_TestResults.got_sub_request);
-  EXPECT_FALSE(g_TestResults.got_sub_read);
+  EXPECT_TRUE(g_TestResults.got_sub_read);
   EXPECT_FALSE(g_TestResults.got_sub_success);
 
   ClearTestSchemes();

tests/ceftests/views/test_window_delegate.cc

@@ -86,19 +86,19 @@ void TestWindowDelegate::OnWindowCreated(CefRefPtr<CefWindow> window) {
   } else {
     // Default origin is the upper-left corner of the display's work area.
     auto work_area = display->GetWorkArea();
-    EXPECT_EQ(work_area.x, client_bounds.x);
+    EXPECT_NEAR(work_area.x, client_bounds.x, 1);
-    EXPECT_EQ(work_area.y, client_bounds.y);
+    EXPECT_NEAR(work_area.y, client_bounds.y, 1);
   }
 
   if (config_->frameless) {
-    EXPECT_EQ(config_->window_size, client_bounds.width);
+    EXPECT_NEAR(config_->window_size, client_bounds.width, 2);
-    EXPECT_EQ(config_->window_size, client_bounds.height);
+    EXPECT_NEAR(config_->window_size, client_bounds.height, 2);
   } else {
     // Client area bounds calculation might have off-by-one errors on Windows
     // due to non-client frame size being calculated internally in pixels and
     // then converted to DIPs. See http://crbug.com/602692.
-    EXPECT_TRUE(abs(client_bounds.width - window_size_.width) <= 1);
+    EXPECT_NEAR(client_bounds.width, window_size_.width, 2);
-    EXPECT_TRUE(abs(client_bounds.height - window_size_.height) <= 1);
+    EXPECT_NEAR(client_bounds.height, window_size_.height, 2);
   }
 
   // Run the callback.

tests/ceftests/views/window_unittest.cc

@@ -121,9 +121,9 @@ void CreateBoxLayout(CefRefPtr<CefWindow> parent) {
 
   // The children should each take up 50% of the client area.
   ExpectCloseRects(CefRect(0, 0, kWSize, kWSize / 2), panel_child1->GetBounds(),
-                   1);
+                   2);
   ExpectCloseRects(CefRect(0, kWSize / 2, kWSize, kWSize / 2),
-                   panel_child2->GetBounds(), 1);
+                   panel_child2->GetBounds(), 2);
 }
 
 void RunWindowLayoutAndCoords(CefRefPtr<CefWindow> window) {