From 1b0dd2435fa013c8a56b2acb549900d07962eb2e Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 26 Mar 2020 17:50:01 -0400
Subject: [PATCH 001/161] Upgrade patches from Chromium 81.0.4044.138 to
 Chromium 83.0.4093.3.

---
 ...id_webview-browser-cookie_manager.cc.patch |  6 +--
 patches/build-android-bytecode-BUILD.gn.patch |  4 +-
 ...mium-bytecode-ByteCodeProcessor.java.patch |  2 +-
 patches/build-config-BUILDCONFIG.gn.patch     |  2 +-
 patches/build-config-android-BUILD.gn.patch   |  2 +-
 patches/build-config-android-config.gni.patch |  2 +-
 patches/build-config-android-rules.gni.patch  |  6 +--
 patches/chrome-BUILD.gn.patch                 | 24 +++++-----
 patches/chrome-VERSION.patch                  |  8 ++--
 ...rome-android-chrome_java_sources.gni.patch |  4 +-
 ...e-android-chrome_public_apk_tmpl.gni.patch |  4 +-
 ...ome-android-java-AndroidManifest.xml.patch | 13 ++---
 ...s-layout-bottom_toolbar_browsing.xml.patch |  4 +-
 ...a-res-layout-custom_tabs_toolbar.xml.patch |  2 +-
 ...d-java-res-layout-toolbar_tablet.xml.patch |  2 +-
 ...word_preferences_action_bar_menu.xml.patch |  2 +-
 ...hromium-chrome-browser-AppHooks.java.patch |  4 +-
 ...s-BookmarkAddEditFolderActivity.java.patch |  4 +-
 ...browser-bookmarks-BookmarkModel.java.patch |  2 +-
 ...ions-NotificationPlatformBridge.java.patch |  2 +-
 ...me-browser-ntp-NewTabPageLayout.java.patch | 10 ++--
 ...rome-browser-ntp-NewTabPageView.java.patch |  4 +-
 ...rcustomizations-HomepageManager.java.patch |  4 +-
 ...e-browser-settings-MainSettings.java.patch |  4 +-
 ...tings-homepage-HomepageSettings.java.patch |  4 +-
 ...e-browser-toolbar-ToolbarColors.java.patch |  4 +-
 ...er-toolbar-top-CustomTabToolbar.java.patch |  4 +-
 ...lbar-top-TabSwitcherModeTTPhone.java.patch |  4 +-
 ...rowser-toolbar-top-ToolbarPhone.java.patch | 16 +++----
 ...owser-toolbar-top-ToolbarTablet.java.patch |  8 ++--
 patches/chrome-android-java_sources.gni.patch |  4 +-
 patches/chrome-app-BUILD.gn.patch             |  2 +-
 patches/chrome-browser-BUILD.gn.patch         |  4 +-
 patches/chrome-browser-about_flags.cc.patch   |  6 +--
 ...hrome-browser-browser_process_impl.h.patch |  4 +-
 ...wser-chrome_content_browser_client.h.patch |  4 +-
 ...host_content_settings_map_factory.cc.patch |  6 +--
 ...ngs-tab_specific_content_settings.cc.patch |  2 +-
 ...wser-devtools-devtools_ui_bindings.h.patch |  4 +-
 ...owser-download-download_item_model.h.patch |  2 +-
 ...rowser-extensions-component_loader.h.patch |  6 +--
 ...tensions-extension_install_prompt.cc.patch |  6 +--
 ...owser-extensions-extension_service.h.patch |  4 +-
 ...ser-extensions-extension_tab_util.cc.patch |  4 +-
 ...rotocol-external_protocol_handler.cc.patch |  2 +-
 ...me-browser-importer-importer_list.cc.patch |  4 +-
 ...-media-webrtc-webrtc_log_uploader.cc.patch |  2 +-
 ...e_metrics_services_manager_client.cc.patch |  2 +-
 ...et-system_network_context_manager.cc.patch |  4 +-
 ...notification_display_service_impl.cc.patch |  4 +-
 ...hrome-browser-prefs-browser_prefs.cc.patch |  6 +--
 .../chrome-browser-profiles-profile.cc.patch  |  4 +-
 ...profiles-profile_avatar_icon_util.cc.patch |  8 ++--
 ...ome-browser-profiles-profile_impl.cc.patch |  4 +-
 ...rome-browser-profiles-profile_impl.h.patch |  4 +-
 ...-browser-profiles-profile_io_data.cc.patch |  4 +-
 ...e-browser-profiles-profile_manager.h.patch |  4 +-
 ...iles-profile_shortcut_manager_win.cc.patch |  4 +-
 ...me-browser-profiles-profile_window.h.patch |  6 +--
 ...browser-profiles-renderer_updater.cc.patch |  2 +-
 ...text_menu-render_view_context_menu.h.patch |  4 +-
 ...rowser-resources-extensions-BUILD.gn.patch |  2 +-
 ...-resources-history-history_item.html.patch |  2 +-
 ...-browser-resources-optimize_webui.py.patch |  2 +-
 ...-browser-resources-settings-BUILD.gn.patch |  6 +--
 ...-settings-about_page-about_page.html.patch |  4 +-
 ...appearance_page-appearance_page.html.patch |  8 ++--
 ...s-settings-lifetime_browser_proxy.js.patch |  6 +--
 ...ources-settings-page_visibility.html.patch |  6 +--
 ...ettings-people_page-people_page.html.patch |  4 +-
 ...cy_page-personalization_options.html.patch | 12 ++---
 ...vacy_page-personalization_options.js.patch |  2 +-
 ...-browser-resources-settings-route.js.patch |  6 +--
 ...ettings-settings_ui-settings_ui.html.patch |  4 +-
 ...settings-category_default_setting.js.patch |  2 +-
 ...-settings-site_settings-constants.js.patch |  4 +-
 ...ings-site_settings-site_details.html.patch |  4 +-
 ...browsing-client_side_model_loader.cc.patch |  4 +-
 ...e-browser-shell_integration_linux.cc.patch |  4 +-
 ...-account_consistency_mode_manager.cc.patch |  4 +-
 ...er-spellcheck_hunspell_dictionary.cc.patch |  4 +-
 ...sync-profile_sync_service_factory.cc.patch |  4 +-
 ...er-tracing-crash_service_uploader.cc.patch |  4 +-
 patches/chrome-browser-ui-BUILD.gn.patch      |  6 +--
 ...-save_card_bubble_controller_impl.cc.patch |  4 +-
 patches/chrome-browser-ui-browser.h.patch     |  4 +-
 ...rome-browser-ui-browser_navigator.cc.patch |  6 +--
 ...ings-content_setting_bubble_model.cc.patch |  4 +-
 ...tings-content_setting_image_model.cc.patch |  4 +-
 ...-extension_action_view_controller.cc.patch |  2 +-
 ...s-extension_action_view_controller.h.patch |  8 ++--
 ...browser-ui-page_info-page_info_ui.cc.patch | 10 ++--
 ...rtup-startup_browser_creator_impl.cc.patch |  4 +-
 ...ws-bookmarks-bookmark_bubble_view.cc.patch |  2 +-
 ...-views-download-download_item_view.h.patch |  2 +-
 ...-views-extensions-extension_popup.cc.patch |  2 +-
 ...ws-location_bar-location_bar_view.cc.patch |  6 +--
 ...ews-location_bar-location_bar_view.h.patch | 10 ++--
 ...iews-outdated_upgrade_bubble_view.cc.patch |  4 +-
 ...ble-permission_prompt_bubble_view.cc.patch |  4 +-
 ...ws-profiles-avatar_toolbar_button.cc.patch |  4 +-
 ...ews-profiles-avatar_toolbar_button.h.patch |  4 +-
 ...i-views-profiles-profile_menu_view.h.patch |  6 +--
 ...ws-profiles-profile_menu_view_base.h.patch |  4 +-
 ...me-browser-ui-views-tabs-tab_icon.cc.patch |  4 +-
 ...ser-ui-views-tabs-tab_style_views.cc.patch |  4 +-
 ...s-toolbar-browser_app_menu_button.cc.patch |  4 +-
 ...ser-ui-views-toolbar-toolbar_view.cc.patch |  4 +-
 ...wser-ui-views-toolbar-toolbar_view.h.patch | 10 ++--
 ...s-translate-translate_bubble_view.cc.patch |  2 +-
 ...ews-update_recommended_message_box.h.patch |  2 +-
 ...-chrome_web_ui_controller_factory.cc.patch |  4 +-
 ...r-ui-webui-downloads-downloads_ui.cc.patch |  2 +-
 ...ui-webui-extensions-extensions_ui.cc.patch |  4 +-
 ...ebui-settings-import_data_handler.cc.patch |  4 +-
 ...ttings_localized_strings_provider.cc.patch |  4 +-
 ...s-components-web_app_shortcut_mac.mm.patch |  4 +-
 .../chrome-chrome_repack_locales.gni.patch    |  2 +-
 patches/chrome-common-BUILD.gn.patch          |  8 ++--
 ...ommon-importer-importer_data_types.h.patch |  4 +-
 patches/chrome-installer-linux-BUILD.gn.patch |  8 ++--
 ...rome-installer-linux-debian-build.sh.patch |  6 +--
 .../chrome-installer-linux-rpm-build.sh.patch |  2 +-
 patches/chrome-installer-mac-BUILD.gn.patch   |  2 +-
 ...me-installer-mac-signing-pipeline.py.patch |  4 +-
 ...me-installer-mini_installer-BUILD.gn.patch |  2 +-
 ...taller-mini_installer-chrome.release.patch |  4 +-
 patches/chrome-installer-util-BUILD.gn.patch  |  4 +-
 ...aller-util-google_update_settings.cc.patch |  6 +--
 patches/chrome-renderer-BUILD.gn.patch        |  4 +-
 ...er-chrome_content_renderer_client.cc.patch |  4 +-
 ...rer-chrome_content_renderer_client.h.patch |  4 +-
 patches/chrome-test-BUILD.gn.patch            |  4 +-
 patches/chrome-utility-BUILD.gn.patch         |  2 +-
 ...s-bookmarks-browser-bookmark_model.h.patch |  4 +-
 ...t-android-java-res-values-dimens.xml.patch |  4 +-
 ...ntent_settings-core-browser-BUILD.gn.patch |  4 +-
 ...re-browser-content_settings_utils.cc.patch |  4 +-
 ...ings-core-common-content_settings.cc.patch |  4 +-
 ...tings-core-common-content_settings.h.patch |  2 +-
 ...-crash-content-app-breakpad_linux.cc.patch |  2 +-
 ...nternal-common-download_item_impl.cc.patch |  4 +-
 ...lidation-impl-fcm_network_handler.cc.patch |  4 +-
 ...network_time-network_time_tracker.cc.patch |  2 +-
 .../components-omnibox-browser-BUILD.gn.patch |  6 +--
 ...ox-browser-autocomplete_controller.h.patch |  4 +-
 ...mnibox-browser-omnibox_edit_model.cc.patch |  2 +-
 ...licy-tools-generate_policy_source.py.patch |  2 +-
 ...-core-db-v4_protocol_manager_util.cc.patch |  2 +-
 ...-sync-driver-glue-sync_engine_impl.h.patch |  4 +-
 ...s-sync-driver-profile_sync_service.h.patch |  4 +-
 ...components-sync-engine-sync_engine.h.patch |  2 +-
 ...ync-engine_impl-sync_manager_impl.cc.patch |  4 +-
 ...c-engine_impl-sync_scheduler_impl.cc.patch |  4 +-
 ...nc-engine_impl-sync_scheduler_impl.h.patch |  2 +-
 ...s-bookmark_remote_updates_handler.cc.patch | 12 ++---
 .../content-browser-browser_main_loop.h.patch |  4 +-
 ...s-devtools_url_loader_interceptor.cc.patch |  4 +-
 ...e_host-navigation_controller_impl.cc.patch |  4 +-
 ...ser-frame_host-navigation_request.cc.patch |  4 +-
 ...ssions-permission_controller_impl.cc.patch |  4 +-
 .../content-child-child_thread_impl.cc.patch  |  2 +-
 patches/content-common-BUILD.gn.patch         |  2 +-
 ...lic-browser-content_browser_client.h.patch |  4 +-
 ...ent-public-browser-permission_type.h.patch |  6 +--
 ...nt-public-browser-url_data_source.cc.patch |  2 +-
 ...nt-public-test-browser_test_utils.cc.patch |  4 +-
 ...ntent-renderer-render_thread_impl.cc.patch |  4 +-
 patches/extensions-browser-BUILD.gn.patch     |  2 +-
 ...r-api-web_request-web_request_api.cc.patch |  4 +-
 ...nsions-browser-sandboxed_unpacker.cc.patch |  4 +-
 ...ns-browser-updater-update_service.cc.patch |  4 +-
 ...r-native_extension_bindings_system.h.patch |  2 +-
 patches/google_apis-gaia-gaia_urls.cc.patch   |  2 +-
 ...-blink-key_system_config_selector.cc.patch |  6 +--
 ...-chromium_bindings_configuration.gni.patch |  6 +--
 patches/net-BUILD.gn.patch                    |  4 +-
 patches/net-cookies-canonical_cookie.cc.patch |  2 +-
 ...services-network-public-cpp-BUILD.gn.patch |  4 +-
 ...e_manager-sandbox-win-sandbox_win.cc.patch |  4 +-
 ...ygote-host-zygote_host_impl_linux.cc.patch |  2 +-
 ...d_party-blink-renderer-core-BUILD.gn.patch |  8 ++--
 ...nk-renderer-core-frame-navigator.idl.patch |  2 +-
 ...-canvas-canvas_async_blob_creator.cc.patch |  4 +-
 ...e-html-canvas-html_canvas_element.cc.patch |  4 +-
 ...r-core-html-media-autoplay_policy.cc.patch |  4 +-
 ...arty-blink-renderer-modules-BUILD.gn.patch |  2 +-
 ...anvas2d-base_rendering_context_2d.cc.patch |  6 +--
 ...canvas2d-base_rendering_context_2d.h.patch |  2 +-
 ...vas2d-canvas_rendering_context_2d.cc.patch |  4 +-
 ...r_request_media_key_system_access.cc.patch |  2 +-
 ...modules-mediastream-media_devices.cc.patch |  2 +-
 ...eerconnection-rtc_peer_connection.cc.patch | 18 +++----
 ...er-modules-webaudio-analyser_node.cc.patch |  2 +-
 ...rer-modules-webaudio-audio_buffer.cc.patch | 10 ++--
 ...erer-modules-webaudio-audio_buffer.h.patch |  2 +-
 ...bgl-webgl2_rendering_context_base.cc.patch |  8 ++--
 ...ebgl-webgl_rendering_context_base.cc.patch | 48 +++++++++----------
 ...tools-gritsettings-resource_ids.spec.patch |  4 +-
 ..._schema_compiler-feature_compiler.py.patch |  4 +-
 ...ls-metrics-histograms-histograms.xml.patch |  4 +-
 patches/ui-base-BUILD.gn.patch                |  4 +-
 patches/ui-native_theme-native_theme.h.patch  |  4 +-
 .../ui-native_theme-native_theme_mac.mm.patch |  4 +-
 .../ui-native_theme-native_theme_win.cc.patch |  4 +-
 .../ui-native_theme-native_theme_win.h.patch  |  4 +-
 ...ews-controls-button-md_text_button.h.patch |  2 +-
 ...es-cr_elements-shared_style_css.html.patch |  2 +-
 ...ces-cr_elements-shared_vars_css.html.patch |  2 +-
 209 files changed, 473 insertions(+), 472 deletions(-)

diff --git a/patches/android_webview-browser-cookie_manager.cc.patch b/patches/android_webview-browser-cookie_manager.cc.patch
index 411fd9fccbaa..8cc65abc6144 100644
--- a/patches/android_webview-browser-cookie_manager.cc.patch
+++ b/patches/android_webview-browser-cookie_manager.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/android_webview/browser/cookie_manager.cc b/android_webview/browser/cookie_manager.cc
-index 984dc5b55e1d75e2e408c4108baf1fd98d927de6..b092a1ff66365ff41485baa9f209ee38262eaf58 100644
+index 4344f15143f75d56a2253586792f7b644eaf25c4..9245d3e8dd35f5172f93fca36c6155e30a8a44bc 100644
 --- a/android_webview/browser/cookie_manager.cc
 +++ b/android_webview/browser/cookie_manager.cc
-@@ -438,7 +438,7 @@ void CookieManager::SetCookieHelper(const GURL& host,
+@@ -478,7 +478,7 @@ void CookieManager::SetCookieHelper(const GURL& host,
  
    net::CanonicalCookie::CookieInclusionStatus status;
    std::unique_ptr<net::CanonicalCookie> cc(
@@ -10,4 +10,4 @@ index 984dc5b55e1d75e2e408c4108baf1fd98d927de6..b092a1ff66365ff41485baa9f209ee38
 +      net::CanonicalCookie::Create(BRAVE_SETCOOKIEHELPER, new_host, value, base::Time::Now(),
                                     base::nullopt /* server_time */, &status));
  
-   if (!cc) {
+   if (!cc || !should_allow_cookie) {
diff --git a/patches/build-android-bytecode-BUILD.gn.patch b/patches/build-android-bytecode-BUILD.gn.patch
index a819071a212d..f1bf94db307f 100644
--- a/patches/build-android-bytecode-BUILD.gn.patch
+++ b/patches/build-android-bytecode-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn
-index 742a46b2ee7a1edb0f3e0be7db25e1486f3dde9a..4dbd10595f0eb0a94e2d373d224e4d13e1aa8cac 100644
+index 5d651d29e795f8116fedcf6b7370bcdcefef0ee9..9e3546ada8e63301a91bfaf0699f50fd860bff52 100644
 --- a/build/android/bytecode/BUILD.gn
 +++ b/build/android/bytecode/BUILD.gn
 @@ -16,6 +16,7 @@ java_binary("java_bytecode_rewriter") {
@@ -9,4 +9,4 @@ index 742a46b2ee7a1edb0f3e0be7db25e1486f3dde9a..4dbd10595f0eb0a94e2d373d224e4d13
 +  sources += brave_java_bytecode_files
    main_class = "org.chromium.bytecode.ByteCodeProcessor"
    deps = [
-     "//third_party/ow2_asm:asm_java",
+     "//third_party/android_deps:org_ow2_asm_asm_java",
diff --git a/patches/build-android-bytecode-java-org-chromium-bytecode-ByteCodeProcessor.java.patch b/patches/build-android-bytecode-java-org-chromium-bytecode-ByteCodeProcessor.java.patch
index 880174c6ca7d..b0a9038d742e 100644
--- a/patches/build-android-bytecode-java-org-chromium-bytecode-ByteCodeProcessor.java.patch
+++ b/patches/build-android-bytecode-java-org-chromium-bytecode-ByteCodeProcessor.java.patch
@@ -1,5 +1,5 @@
 diff --git a/build/android/bytecode/java/org/chromium/bytecode/ByteCodeProcessor.java b/build/android/bytecode/java/org/chromium/bytecode/ByteCodeProcessor.java
-index 4a56332c061a775dae854a1d2946c855c2f4f66c..682225913081bafd1f393ed8327240012304dfc6 100644
+index 2a4d08a8269b678e778f8d80b408368872d3f43e..7a3c9f97274da574987b47928411927b482c49f9 100644
 --- a/build/android/bytecode/java/org/chromium/bytecode/ByteCodeProcessor.java
 +++ b/build/android/bytecode/java/org/chromium/bytecode/ByteCodeProcessor.java
 @@ -136,6 +136,7 @@ class ByteCodeProcessor {
diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch
index 2b56d4b0c1ec..b2fe83a5847a 100644
--- a/patches/build-config-BUILDCONFIG.gn.patch
+++ b/patches/build-config-BUILDCONFIG.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index f89e7e831b79f82bd11a5dd8cee6ab49d8de724e..cfb776d73e625810a7f3a526ce512c6fdbbdafd8 100644
+index 11e0a21820f34ac99bc2e9322e0c8bd1314045c3..00551aeda7608149bfeff95587fb1cb7c8cc0b85 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
 @@ -419,6 +419,7 @@ set_sources_assignment_filter(sources_assignment_filter)
diff --git a/patches/build-config-android-BUILD.gn.patch b/patches/build-config-android-BUILD.gn.patch
index 41bc4576ee28..d46d5254b133 100644
--- a/patches/build-config-android-BUILD.gn.patch
+++ b/patches/build-config-android-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
-index 6d8bec8e71f0d80d6829fbe8a372abc01d691a81..9fcb132b0c37d4be5ce0430faafb815317e9812a 100644
+index 51230609a4d4e76d00ad629e2f4a1b2def019a9c..57f9ae3eefa3634b9e42706da506c403f654341c 100644
 --- a/build/config/android/BUILD.gn
 +++ b/build/config/android/BUILD.gn
 @@ -46,6 +46,7 @@ config("compiler") {
diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch
index c6de9ed90084..574fe434b241 100644
--- a/patches/build-config-android-config.gni.patch
+++ b/patches/build-config-android-config.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/config.gni b/build/config/android/config.gni
-index 5946af5ac7fe76098791770799c9386e860dfb9f..9ab07bdbbe29cd823d29e0005e9e8e96971109fd 100644
+index ccec0f165678faf53471eeef4bd223146a0c5593..d527eb75806d260cb5131ad593b78eaa18d8d37d 100644
 --- a/build/config/android/config.gni
 +++ b/build/config/android/config.gni
 @@ -3,6 +3,7 @@
diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch
index 32233f25e9e6..9730d048f55c 100644
--- a/patches/build-config-android-rules.gni.patch
+++ b/patches/build-config-android-rules.gni.patch
@@ -1,8 +1,8 @@
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
-index 50ca3ee5362e2e3f3a3ae295b757386ce3952a5b..7e5741e4ceee409d46d4e42874eda4018ac45180 100644
+index 899444d305628ff802bd24e647b907feefcce17a..9c587fe3e7c4a5132748187d304902b7f6f52eb1 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
-@@ -512,6 +512,7 @@ if (enable_java_templates) {
+@@ -513,6 +513,7 @@ if (enable_java_templates) {
    #   }
    template("java_cpp_enum") {
      set_sources_assignment_filter([])
@@ -10,7 +10,7 @@ index 50ca3ee5362e2e3f3a3ae295b757386ce3952a5b..7e5741e4ceee409d46d4e42874eda401
      action_with_pydeps(target_name) {
        forward_variables_from(invoker,
                               [
-@@ -630,6 +631,7 @@ if (enable_java_templates) {
+@@ -631,6 +632,7 @@ if (enable_java_templates) {
    #     output = "$target_gen_dir/AndroidManifest.xml"
    #   }
    template("jinja_template") {
diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch
index c54c72d967e1..605035444283 100644
--- a/patches/chrome-BUILD.gn.patch
+++ b/patches/chrome-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..a486a9238b6a1b7d935faefab2345922092cc864 100644
+index dc1faa8f3a75fa958201372f2df674c44a94b4e0..5d46f1c78ea615c0727d80b65fab54c9144ac718 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -184,6 +184,10 @@ if (!is_android && !is_mac) {
+@@ -169,6 +169,10 @@ if (!is_android && !is_mac) {
          "common/crash_keys.cc",
          "common/crash_keys.h",
        ]
@@ -13,7 +13,7 @@ index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..a486a9238b6a1b7d935faefab2345922
  
        deps += [
          ":chrome_dll",
-@@ -533,11 +537,12 @@ if (is_win) {
+@@ -511,11 +515,12 @@ if (is_win) {
        "--bundle_id=$chrome_mac_bundle_id",
      ]
    }
@@ -27,7 +27,7 @@ index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..a486a9238b6a1b7d935faefab2345922
      extra_substitutions = [
        "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
        "CHROMIUM_SHORT_NAME=$chrome_product_short_name",
-@@ -555,6 +560,7 @@ if (is_win) {
+@@ -533,6 +538,7 @@ if (is_win) {
        "//chrome/common:buildflags",
        "//chrome/common:version_header",
      ]
@@ -35,7 +35,7 @@ index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..a486a9238b6a1b7d935faefab2345922
  
      if (enable_stripping) {
        # At link time, preserve the global symbols specified in the .exports
-@@ -602,7 +608,7 @@ if (is_win) {
+@@ -580,7 +586,7 @@ if (is_win) {
      args =
          [
            "-b",
@@ -44,7 +44,7 @@ index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..a486a9238b6a1b7d935faefab2345922
            "-v",
            rebase_path(chrome_version_file, root_build_dir),
            "-g",
-@@ -671,6 +677,7 @@ if (is_win) {
+@@ -649,6 +655,7 @@ if (is_win) {
        # this dependency directly copies the file into the framework's
        # resources directory.
        public_deps += [ ":chrome_framework_widevine_signature" ]
@@ -52,7 +52,7 @@ index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..a486a9238b6a1b7d935faefab2345922
      }
    }
  
-@@ -707,6 +714,7 @@ if (is_win) {
+@@ -685,6 +692,7 @@ if (is_win) {
        "--scm=0",
      ]
    }
@@ -60,7 +60,7 @@ index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..a486a9238b6a1b7d935faefab2345922
  
    compile_entitlements("entitlements") {
      entitlements_templates = [ "app/app-entitlements.plist" ]
-@@ -725,7 +733,7 @@ if (is_win) {
+@@ -703,7 +711,7 @@ if (is_win) {
  
        output_name = chrome_helper_name + invoker.helper_name_suffix
  
@@ -69,7 +69,7 @@ index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..a486a9238b6a1b7d935faefab2345922
        extra_substitutions = [
          "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
          "CHROMIUM_SHORT_NAME=$chrome_product_short_name",
-@@ -1115,6 +1123,10 @@ if (is_win) {
+@@ -1098,6 +1106,10 @@ if (is_win) {
      if (is_chrome_branded) {
        deps += [ ":default_apps" ]
      }
@@ -80,7 +80,7 @@ index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..a486a9238b6a1b7d935faefab2345922
  
      ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ]
  
-@@ -1272,6 +1284,7 @@ if (is_win) {
+@@ -1255,6 +1267,7 @@ if (is_win) {
  
  group("browser_dependencies") {
    public_deps = [
@@ -88,7 +88,7 @@ index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..a486a9238b6a1b7d935faefab2345922
      "//chrome/browser",
      "//chrome/common",
      "//components/gwp_asan/buildflags",
-@@ -1344,12 +1357,13 @@ group("child_dependencies") {
+@@ -1327,12 +1340,13 @@ group("child_dependencies") {
        # this is OK because all of content is linked into one library.
        "//content/browser",
      ]
@@ -103,7 +103,7 @@ index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..a486a9238b6a1b7d935faefab2345922
      output = "$target_gen_dir/chrome_exe_version.rc"
    }
  
-@@ -1403,6 +1417,7 @@ group("resources") {
+@@ -1386,6 +1400,7 @@ group("resources") {
      "//chrome/browser:resources",
      "//chrome/common:resources",
      "//chrome/renderer:resources",
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index 1d3bf60e2810..976adb2c4aa4 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 4e235daa9ab5dda573e2d67d6c325547a43f40d9..4540e6500b67891f9772e359179b2219d6559383 100644
+index 6a560f9868c252f53eb02043e4112492e44c9a8d..074a8f25c9a0607f9b39303d5395a290b4e0fa37 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
- MAJOR=81
+ MAJOR=83
 -MINOR=0
--BUILD=4044
--PATCH=138
+-BUILD=4093
+-PATCH=3
 +MINOR=1
 +BUILD=11
 +PATCH=28
diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch
index c3a3de7dbc36..f6e97c7e2641 100644
--- a/patches/chrome-android-chrome_java_sources.gni.patch
+++ b/patches/chrome-android-chrome_java_sources.gni.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
-index 607431cbd9701a79ff0754e023e0c476e5677794..608186a05013f09a6286fcaa85c1648dce75fa98 100644
+index 35a702981dfb70eea12b112afa569cc2bbfb2c70..85d51e01dff87b6dd0cd2fae356f8bf0149b2264 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1876,3 +1876,4 @@ chrome_java_sources = [
+@@ -1875,3 +1875,4 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/widget/bottomsheet/EmptyBottomSheetObserver.java",
    "java/src/org/chromium/chrome/browser/widget/bottomsheet/TouchRestrictingFrameLayout.java",
  ]
diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch
index d3ae1a6dac22..05b49efd03e8 100644
--- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch
+++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
-index ccd57898df6b2c6c21f7838042da13d7a321a945..2969814626c0cb859fb75b691816b96842bfbd39 100644
+index a270ad9afc748f710582866a3c8018690d528722..467160e51d92be444d275a0bc77d7d4ceb4b4228 100644
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
-@@ -253,6 +253,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
+@@ -258,6 +258,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
        if (!defined(proguard_configs)) {
          proguard_configs = []
        }
diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch
index ce5b3b2e53e1..47d72c8c9238 100644
--- a/patches/chrome-android-java-AndroidManifest.xml.patch
+++ b/patches/chrome-android-java-AndroidManifest.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index 16820374338adc755e4795c1a8a07997cd620bac..a3c4d705ff3e338c7c8f0ae5f0f3cc5ef19e4653 100644
+index a18cd3d5572951b7bada82907e9eb48df5b47a3c..4aa022393170dee6afac8353fcf54cb0cb6c77d3 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
 @@ -34,7 +34,9 @@ by a child template that "extends" this file.
@@ -12,7 +12,7 @@ index 16820374338adc755e4795c1a8a07997cd620bac..a3c4d705ff3e338c7c8f0ae5f0f3cc5e
      <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
      <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
  
-@@ -43,22 +45,32 @@ by a child template that "extends" this file.
+@@ -43,23 +45,33 @@ by a child template that "extends" this file.
      {% if target_sdk_version|int > 27 or target_sdk_version == "Q" %}
          <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
      {% endif %}
@@ -35,6 +35,7 @@ index 16820374338adc755e4795c1a8a07997cd620bac..a3c4d705ff3e338c7c8f0ae5f0f3cc5e
 +<!--
      <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
 +-->
+     <uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
      <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
      <uses-permission android:name="android.permission.VIBRATE"/>
      <uses-permission android:name="android.permission.WAKE_LOCK"/>
@@ -45,7 +46,7 @@ index 16820374338adc755e4795c1a8a07997cd620bac..a3c4d705ff3e338c7c8f0ae5f0f3cc5e
      {% set enable_vr = enable_vr|default(0) %}
      {% if enable_vr == "true" %}
      <!-- Indicates use of Android's VR-mode, available only on Android N+. -->
-@@ -99,7 +111,9 @@ by a child template that "extends" this file.
+@@ -100,7 +112,9 @@ by a child template that "extends" this file.
      <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
      <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
  
@@ -55,7 +56,7 @@ index 16820374338adc755e4795c1a8a07997cd620bac..a3c4d705ff3e338c7c8f0ae5f0f3cc5e
  
      {% block extra_uses_permissions %}
      {% endblock %}
-@@ -125,6 +139,7 @@ by a child template that "extends" this file.
+@@ -126,6 +140,7 @@ by a child template that "extends" this file.
      <!-- Set android:largeHeap to "true" to allow more than the default
           Java heap limit (32Mb on Nexus S, 48Mb on Xoom). -->
      <application android:name="{% block application_name %}org.chromium.chrome.browser.ChromeApplication{% endblock %}"
@@ -63,7 +64,7 @@ index 16820374338adc755e4795c1a8a07997cd620bac..a3c4d705ff3e338c7c8f0ae5f0f3cc5e
          android:icon="@drawable/ic_launcher"
          android:roundIcon="@drawable/ic_launcher_round"
          android:label="{% block application_label %}@string/app_name{% endblock %}"
-@@ -175,6 +190,7 @@ by a child template that "extends" this file.
+@@ -176,6 +191,7 @@ by a child template that "extends" this file.
          <!-- ARCore APK integration -->
          <!-- This tag indicates that this application optionally uses ARCore. -->
          <meta-data android:name="com.google.ar.core" android:value="optional" />
@@ -71,7 +72,7 @@ index 16820374338adc755e4795c1a8a07997cd620bac..a3c4d705ff3e338c7c8f0ae5f0f3cc5e
          {% endif %}
  
          <!-- Cast support -->
-@@ -1290,6 +1306,7 @@ android:value="true" />
+@@ -1295,6 +1311,7 @@ android:value="true" />
          </activity>
          {% endif %}
  
diff --git a/patches/chrome-android-java-res-layout-bottom_toolbar_browsing.xml.patch b/patches/chrome-android-java-res-layout-bottom_toolbar_browsing.xml.patch
index bffb34e7851e..5901ab082ecf 100644
--- a/patches/chrome-android-java-res-layout-bottom_toolbar_browsing.xml.patch
+++ b/patches/chrome-android-java-res-layout-bottom_toolbar_browsing.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/res/layout/bottom_toolbar_browsing.xml b/chrome/android/java/res/layout/bottom_toolbar_browsing.xml
-index 76d517641db816c12bd35ae6497cd172eea71fd0..4eec0ef3fc85ebd5f604d5869f86827f38afab64 100644
+index 341f1563bd43eeb18d0b79a0d024613ae6e42643..97b06f3285973c08a13c1c4e195717d6237c5321 100644
 --- a/chrome/android/java/res/layout/bottom_toolbar_browsing.xml
 +++ b/chrome/android/java/res/layout/bottom_toolbar_browsing.xml
 @@ -16,9 +16,9 @@
@@ -12,7 +12,7 @@ index 76d517641db816c12bd35ae6497cd172eea71fd0..4eec0ef3fc85ebd5f604d5869f86827f
 -    <org.chromium.chrome.browser.toolbar.HomeButton
 +    <org.chromium.chrome.browser.toolbar.BraveHomeButton
          android:id="@+id/bottom_home_button"
-         app:tint="@color/standard_mode_tint"
+         app:tint="@color/default_icon_color_tint_list"
          android:background="?attr/selectableItemBackgroundBorderless"
 @@ -26,6 +26,7 @@
          android:visibility="gone"
diff --git a/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch b/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch
index 9e6fd96b2960..53ab4a9fc993 100644
--- a/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch
+++ b/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
-index d276ec4ae74d09539ab35ccd88144428a899122a..21213b2010e28b336457f85a20bee79532febe76 100644
+index 00a9c318afe2b53de0e6c8555770661fd6170671..b3bb40378590abaea76d5718dc2d556e1522a472 100644
 --- a/chrome/android/java/res/layout/custom_tabs_toolbar.xml
 +++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
 @@ -96,6 +96,7 @@
diff --git a/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch b/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch
index 2236058bd241..8859e3e0fd61 100644
--- a/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch
+++ b/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/res/layout/toolbar_tablet.xml b/chrome/android/java/res/layout/toolbar_tablet.xml
-index badef1f97ae8e327bd7ab35de032821f2696c4c2..55840f6f14f62b186bb47c3d7c1d52929049b13e 100644
+index 8367e2e163cbef9be4b6d381833ce844b334f5f3..918cff5e69c0eb86e8e6009a18f0fa011ed59251 100644
 --- a/chrome/android/java/res/layout/toolbar_tablet.xml
 +++ b/chrome/android/java/res/layout/toolbar_tablet.xml
 @@ -58,7 +58,7 @@
diff --git a/patches/chrome-android-java-res-menu-save_password_preferences_action_bar_menu.xml.patch b/patches/chrome-android-java-res-menu-save_password_preferences_action_bar_menu.xml.patch
index da4ffe830e93..9309498842c9 100644
--- a/patches/chrome-android-java-res-menu-save_password_preferences_action_bar_menu.xml.patch
+++ b/patches/chrome-android-java-res-menu-save_password_preferences_action_bar_menu.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml b/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml
-index b8c0531e19533e0028a12d4398a3c48ab47e850d..193a3b907908a66fd4e2dd564dddddec2a3a8df9 100644
+index 905341369bfbbfe5c25973bca6ce2bf93cf792aa..2c8a1ccdd23f978be7f37ed0608b3d30c1a9375d 100644
 --- a/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml
 +++ b/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml
 @@ -24,4 +24,5 @@
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch
index efbe9c59c11a..8f4f85b87b39 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
-index 8c911bb147aa87c45630a344e3fa047fa1635bf6..4e761461a7a38d4e40d5fd63467eb7e9663b3b03 100644
+index 7b4cd6251dee243fbc05166488170984f51ac52c..9e566d7aec63e6d5114443164658781df30709cf 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
-@@ -85,7 +85,7 @@ public abstract class AppHooks {
+@@ -80,7 +80,7 @@ public abstract class AppHooks {
  
      @CalledByNative
      public static AppHooks get() {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkAddEditFolderActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkAddEditFolderActivity.java.patch
index 006e60a569bf..6aa2588c6f8b 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkAddEditFolderActivity.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkAddEditFolderActivity.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddEditFolderActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddEditFolderActivity.java
-index 0a0334dbfa223b494c4967f40243c2b092e902ab..26a6356df1f832954a204790f2351c48f4f2513b 100644
+index 282df7b2516842a6d2b77edfb0c622848cefdb36..aa1ffdead63ded4d7ecd79da03863881327c583b 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddEditFolderActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddEditFolderActivity.java
-@@ -212,6 +212,7 @@ public class BookmarkAddEditFolderActivity extends SynchronousInitializationActi
+@@ -213,6 +213,7 @@ public class BookmarkAddEditFolderActivity extends SynchronousInitializationActi
              }
  
              BookmarkId newFolder = mModel.addFolder(mParentId, 0, mFolderTitle.getTrimmedText());
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkModel.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkModel.java.patch
index 02084ab7c204..9f9976eaf4e2 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkModel.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkModel.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java
-index 08a94f422fc800a031ef8d73d8ce0a30593c74cd..f65b5f3d49a520fd9b7d7a99e615078fadbdc1f2 100644
+index 4c0fd2469ed2308708d3945d0d05a9344afaab99..21dd779097d04ce143d6d52a95592466f63e4365 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java
 @@ -32,7 +32,7 @@ public class BookmarkModel extends BookmarkBridge {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch
index 9660a2b0c0ed..9280e280983f 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
-index 1065b4e1e97f4c48f16537ed86fe31dc5262c655..dbc855554f88efb387eb0e6e4fa3c058df0a29c9 100644
+index cbeeabca4d0f64b62cc1763bef7cd129953ac48a..d686abbca4076aa7e85f9b384d1184f2f65eec9e 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
 @@ -74,7 +74,7 @@ public class NotificationPlatformBridge {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch
index 3dd4e683d557..14f8b048e892 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
-index 77e782fe4391753187a7dd28fa7b4fc6ba2447c4..89a290a4a49bad3527e5cb3b92d1ffe8dec1e051 100644
+index b161fde9714c8780d223dcd5316f158f1aa67834..7fb5552ebf321828422392a2cd8453af4305d76d 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
-@@ -72,7 +72,7 @@ import org.chromium.ui.vr.VrModeObserver;
+@@ -73,7 +73,7 @@ import org.chromium.ui.vr.VrModeObserver;
   * Layout for the new tab page. This positions the page elements in the correct vertical positions.
   * There are no separate phone and tablet UIs; this layout adapts based on the available space.
   */
@@ -11,7 +11,7 @@ index 77e782fe4391753187a7dd28fa7b4fc6ba2447c4..89a290a4a49bad3527e5cb3b92d1ffe8
      private static final String TAG = "NewTabPageLayout";
      // Used to signify the cached resource value is unset.
      private static final int UNSET_RESOURCE_FLAG = -1;
-@@ -84,7 +84,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -85,7 +85,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
  
      private LogoView mSearchProviderLogoView;
      private SearchBoxContainerView mSearchBoxContainerView;
@@ -20,7 +20,7 @@ index 77e782fe4391753187a7dd28fa7b4fc6ba2447c4..89a290a4a49bad3527e5cb3b92d1ffe8
      private SiteSectionViewHolder mSiteSectionViewHolder;
      private ImageView mVoiceSearchButton;
      private View mTileGridPlaceholder;
-@@ -423,7 +423,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -427,7 +427,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
                  1f);
      }
  
@@ -29,7 +29,7 @@ index 77e782fe4391753187a7dd28fa7b4fc6ba2447c4..89a290a4a49bad3527e5cb3b92d1ffe8
          mSiteSectionView = SiteSection.inflateSiteSection(this);
          ViewGroup.LayoutParams layoutParams = mSiteSectionView.getLayoutParams();
          layoutParams.width = ViewGroup.LayoutParams.WRAP_CONTENT;
-@@ -788,7 +788,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -792,7 +792,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
          }
      }
  
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageView.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageView.java.patch
index 91d2a349baff..80d82d74daa2 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageView.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageView.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
-index 411094df3c36bd516d9c52f5c1d513cae33ec1b1..788880ab14f03edef191fae8792ded95a1a7f6cc 100644
+index 7a1b1b945f89bfe7bd25e1f837a5c43f5eadcabe..cd77cc5adc6d65f910b180792597ab1c7485b794 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
-@@ -199,6 +199,7 @@ public class NewTabPageView extends FrameLayout {
+@@ -198,6 +198,7 @@ public class NewTabPageView extends FrameLayout {
          mRecyclerView.setAdapter(newTabPageAdapter);
          mRecyclerView.getLinearLayoutManager().scrollToPosition(scrollPosition);
  
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-partnercustomizations-HomepageManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-partnercustomizations-HomepageManager.java.patch
index c9ea9acf19cc..b94f168a9c0f 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-partnercustomizations-HomepageManager.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-partnercustomizations-HomepageManager.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-index 6505f3816d61df3720f496f2e1ca68c904ab9cea..899b2c4b60970599d9952ae1752b3c164fd7e280 100644
+index 8aa5832190e8a11fbcb69eb570c8e7b15544f0f6..d390de93cd81bd90a3086bdee7aa2e4032025ef4 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-@@ -122,8 +122,9 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
+@@ -104,8 +104,9 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
       * @return Whether to close the app when the user has zero tabs.
       */
      public static boolean shouldCloseAppWithZeroTabs() {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch
index c283a464a5c1..9b71dd16402e 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
-index 0991b6499c42f846a3a80468ecc816ced513cfa9..3479ce29fdd76bfdf0019b8344fbfb0d2a5a358f 100644
+index 2f63df74c7a7444f81945854bebffb69db5cfa00..42102b76be4015d5ca216e19fc3f64af73076c78 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
-@@ -42,7 +42,7 @@ import java.util.Map;
+@@ -41,7 +41,7 @@ import java.util.Map;
  /**
   * The main settings screen, shown when the user first opens Settings.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch
index 52ee6947d5e3..fbc21b6f9259 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
-index adc23a019d6efc4d2e7400c8d47f8c89481cf154..5bf845b378aa7dd94d10944807962120f63feb01 100644
+index 92505eebfeb70fd4d1756887688d05996c4321f7..10c860e4a0cab72b57540c925e769a1630ec2fc3 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
-@@ -21,7 +21,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+@@ -28,7 +28,7 @@ import org.chromium.components.url_formatter.UrlFormatter;
  /**
   * Fragment that allows the user to configure homepage related preferences.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarColors.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarColors.java.patch
index 7877ca3547bb..85dc028ffafa 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarColors.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarColors.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarColors.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarColors.java
-index 0e615bb137cae9fdd3d35412896d8aa4d0a3cf6c..42a64a02d50a8f82010fea81314bf865091e3b52 100644
+index 37b5d7f0f0d1005024aa7e31e1c0bde65218e767..86183ab88d3d82c40a257715afab37dd7f7be468 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarColors.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarColors.java
-@@ -62,6 +62,7 @@ public class ToolbarColors {
+@@ -65,6 +65,7 @@ public class ToolbarColors {
              Resources res, int color, boolean isIncognito) {
          // Text box color on default toolbar background in incognito mode is a pre-defined
          // color. We calculate the equivalent opaque color from the pre-defined translucent color.
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch
index e4f8eb6c925d..d3cea2d31e43 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-CustomTabToolbar.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java
-index 9489efe02d0d49db6ff631071dd7a54cc3681044..ba061f530dd60e12a1ecd4963352d22cfd9579fa 100644
+index 0ff59706d94061d97e38ae5b64a6e54927282226..cea8a9960d02cdadef74708644402f44f4c7a4e9 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java
-@@ -86,7 +86,7 @@ import java.util.regex.Pattern;
+@@ -85,7 +85,7 @@ import java.util.regex.Pattern;
  /**
   * The Toolbar layout to be used for a custom tab. This is used for both phone and tablet UIs.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch
index 79a9f32dad1b..fc1bd30f9eee 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java
-index 369eadb04f79c569d7fdb6e1aa8171ccaf5a7e1a..40bf2ff54975fb2bc79ed26df8012fdfc7ce0fbd 100644
+index 8c96d2201c445dba9657db2ba90cb86cb7590a72..5cf8fa5d1d7fd175f92e78cce4211b36fcfff02a 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java
-@@ -280,6 +280,7 @@ public class TabSwitcherModeTTPhone extends OptimizedFrameLayout
+@@ -292,6 +292,7 @@ public class TabSwitcherModeTTPhone extends OptimizedFrameLayout
          if (BottomToolbarVariationManager.isTabSwitcherOnBottom() && !shouldShowIncognitoToggle()) {
              mToggleTabStackButton.setVisibility(isVisible ? GONE : VISIBLE);
          }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
index 524db1ac1583..516a60a2c197 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
-index 16c3b7687af097fcbade653cf7944f51ac3a5c89..959eb5501cf68f7c68f8ef86b548b7c5e06f7cd2 100644
+index 7ae3dad4ca2754573c56eea9419d7347771e8fcc..4ca44c8f49452be3f4bc5a28b1e20b6beb04fd8d 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 @@ -92,7 +92,7 @@ import java.util.List;
@@ -11,7 +11,7 @@ index 16c3b7687af097fcbade653cf7944f51ac3a5c89..959eb5501cf68f7c68f8ef86b548b7c5
                                                             NewTabPage.OnSearchBoxScrollListener,
                                                             TabCountObserver {
      /** The amount of time transitioning from one theme color to another should take in ms. */
-@@ -377,9 +377,11 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -378,9 +378,11 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
  
              setLayoutTransition(null);
  
@@ -23,7 +23,7 @@ index 16c3b7687af097fcbade653cf7944f51ac3a5c89..959eb5501cf68f7c68f8ef86b548b7c5
  
              inflateTabSwitchingResources();
  
-@@ -425,10 +427,12 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -426,10 +428,12 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
      /**
       * Set the background color of the location bar to appropriately match the theme color.
       */
@@ -37,15 +37,15 @@ index 16c3b7687af097fcbade653cf7944f51ac3a5c89..959eb5501cf68f7c68f8ef86b548b7c5
      }
  
      /**
-@@ -545,6 +549,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
-                         .notifyEvent(EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
+@@ -549,6 +553,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+                         EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
              }
          }
 +        super.onClick(v);
      }
  
      @Override
-@@ -711,7 +716,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -715,7 +720,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
       * @return The right bounds of the location bar after accounting for any visible left buttons.
       */
      private int getBoundsAfterAccountingForRightButtons() {
@@ -54,7 +54,7 @@ index 16c3b7687af097fcbade653cf7944f51ac3a5c89..959eb5501cf68f7c68f8ef86b548b7c5
      }
  
      private void updateToolbarBackground(int color) {
-@@ -2165,6 +2170,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -2171,6 +2176,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
          } else {
              populateUrlClearFocusingAnimatorSet(animators);
          }
@@ -62,7 +62,7 @@ index 16c3b7687af097fcbade653cf7944f51ac3a5c89..959eb5501cf68f7c68f8ef86b548b7c5
          mUrlFocusLayoutAnimator = new AnimatorSet();
          mUrlFocusLayoutAnimator.playTogether(animators);
  
-@@ -2839,6 +2845,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -2843,6 +2849,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
  
      @Override
      public void onBottomToolbarVisibilityChanged(boolean isVisible) {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
index ad6593493de1..54e0a53746be 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
-index 4e2bf88003aaf3429611bdfaa19f20afd9e9a817..dd4a2743da5c80f9926a754e21cce200b6337adb 100644
+index a10e0293764fcbc4fc5a981025488c241bf5be22..1ab74376505dd8e53a5ad0168874099e24dc70fe 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
-@@ -55,7 +55,7 @@ import java.util.Collection;
+@@ -56,7 +56,7 @@ import java.util.Collection;
   * The Toolbar object for Tablet screens.
   */
  @SuppressLint("Instantiatable")
@@ -11,7 +11,7 @@ index 4e2bf88003aaf3429611bdfaa19f20afd9e9a817..dd4a2743da5c80f9926a754e21cce200
          implements OnClickListener, View.OnLongClickListener, TabCountObserver {
      // The number of toolbar buttons that can be hidden at small widths (reload, back, forward).
      public static final int HIDEABLE_BUTTON_COUNT = 3;
-@@ -330,10 +330,12 @@ public class ToolbarTablet extends ToolbarLayout
+@@ -332,10 +332,12 @@ public class ToolbarTablet extends ToolbarLayout
              DownloadUtils.downloadOfflinePage(getContext(), getToolbarDataProvider().getTab());
              RecordUserAction.record("MobileToolbarDownloadPage");
          }
@@ -24,7 +24,7 @@ index 4e2bf88003aaf3429611bdfaa19f20afd9e9a817..dd4a2743da5c80f9926a754e21cce200
          String description = null;
          Context context = getContext();
          Resources resources = context.getResources();
-@@ -394,6 +396,7 @@ public class ToolbarTablet extends ToolbarLayout
+@@ -400,6 +402,7 @@ public class ToolbarTablet extends ToolbarLayout
          mLocationBar.getBackground().setColorFilter(textBoxColor, PorterDuff.Mode.SRC_IN);
  
          mLocationBar.updateVisualsForState();
diff --git a/patches/chrome-android-java_sources.gni.patch b/patches/chrome-android-java_sources.gni.patch
index 3997704d42f8..473b20447c2f 100644
--- a/patches/chrome-android-java_sources.gni.patch
+++ b/patches/chrome-android-java_sources.gni.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
-index 04e674ef22dc734a029b610b41a05a79992460e9..668ee2815bf7e36ef8ced0e2f2b6d71b0b78dcad 100644
+index b2f24064da7e3cd7b0283009c2d8c4ddd6fe6cd9..88911a437321cc7fc83cde137b2b5b2510f3bee1 100644
 --- a/chrome/android/java_sources.gni
 +++ b/chrome/android/java_sources.gni
-@@ -18,6 +18,7 @@ import("//components/offline_pages/buildflags/features.gni")
+@@ -20,6 +20,7 @@ import("//components/offline_pages/buildflags/features.gni")
  import("//device/vr/buildflags/buildflags.gni")
  
  chrome_java_sources += public_autofill_assistant_java_sources
diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch
index 2dd4f75e1339..c962a637e861 100644
--- a/patches/chrome-app-BUILD.gn.patch
+++ b/patches/chrome-app-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
-index 60dbc9e8c55f1f894ae21ddf10e69c12bc0614a6..bf333a6581ac9ef86061e69cfdd241add438b54d 100644
+index 71b39d448839289b827fc80c3dc590a06fa13da7..299dab18d9225a7ef2b5a7bf01e98b9cc66dbf90 100644
 --- a/chrome/app/BUILD.gn
 +++ b/chrome/app/BUILD.gn
 @@ -73,6 +73,8 @@ grit("generated_resources") {
diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
index 93f1b43f75ce..01fb59873b62 100644
--- a/patches/chrome-browser-BUILD.gn.patch
+++ b/patches/chrome-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 6f768f7848a3885d516e337bd413d91e02e6900a..90beb01f613d62dce221195cf1310592342288de 100644
+index 315b763a38e67ba9129b08060f2423d656712284..86102bd8f010d6d46dc074253b55ee616ff475dd 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2261,6 +2261,7 @@ jumbo_static_library("browser") {
+@@ -2289,6 +2289,7 @@ jumbo_static_library("browser") {
      "//ui/strings",
      "//ui/surface",
      "//ui/web_dialogs",
diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
index 230a9eb83640..ba41c8990ab4 100644
--- a/patches/chrome-browser-about_flags.cc.patch
+++ b/patches/chrome-browser-about_flags.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index cce40c115b4ecf3985aa5ec29b25b282300f4a1b..dc25ef13ca47f4c990a718e091f95a00b26c68fe 100644
+index 0524711d091a048fac36e6f43881a873c600bf89..bb389f2c1a648a79fc8d21a696cdec4653c802eb 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -288,14 +288,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
+@@ -286,14 +286,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
  const FeatureEntry::Choice kTraceUploadURL[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
      {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL,
@@ -21,7 +21,7 @@ index cce40c115b4ecf3985aa5ec29b25b282300f4a1b..dc25ef13ca47f4c990a718e091f95a00
  
  const FeatureEntry::Choice kPassiveListenersChoices[] = {
      {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -4937,6 +4937,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5140,6 +5140,7 @@ const FeatureEntry kFeatureEntries[] = {
      // Histograms" in tools/metrics/histograms/README.md (run the
      // AboutFlagsHistogramTest unit test to verify this process).
  
diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch
index d2748bbb58f7..02c9b3b8b607 100644
--- a/patches/chrome-browser-browser_process_impl.h.patch
+++ b/patches/chrome-browser-browser_process_impl.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
-index d17ae49bb3040bb9aaddd8e4801df874665451da..30e563fb311944c23f165f3a6759aa28aa6dfed1 100644
+index 46b91328b34cc502620fb6f5b76ed9d33bb23dfa..8703e8c71cf1701d51d260ef2de570f1961d2e0c 100644
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -195,6 +195,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -201,6 +201,7 @@ class BrowserProcessImpl : public BrowserProcess,
    static void RegisterPrefs(PrefRegistrySimple* registry);
  
   private:
diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch
index 4f78dbe8a298..e01df3da936c 100644
--- a/patches/chrome-browser-chrome_content_browser_client.h.patch
+++ b/patches/chrome-browser-chrome_content_browser_client.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
-index e4a98f0bb2f6a32617ce593127f5137c08b4f0af..1931e0c66ad427ef04e15a9ffda892e97def9a83 100644
+index ae86be8afe0f2bd2cb9969439c4fa67e7c3fc0d3..dc4685a3cb8493d53e3d8842b38c62c7a32bc9bc 100644
 --- a/chrome/browser/chrome_content_browser_client.h
 +++ b/chrome/browser/chrome_content_browser_client.h
-@@ -670,6 +670,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -683,6 +683,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
    }
  
   private:
diff --git a/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch b/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch
index b9462fb516b9..ccbd88ecfa88 100644
--- a/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch
+++ b/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc
-index 1610e0ecc707d91c1e67b5817776246c93ee7c4c..67deaf130cccaa3f86aba6d5e1fa47f3926ea043 100644
+index 937b56a2e2615d651b14ceceaeb67018830834b4..1253c31bb976413f6761320c8afc9f25614748f7 100644
 --- a/chrome/browser/content_settings/host_content_settings_map_factory.cc
 +++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc
-@@ -81,6 +81,7 @@ scoped_refptr<RefcountedKeyedService>
+@@ -83,6 +83,7 @@ scoped_refptr<RefcountedKeyedService>
  
    scoped_refptr<HostContentSettingsMap> settings_map(new HostContentSettingsMap(
        profile->GetPrefs(),
 +      BRAVE_BUILD_SERVICE_INSTANCE_FOR
        profile->IsIncognitoProfile() || profile->IsGuestSession(),
        /*store_last_modified=*/true,
-       base::FeatureList::IsEnabled(features::kPermissionDelegation)));
+       base::FeatureList::IsEnabled(
diff --git a/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch b/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch
index 3b3bbf410b31..e278f02c97e8 100644
--- a/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch
+++ b/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
-index df87f900a26327eb3438a6ee3bd24e87388ef138..6c5407459045032475cca495cab097cfb651d929 100644
+index d67358495046ade865a9643fef9fcb63236af057..2777112e6cc341216e7c84b5cc22814927991d48 100644
 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc
 +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
 @@ -240,6 +240,7 @@ bool TabSpecificContentSettings::IsContentBlocked(
diff --git a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch
index 21818c9446ac..aa96fe74934e 100644
--- a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch
+++ b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h
-index 914f104eba94284b5ce64be0b5e7c1014f63e1eb..82b9ba09154b5e87d86c61c00a9673225199b02d 100644
+index b3e3ad1d0bc9cb9e6f35774e229c4426afa6426a..90296f2b15e15f394d8b51ea4ea401633b35ae9c 100644
 --- a/chrome/browser/devtools/devtools_ui_bindings.h
 +++ b/chrome/browser/devtools/devtools_ui_bindings.h
-@@ -89,6 +89,9 @@ class DevToolsUIBindings : public DevToolsEmbedderMessageDispatcher::Delegate,
+@@ -90,6 +90,9 @@ class DevToolsUIBindings : public DevToolsEmbedderMessageDispatcher::Delegate,
    bool IsAttachedTo(content::DevToolsAgentHost* agent_host);
  
   private:
diff --git a/patches/chrome-browser-download-download_item_model.h.patch b/patches/chrome-browser-download-download_item_model.h.patch
index 0a9efdc52f52..c825f7a0c583 100644
--- a/patches/chrome-browser-download-download_item_model.h.patch
+++ b/patches/chrome-browser-download-download_item_model.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h
-index fafc8502127e3fea2007ba3b30b91fe708932c75..49c73246c95af21ece9bf8d9ee571c11152c6fe1 100644
+index f4d67705cb663a02b74db2266d62de1dffab3cb9..657cf43e16268c5cc7924f4f487d682171f9152f 100644
 --- a/chrome/browser/download/download_item_model.h
 +++ b/chrome/browser/download/download_item_model.h
 @@ -101,6 +101,7 @@ class DownloadItemModel : public DownloadUIModel,
diff --git a/patches/chrome-browser-extensions-component_loader.h.patch b/patches/chrome-browser-extensions-component_loader.h.patch
index dd1195435808..eaa0a5f8c96f 100644
--- a/patches/chrome-browser-extensions-component_loader.h.patch
+++ b/patches/chrome-browser-extensions-component_loader.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h
-index 8650fc4a236bb379747f4c7f603b6c1ff0ebbb79..62a843efc8e36f75e847eeeb49cc1891fabe530d 100644
+index bd89b71ddaebfefd5b5441a84c9b83e319192ecd..fd49fc159cbc2910f51b576fd041300a0f09a298 100644
 --- a/chrome/browser/extensions/component_loader.h
 +++ b/chrome/browser/extensions/component_loader.h
 @@ -81,7 +81,7 @@ class ComponentLoader {
@@ -11,7 +11,7 @@ index 8650fc4a236bb379747f4c7f603b6c1ff0ebbb79..62a843efc8e36f75e847eeeb49cc1891
  
    // Similar to above but adds the default component extensions for kiosk mode.
    void AddDefaultComponentExtensionsForKioskMode(bool skip_session_components);
-@@ -119,6 +119,7 @@ class ComponentLoader {
+@@ -128,6 +128,7 @@ class ComponentLoader {
    }
  
   private:
@@ -19,7 +19,7 @@ index 8650fc4a236bb379747f4c7f603b6c1ff0ebbb79..62a843efc8e36f75e847eeeb49cc1891
    FRIEND_TEST_ALL_PREFIXES(ComponentLoaderTest, ParseManifest);
  
    // Information about a registered component extension.
-@@ -164,6 +165,7 @@ class ComponentLoader {
+@@ -173,6 +174,7 @@ class ComponentLoader {
    void AddDefaultComponentExtensionsWithBackgroundPagesForKioskMode();
  
  #if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
diff --git a/patches/chrome-browser-extensions-extension_install_prompt.cc.patch b/patches/chrome-browser-extensions-extension_install_prompt.cc.patch
index 3df3b30dae40..117b001f0265 100644
--- a/patches/chrome-browser-extensions-extension_install_prompt.cc.patch
+++ b/patches/chrome-browser-extensions-extension_install_prompt.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
-index b03355f04f54ffe007d94a3899194e5117ea718f..7e8ac59546bb18a5c7cbebc0e7b11d877a95e493 100644
+index 081b1dba7c13c599c934b90a6473b52afc5f5f5a..45ed600f4c05545ae66fcd0298b497e38bdcc163 100644
 --- a/chrome/browser/extensions/extension_install_prompt.cc
 +++ b/chrome/browser/extensions/extension_install_prompt.cc
 @@ -13,6 +13,7 @@
@@ -9,8 +9,8 @@ index b03355f04f54ffe007d94a3899194e5117ea718f..7e8ac59546bb18a5c7cbebc0e7b11d87
 +#include "brave/browser/extensions/brave_extension_install_prompt.h"
  #include "chrome/browser/extensions/extension_install_prompt_show_params.h"
  #include "chrome/browser/extensions/extension_util.h"
- #include "chrome/browser/extensions/permissions_updater.h"
-@@ -507,7 +508,7 @@ void ExtensionInstallPrompt::ShowDialog(
+ #include "chrome/browser/profiles/profile.h"
+@@ -491,7 +492,7 @@ void ExtensionInstallPrompt::ShowDialog(
      const SkBitmap* icon,
      const ShowDialogCallback& show_dialog_callback) {
    ShowDialog(done_callback, extension, icon,
diff --git a/patches/chrome-browser-extensions-extension_service.h.patch b/patches/chrome-browser-extensions-extension_service.h.patch
index 91f0548bea76..f7fb9b31d836 100644
--- a/patches/chrome-browser-extensions-extension_service.h.patch
+++ b/patches/chrome-browser-extensions-extension_service.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
-index 61063f67183b3c0a7c215b60ead482df3b7cd7f1..761b55d501da658e6c2b35cdde8f96d39ed0d11c 100644
+index 01fd5e3d6bfc73c60aa843ec1668111a1542124c..3488afb5b15f566a78438df0862570b8ea68bc97 100644
 --- a/chrome/browser/extensions/extension_service.h
 +++ b/chrome/browser/extensions/extension_service.h
-@@ -415,6 +415,7 @@ class ExtensionService : public ExtensionServiceInterface,
+@@ -424,6 +424,7 @@ class ExtensionService : public ExtensionServiceInterface,
    }
  
   private:
diff --git a/patches/chrome-browser-extensions-extension_tab_util.cc.patch b/patches/chrome-browser-extensions-extension_tab_util.cc.patch
index e6d12d50e6bb..b13a04eb9dda 100644
--- a/patches/chrome-browser-extensions-extension_tab_util.cc.patch
+++ b/patches/chrome-browser-extensions-extension_tab_util.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
-index d94480c53ca2942ad318a9b00844f41ee03ffcbf..f61c5877fe50843628c4415fc0468db4bb3954d5 100644
+index b9ad3a7dea2e9201535b4c6b57c21ed6fae6dc69..b5a0be1361701aa7485af8cfc42ac1542377be75 100644
 --- a/chrome/browser/extensions/extension_tab_util.cc
 +++ b/chrome/browser/extensions/extension_tab_util.cc
-@@ -763,6 +763,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
+@@ -767,6 +767,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
    GURL fixed_url =
        url_formatter::FixupURL(url.possibly_invalid_spec(), std::string());
    if (!fixed_url.SchemeIs(content::kChromeUIScheme))
diff --git a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch
index 14dfefa50ecf..9fd3f256fdea 100644
--- a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch
+++ b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc
-index 3af4b53b21c8969bdfb211ac98309698191d5dc2..f6e655078066fa254c52c333c562888b655c64d3 100644
+index e4f2b124ccbde7b7bff73087da1de4a6d50708fa..d58443790c3ae0b7c03e9be9b6832798f6028828 100644
 --- a/chrome/browser/external_protocol/external_protocol_handler.cc
 +++ b/chrome/browser/external_protocol/external_protocol_handler.cc
 @@ -240,7 +240,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
diff --git a/patches/chrome-browser-importer-importer_list.cc.patch b/patches/chrome-browser-importer-importer_list.cc.patch
index 0fa5a5dff0ec..bb1410c3c9d8 100644
--- a/patches/chrome-browser-importer-importer_list.cc.patch
+++ b/patches/chrome-browser-importer-importer_list.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc
-index c5ad71a4002d7926cc05e3928e486cf8275d5d2d..0295370bb56fca72725c5f5c69595fc630b55560 100644
+index 230fb4b17037b9bbd26d1d4ca990d1e106f0c7d8..c53343bfc7baa9ea8df88273a2d15b2ec2eb5247 100644
 --- a/chrome/browser/importer/importer_list.cc
 +++ b/chrome/browser/importer/importer_list.cc
-@@ -151,20 +151,30 @@ std::vector<importer::SourceProfile> DetectSourceProfilesWorker(
+@@ -156,20 +156,30 @@ std::vector<importer::SourceProfile> DetectSourceProfilesWorker(
    if (shell_integration::IsFirefoxDefaultBrowser()) {
      DetectFirefoxProfiles(locale, &profiles);
      DetectBuiltinWindowsProfiles(&profiles);
diff --git a/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch b/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch
index 2e2da6485760..4bc850f97f26 100644
--- a/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch
+++ b/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-index 1b386f4a80396229c4c82961ba26bb972ba64d47..32726cb50c9b070abd5e75222f2c5facd0450223 100644
+index 61851b8c669f674aab76ebdbb97fffaf438bfbff..84f3f51903b5d26d00501aedd471a2dfe20dbc28 100644
 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
 +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
 @@ -442,6 +442,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) {
diff --git a/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch b/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch
index 17234125c228..9c94af4915fd 100644
--- a/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch
+++ b/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
-index 93d38754f6dc2fcf99e00f6bc947f4db91c50af3..babb86f791802f0d73efe6dad0dbb6a598af8030 100644
+index c75a9c8727d566512c210297707f10262c907f01..c83aa3c92c5cbd549db8d93ba5219696fd1ebf52 100644
 --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
 @@ -153,7 +153,7 @@ class ChromeMetricsServicesManagerClient::ChromeEnabledStateProvider
diff --git a/patches/chrome-browser-net-system_network_context_manager.cc.patch b/patches/chrome-browser-net-system_network_context_manager.cc.patch
index 1a177c50f4c0..b7017f489180 100644
--- a/patches/chrome-browser-net-system_network_context_manager.cc.patch
+++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
-index 1921496a0af79638f0f294b9dff4c1332dd17b0f..979aac6f49a2bcb19e6675deb85a8e184843698e 100644
+index 0ce4445b906e28b680d177c96c1f8b8a467d19b5..b6f675f5f5b5c1219879eff372cc9d766dcb64c7 100644
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -247,7 +247,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
+@@ -253,7 +253,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
      if (!manager_)
        return;
      manager_->GetURLLoaderFactory()->CreateLoaderAndStart(
diff --git a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch
index 8a1c98e230f2..520c3f4fb787 100644
--- a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch
+++ b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/notifications/notification_display_service_impl.cc b/chrome/browser/notifications/notification_display_service_impl.cc
-index ba53f33407995b07a31349c9356a064e10d965c2..7164061f6208c333cc105b6cda7ecb93405e206c 100644
+index 43ade6a5f34429089042766b09e858cdf594024b..39c6aa6b63d63f61e19ffd72d7565685a0625e59 100644
 --- a/chrome/browser/notifications/notification_display_service_impl.cc
 +++ b/chrome/browser/notifications/notification_display_service_impl.cc
-@@ -141,6 +141,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile)
+@@ -167,6 +167,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile)
      AddNotificationHandler(NotificationHandler::Type::ANNOUNCEMENT,
                             std::make_unique<AnnouncementNotificationHandler>());
  #endif
diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch
index a252aadb85a0..a40663465f59 100644
--- a/patches/chrome-browser-prefs-browser_prefs.cc.patch
+++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 135f34dbfd00ea86128c4c04cec5ee623635d0db..fcf25fdea2aba6bdb652efee3b14e29caa3a784b 100644
+index 06574f36a167f7f28cfe6af007022737e17502fc..1f4ce00281e7a9d53e4bf2d22e629e1c89ac06b9 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -789,6 +789,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -819,6 +819,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
  #if defined(TOOLKIT_VIEWS)
    RegisterBrowserViewLocalPrefs(registry);
  #endif
@@ -10,7 +10,7 @@ index 135f34dbfd00ea86128c4c04cec5ee623635d0db..fcf25fdea2aba6bdb652efee3b14e29c
  
    // Obsolete. See MigrateObsoleteBrowserPrefs().
    registry->RegisterBooleanPref(kGCMChannelStatus, true);
-@@ -1040,6 +1041,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1083,6 +1084,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
  #endif
  
    RegisterProfilePrefsForMigration(registry);
diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch
index 74aabe91d538..20032999820c 100644
--- a/patches/chrome-browser-profiles-profile.cc.patch
+++ b/patches/chrome-browser-profiles-profile.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index cf93dac2f899b9eabcea259261b3e5a4bcbf0c77..f2b9700266ec74f5f3127f79172217666d594d58 100644
+index 03f65f93fe57613431edd85fad2ac79cd5a656be..cd948b1921a1edaf86e6f3ee8c42c3791ac7b194 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -149,7 +149,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
+@@ -184,7 +184,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
  void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kSearchSuggestEnabled,
diff --git a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch
index ba630d938566..eec2da301967 100644
--- a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch
+++ b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc
-index 6b69897a882423a5f14c000d9e67a2bc58066f89..89b339c9743e86cdcf78576401b1d41b062a2954 100644
+index 41ca7894eae730143f5363bc2397f178a79157f2..b4140d133de6bf78fdef4ad4a5fc7e414b6d33de 100644
 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc
 +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc
-@@ -316,7 +316,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
+@@ -318,7 +318,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
  #elif defined(OS_CHROMEOS)
  constexpr size_t kDefaultAvatarIconsCount = 27;
  #else
@@ -11,7 +11,7 @@ index 6b69897a882423a5f14c000d9e67a2bc58066f89..89b339c9743e86cdcf78576401b1d41b
  #endif
  
  #if !defined(OS_ANDROID)
-@@ -446,6 +446,7 @@ size_t GetPlaceholderAvatarIndex() {
+@@ -448,6 +448,7 @@ size_t GetPlaceholderAvatarIndex() {
  
  size_t GetModernAvatarIconStartIndex() {
  #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
@@ -19,7 +19,7 @@ index 6b69897a882423a5f14c000d9e67a2bc58066f89..89b339c9743e86cdcf78576401b1d41b
    return GetPlaceholderAvatarIndex() + 1;
  #else
    // Only use the placeholder avatar on ChromeOS and Android.
-@@ -471,6 +472,7 @@ std::string GetPlaceholderAvatarIconUrl() {
+@@ -473,6 +474,7 @@ std::string GetPlaceholderAvatarIconUrl() {
  
  const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) {
    CHECK_LT(index, kDefaultAvatarIconsCount);
diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch
index 9564dd2e2c05..b2af8072b3f2 100644
--- a/patches/chrome-browser-profiles-profile_impl.cc.patch
+++ b/patches/chrome-browser-profiles-profile_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
-index a3b0b35ae4033b6870602ef61a12f5b962d3e4e7..c6d82846b27ce6fbb74584a1d03552776bf82df5 100644
+index 21cdcfacffb66826a90f7dbd81d9259c045a2b5e..b717fce626e35d51a7eee11ec28ec177e3ba48a7 100644
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -354,7 +354,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
+@@ -355,7 +355,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
      NOTREACHED();
    }
  
diff --git a/patches/chrome-browser-profiles-profile_impl.h.patch b/patches/chrome-browser-profiles-profile_impl.h.patch
index 927098cbbefd..b1e3d8ddabf5 100644
--- a/patches/chrome-browser-profiles-profile_impl.h.patch
+++ b/patches/chrome-browser-profiles-profile_impl.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
-index c9807293b3f476d5895d52f5082d7281bf0dd046..b3b8cd51c5577306f6561fb8d7e235c4499a53cd 100644
+index 326e2e98dd8feede2e560bef13e140a72b654e2d..d8f46435e7d34af3a3bb31b4fb7a45c6b69c26e2 100644
 --- a/chrome/browser/profiles/profile_impl.h
 +++ b/chrome/browser/profiles/profile_impl.h
-@@ -169,6 +169,7 @@ class ProfileImpl : public Profile {
+@@ -163,6 +163,7 @@ class ProfileImpl : public Profile {
    void OnLogin() override;
    void InitChromeOSPreferences() override;
  #endif  // defined(OS_CHROMEOS)
diff --git a/patches/chrome-browser-profiles-profile_io_data.cc.patch b/patches/chrome-browser-profiles-profile_io_data.cc.patch
index 881661433f4b..82c2daa26ce6 100644
--- a/patches/chrome-browser-profiles-profile_io_data.cc.patch
+++ b/patches/chrome-browser-profiles-profile_io_data.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
-index f339f695196a3026cdccb0f49f7598f559d4b3dc..22377adb67528d67b7f3146af556711b5f536bda 100644
+index cc6956e363eb19674e8e44279520fb045b357d3a..89f1416b44d8ec9a3fe3eacba251ddddfbd12aca 100644
 --- a/chrome/browser/profiles/profile_io_data.cc
 +++ b/chrome/browser/profiles/profile_io_data.cc
-@@ -299,6 +299,9 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) {
+@@ -307,6 +307,9 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) {
  #endif
      content::kChromeUIScheme,
      content::kChromeUIUntrustedScheme,
diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch
index 06031eba876e..334679c04e34 100644
--- a/patches/chrome-browser-profiles-profile_manager.h.patch
+++ b/patches/chrome-browser-profiles-profile_manager.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
-index f4c3c9e25190f0734f5fc585d706ffdb221d6264..cef7b27f8c7646ea3d75107005e1f84235f792ff 100644
+index 3e1e28ea7d0e9c90d0c2189dae6ba6a394582aac..e67f1e0d57cfd01f56a0291fd2d3cff8c86b1180 100644
 --- a/chrome/browser/profiles/profile_manager.h
 +++ b/chrome/browser/profiles/profile_manager.h
 @@ -148,7 +148,7 @@ class ProfileManager : public content::NotificationObserver,
@@ -36,7 +36,7 @@ index f4c3c9e25190f0734f5fc585d706ffdb221d6264..cef7b27f8c7646ea3d75107005e1f842
    void DoFinalInitForServices(Profile* profile, bool go_off_the_record);
    void DoFinalInitLogging(Profile* profile);
  
-@@ -358,7 +360,7 @@ class ProfileManager : public content::NotificationObserver,
+@@ -361,7 +363,7 @@ class ProfileManager : public content::NotificationObserver,
  
    // Apply settings for profiles created by the system rather than users: The
    // (desktop) Guest User profile and (desktop) System Profile.
diff --git a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch
index 83100058397c..c6763c61abb2 100644
--- a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch
+++ b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
-index 828e3128e1cec0a700727a9fbfc71b0f78da1efd..ef61509e3e30cc4bce7c78f4cdf773eec060c4f9 100644
+index 6b9b87e01feba44261ba68776ae17e0be82b8ee0..f10fb1827bd6cb7e9ff7a9db167d431566e6c631 100644
 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
 +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
-@@ -724,7 +724,7 @@ bool ProfileShortcutManager::IsFeatureEnabled() {
+@@ -726,7 +726,7 @@ bool ProfileShortcutManager::IsFeatureEnabled() {
  // static
  std::unique_ptr<ProfileShortcutManager> ProfileShortcutManager::Create(
      ProfileManager* manager) {
diff --git a/patches/chrome-browser-profiles-profile_window.h.patch b/patches/chrome-browser-profiles-profile_window.h.patch
index 766a24efa1ca..4fdeeaa8b3c9 100644
--- a/patches/chrome-browser-profiles-profile_window.h.patch
+++ b/patches/chrome-browser-profiles-profile_window.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/profiles/profile_window.h b/chrome/browser/profiles/profile_window.h
-index 00014301cdb506f01e0c6632c8d35b8ea7f40584..1d01d4e519c0c8705ce5c21eb28b99351115c706 100644
+index 6ba35ca6f4384892e87a132567fda82834d62b36..b17f08c9bbf4fc03ee328c34e7183037b484da13 100644
 --- a/chrome/browser/profiles/profile_window.h
 +++ b/chrome/browser/profiles/profile_window.h
-@@ -87,6 +87,7 @@ void SwitchToProfile(const base::FilePath& path,
+@@ -85,6 +85,7 @@ void SwitchToProfile(const base::FilePath& path,
  
  // Opens a Browser for the guest profile and runs |callback| if it isn't null.
  void SwitchToGuestProfile(ProfileManager::CreateCallback callback);
@@ -10,7 +10,7 @@ index 00014301cdb506f01e0c6632c8d35b8ea7f40584..1d01d4e519c0c8705ce5c21eb28b9935
  
  // Returns true if |profile| has potential profile switch targets, ie there's at
  // least one other profile available to switch to, not counting guest. This is
-@@ -103,6 +104,7 @@ void CreateAndSwitchToNewProfile(ProfileManager::CreateCallback callback,
+@@ -101,6 +102,7 @@ void CreateAndSwitchToNewProfile(ProfileManager::CreateCallback callback,
  // Closes all browser windows that belong to the guest profile and opens the
  // user manager.
  void CloseGuestProfileWindows();
diff --git a/patches/chrome-browser-profiles-renderer_updater.cc.patch b/patches/chrome-browser-profiles-renderer_updater.cc.patch
index 449e05fe9136..8f40dd840c06 100644
--- a/patches/chrome-browser-profiles-renderer_updater.cc.patch
+++ b/patches/chrome-browser-profiles-renderer_updater.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profiles/renderer_updater.cc
-index ce50c9ee3f9290b50b4a5704e8eec9dc91db3082..5f39cd1420b433ca5321b18dfc6a3cdc5d2c8128 100644
+index c1792eccd997c7801644999554027999559678c6..26c09934403c68d3b8ce79521133edf11c63eec6 100644
 --- a/chrome/browser/profiles/renderer_updater.cc
 +++ b/chrome/browser/profiles/renderer_updater.cc
 @@ -55,6 +55,7 @@ void GetGuestViewDefaultContentSettingRules(
diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch
index 5677f47c5bd4..3c89e41330af 100644
--- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch
+++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h
-index 6a37951fff89d6bf2ae28e26364d369c240950a7..c600845c8a659d3ee5ff7b1db20f48c7127be70d 100644
+index 299d5f6e33880c7ec2ea7ee6df99e93e06120cd9..d351d2eb7e7ca7cec3cda4d8e02d688c1c4c1e1d 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
-@@ -116,6 +116,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
+@@ -115,6 +115,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
    // Returns true if keyboard lock is active and requires the user to press and
    // hold escape to exit exclusive access mode.
    bool IsPressAndHoldEscRequiredToExitFullscreen() const;
diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch
index 6df14b1c7493..a92529bc65f8 100644
--- a/patches/chrome-browser-resources-extensions-BUILD.gn.patch
+++ b/patches/chrome-browser-resources-extensions-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn
-index fd049191b64dc6604ca6676f039637a99299e28b..2d20a4a68e837d70cf674f9314372daa1cfd8cfe 100644
+index 6b89fa93ad22453aa39a55ed7c97623fa9adb5da..2deee47536ad9ef9c1583656dbf0214ec6dbb9df 100644
 --- a/chrome/browser/resources/extensions/BUILD.gn
 +++ b/chrome/browser/resources/extensions/BUILD.gn
 @@ -21,6 +21,7 @@ if (optimize_webui) {
diff --git a/patches/chrome-browser-resources-history-history_item.html.patch b/patches/chrome-browser-resources-history-history_item.html.patch
index 8eda6eca9808..654046ac5114 100644
--- a/patches/chrome-browser-resources-history-history_item.html.patch
+++ b/patches/chrome-browser-resources-history-history_item.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/history/history_item.html b/chrome/browser/resources/history/history_item.html
-index e4b706737d1865ce183ae7a47ce33a1184424c9c..d289108dbde8ebb5045e6df1b833149535a93c37 100644
+index d83a93155188dba679af6ddda1b880949a69cfb3..9331a87f3543b1af4d29de4aafadb06638040587 100644
 --- a/chrome/browser/resources/history/history_item.html
 +++ b/chrome/browser/resources/history/history_item.html
 @@ -1,4 +1,4 @@
diff --git a/patches/chrome-browser-resources-optimize_webui.py.patch b/patches/chrome-browser-resources-optimize_webui.py.patch
index 2396714eb72f..48ad22272a29 100644
--- a/patches/chrome-browser-resources-optimize_webui.py.patch
+++ b/patches/chrome-browser-resources-optimize_webui.py.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/optimize_webui.py b/chrome/browser/resources/optimize_webui.py
-index 5c11a65a912faacc7378e640fadbd59d063a5c1b..5c918403669fb376ee5462312d56474b4aebfd7b 100755
+index 388cb640460ed60113b18b68cdf318856d9b31a2..eaa2c802661f493c09bccb451a4c5216180b9738 100755
 --- a/chrome/browser/resources/optimize_webui.py
 +++ b/chrome/browser/resources/optimize_webui.py
 @@ -56,6 +56,8 @@ _POLYMER_PATH = os.path.join(
diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch
index cf7e50ac61e6..3274d4582ae1 100644
--- a/patches/chrome-browser-resources-settings-BUILD.gn.patch
+++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
-index 2bad8ac9896a368a290c250b66cdcc7b05d5fb76..7df1d7f95c28dbba97bd8f0a5b1b26f5db6bd29e 100644
+index 322c20ac2bfd315ff9c7d2dcedab385a99fda98a..0bbed59556e3642b0e0cf8ab268daaec792b771c 100644
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
-@@ -33,6 +33,7 @@ if (optimize_webui) {
+@@ -34,6 +34,7 @@ if (optimize_webui) {
      excludes = [ "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html" ]
  
      deps = [ ":unpak" ]
 +    deps += [ "//brave/browser/resources/settings:unpak" ]
    }
  
-   unpak("unpak") {
+   optimize_webui("build_polymer3") {
diff --git a/patches/chrome-browser-resources-settings-about_page-about_page.html.patch b/patches/chrome-browser-resources-settings-about_page-about_page.html.patch
index 1f1f78e0ddf1..f4ffec21acee 100644
--- a/patches/chrome-browser-resources-settings-about_page-about_page.html.patch
+++ b/patches/chrome-browser-resources-settings-about_page-about_page.html.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chrome/browser/resources/settings/about_page/about_page.html
-index 49ab7921614751518152ed49ddfaf18dbc4cf03b..dfeae6ef2dec1fb68a2b5c9b5bc840af733f11bd 100644
+index 1bfdc6f23013f631032b50cdbd0c5d8d42b5c90e..eb89c751d558cdf66d8440fc0f33a6ff6b7c7afd 100644
 --- a/chrome/browser/resources/settings/about_page/about_page.html
 +++ b/chrome/browser/resources/settings/about_page/about_page.html
-@@ -107,7 +107,7 @@
+@@ -108,7 +108,7 @@
              </div>
              <a hidden$="[[!shouldShowLearnMoreLink_(
                  currentUpdateStatusEvent_)]]" target="_blank"
diff --git a/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch b/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch
index 20b547272f4d..cad94400de7f 100644
--- a/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch
+++ b/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/appearance_page/appearance_page.html b/chrome/browser/resources/settings/appearance_page/appearance_page.html
-index bdbf90e2482d817ca0cfddb1fe5b0d7c1de58258..9bb5d2a70a62848821d5a2189ad0de096279a3c1 100644
+index fc68a42c1a6e349bbbba7170506cac1f250b25de..b2e30e892ce0bda3131aa9eef2a51aad41e09f57 100644
 --- a/chrome/browser/resources/settings/appearance_page/appearance_page.html
 +++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html
-@@ -18,6 +18,12 @@
+@@ -21,6 +21,12 @@
  <link rel="import" href="../settings_vars_css.html">
  <link rel="import" href="home_url_input.html">
  
@@ -15,7 +15,7 @@ index bdbf90e2482d817ca0cfddb1fe5b0d7c1de58258..9bb5d2a70a62848821d5a2189ad0de09
  <dom-module id="settings-appearance-page">
    <template>
      <style include="settings-shared md-select iron-flex">
-@@ -44,6 +50,9 @@
+@@ -47,6 +53,9 @@
      <settings-animated-pages id="pages" section="appearance"
          focus-config="[[focusConfig_]]">
        <div route-path="default">
@@ -25,7 +25,7 @@ index bdbf90e2482d817ca0cfddb1fe5b0d7c1de58258..9bb5d2a70a62848821d5a2189ad0de09
          <div class="settings-row continuation" id="themeRow"
              hidden="[[!pageVisibility.setTheme]]">
            <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
-@@ -116,6 +125,9 @@
+@@ -119,6 +128,9 @@
              </settings-radio-group>
            </div>
          </template>
diff --git a/patches/chrome-browser-resources-settings-lifetime_browser_proxy.js.patch b/patches/chrome-browser-resources-settings-lifetime_browser_proxy.js.patch
index 216236eca75d..862567f0d2b9 100644
--- a/patches/chrome-browser-resources-settings-lifetime_browser_proxy.js.patch
+++ b/patches/chrome-browser-resources-settings-lifetime_browser_proxy.js.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/lifetime_browser_proxy.js b/chrome/browser/resources/settings/lifetime_browser_proxy.js
-index dae61c384ea5472bb178c855daf314284d023377..cb4a029ffdcb68f0a73f53e9bc8e975aa9df65a4 100644
+index d109348290ecf852da38a0da26abac5798f9d89c..1b825fde7f16f17a6d75126a8cb1670e47314d05 100644
 --- a/chrome/browser/resources/settings/lifetime_browser_proxy.js
 +++ b/chrome/browser/resources/settings/lifetime_browser_proxy.js
-@@ -11,6 +11,13 @@ cr.define('settings', function() {
+@@ -15,6 +15,13 @@ cr.define('settings', function() {
      // Triggers a browser relaunch.
      relaunch() {}
  
@@ -16,7 +16,7 @@ index dae61c384ea5472bb178c855daf314284d023377..cb4a029ffdcb68f0a73f53e9bc8e975a
      // <if expr="chromeos">
      // First signs out current user and then performs a restart.
      signOutAndRestart() {}
-@@ -39,6 +46,13 @@ cr.define('settings', function() {
+@@ -41,6 +48,13 @@ cr.define('settings', function() {
        chrome.send('relaunch');
      }
  
diff --git a/patches/chrome-browser-resources-settings-page_visibility.html.patch b/patches/chrome-browser-resources-settings-page_visibility.html.patch
index 3176a99f50c3..7ee45feb98df 100644
--- a/patches/chrome-browser-resources-settings-page_visibility.html.patch
+++ b/patches/chrome-browser-resources-settings-page_visibility.html.patch
@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/resources/settings/page_visibility.html b/chrome/browser/resources/settings/page_visibility.html
-index 8ea50773be028e98aa2d4f90477a05f69f5a476e..6f8314a72295c599bdf97831436562c205509f61 100644
+index e0d41b12cc6c46ee7906f0ff24ffe246af695b28..66e5b935db4f15c5c69d0bd2ea403f18ef834877 100644
 --- a/chrome/browser/resources/settings/page_visibility.html
 +++ b/chrome/browser/resources/settings/page_visibility.html
-@@ -1,3 +1,4 @@
- <link rel="import" href="chrome://resources/html/cr.html">
+@@ -2,3 +2,4 @@
+ <link rel="import" href="i18n_setup.html">
  
  <script src="page_visibility.js"></script>
 +<script src="brave_page_visibility.js"></script>
diff --git a/patches/chrome-browser-resources-settings-people_page-people_page.html.patch b/patches/chrome-browser-resources-settings-people_page-people_page.html.patch
index 6000d7ac3bad..6664889c888b 100644
--- a/patches/chrome-browser-resources-settings-people_page-people_page.html.patch
+++ b/patches/chrome-browser-resources-settings-people_page-people_page.html.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
-index 86eb5d3dc664afd86b315d8d35ca61336d0fe3bf..ef9507f7708e86c802cac961301351c70a2820e0 100644
+index 7080cadeae9e73f2881060021f89085a2de0b20e..960fff03b16a2c9ff27a9530291e99ceef7d1ccf 100644
 --- a/chrome/browser/resources/settings/people_page/people_page.html
 +++ b/chrome/browser/resources/settings/people_page/people_page.html
-@@ -156,12 +156,14 @@
+@@ -147,12 +147,14 @@
            </div>
          </template> <!-- if="[[!shouldShowSyncAccountControl_()]]" -->
  
diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch
index 6046bf247277..1dbc95e6c478 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.html b/chrome/browser/resources/settings/privacy_page/personalization_options.html
-index 4bf9895408296493db9aaff1e9e3094786464cd7..8abb10b5d2eec14d7ac09e457b1a9c6ed0f5abfe 100644
+index 872970e6dcd5dc83ee4180748be4be86c6850e6d..97afb44b4316181f979a6dca88feec1d29002f9a 100644
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
 @@ -15,6 +15,7 @@
@@ -42,15 +42,15 @@ index 4bf9895408296493db9aaff1e9e3094786464cd7..8abb10b5d2eec14d7ac09e457b1a9c6e
  <if expr="chromeos">
      <settings-toggle-button pref="{{prefs.cros.metrics.reportingEnabled}}"
 @@ -64,6 +70,8 @@
-         sub-label="$i18n{enableLoggingDesc}">
+         sub-label="$i18n{enablePersonalizationLoggingDesc}">
      </settings-toggle-button>
  </if><!-- chromeos -->
 +</if><!-- _google_chrome -->
 +<if expr="_chromium">
  <if expr="not chromeos">
      <settings-toggle-button id="metricsReportingControl"
-         pref="[[metricsReportingPref_]]" label="$i18n{enableLogging}"
-@@ -77,12 +85,14 @@
+         pref="[[metricsReportingPref_]]"
+@@ -78,12 +86,14 @@
        </template>
      </settings-toggle-button>
  </if><!-- not chromeos -->
@@ -66,7 +66,7 @@ index 4bf9895408296493db9aaff1e9e3094786464cd7..8abb10b5d2eec14d7ac09e457b1a9c6e
  <if expr="_google_chrome">
      <settings-toggle-button id="spellCheckControl"
          pref="{{prefs.spellcheck.use_spelling_service}}"
-@@ -101,6 +111,7 @@
+@@ -102,6 +112,7 @@
        </settings-toggle-button>
      </template>
  
@@ -74,7 +74,7 @@ index 4bf9895408296493db9aaff1e9e3094786464cd7..8abb10b5d2eec14d7ac09e457b1a9c6e
      <template is="dom-if" if="[[showSignoutDialog_]]" restamp>
        <settings-signout-dialog sync-status="[[syncStatus]]"
            on-close="onSignoutDialogClosed_">
-@@ -112,6 +123,7 @@
+@@ -113,6 +124,7 @@
        <div>$i18n{restartToApplyChanges}</div>
        <cr-button on-click="onRestartTap_">$i18n{restart}</cr-button>
      </cr-toast>
diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch
index bb9245c3387b..d096a86f46ca 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.js b/chrome/browser/resources/settings/privacy_page/personalization_options.js
-index 92055e5a01fb64048723a83a0cf5d1a039f5aa6d..ae59e003fe623fcc239bd66e316b7a7fb806dee2 100644
+index 58759f352c2558d2c2825f213c0a61d8b67ec951..1d0376d77dff2de51f351237deefabab75a60d97 100644
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.js
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.js
 @@ -32,7 +32,7 @@ Polymer({
diff --git a/patches/chrome-browser-resources-settings-route.js.patch b/patches/chrome-browser-resources-settings-route.js.patch
index 963708ab7265..acf9d9cd86fe 100644
--- a/patches/chrome-browser-resources-settings-route.js.patch
+++ b/patches/chrome-browser-resources-settings-route.js.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/route.js b/chrome/browser/resources/settings/route.js
-index 9698a4f43d0e1b027a8fa36f1accf4aa50c2d0d6..ae96b1709f46dc2b2afb69253946b6c0a3d6e017 100644
+index 6c10820db6d90ceaa2f3e3191b8c79b9ad59d849..48cf68595c9cb235969c137715e4caba382b5b23 100644
 --- a/chrome/browser/resources/settings/route.js
 +++ b/chrome/browser/resources/settings/route.js
-@@ -26,7 +26,9 @@ cr.define('settings', function() {
+@@ -41,7 +41,9 @@ cr.define('settings', function() {
  
      // TODO(tommycli): Find a way to refactor these repetitive category
      // routes.
@@ -12,7 +12,7 @@ index 9698a4f43d0e1b027a8fa36f1accf4aa50c2d0d6..ae96b1709f46dc2b2afb69253946b6c0
      if (loadTimeData.getBoolean('enableWebXrContentSetting')) {
        r.SITE_SETTINGS_AR = r.SITE_SETTINGS.createChild('ar');
      }
-@@ -161,7 +163,9 @@ cr.define('settings', function() {
+@@ -188,7 +190,9 @@ cr.define('settings', function() {
        }
  
        r.PRINTING = r.ADVANCED.createSection('/printing', 'printing');
diff --git a/patches/chrome-browser-resources-settings-settings_ui-settings_ui.html.patch b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.html.patch
index f0ac2b786159..7a6a008a59e4 100644
--- a/patches/chrome-browser-resources-settings-settings_ui-settings_ui.html.patch
+++ b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.html b/chrome/browser/resources/settings/settings_ui/settings_ui.html
-index 72edacc6b752b52481cab0d29f16304adf6163f9..659b216326d4fae5e2840687651fff0bee19b782 100644
+index 039fbacd628dd3ee531b8c78fb35c1fe6cc4f8ef..9d37680c97fef2a34b6c0262dd295ac56f5a2487 100644
 --- a/chrome/browser/resources/settings/settings_ui/settings_ui.html
 +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.html
 @@ -3,7 +3,7 @@
@@ -10,4 +10,4 @@ index 72edacc6b752b52481cab0d29f16304adf6163f9..659b216326d4fae5e2840687651fff0b
 +<link rel="import" href="chrome://brave-resources/br_elements/br_toolbar/br_toolbar.html">
  <link rel="import" href="chrome://resources/cr_elements/icons.html">
  <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
- <link rel="import" href="chrome://resources/html/find_shortcut_behavior.html">
+ <link rel="import" href="chrome://resources/html/assert.html">
diff --git a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch
index 72dd678be170..773a68ad44bf 100644
--- a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch
+++ b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.js b/chrome/browser/resources/settings/site_settings/category_default_setting.js
-index 619b727c86734eb7b1aa7bf43369fb7993e86f4b..dbb13eff10b6992c5a80736819cea32b92fd3e89 100644
+index 44b4f77228b8f863eaabf8e7287c0e7a860c87c6..9fd3502b0e3991c31b4430e32fa6cb80a89cd525 100644
 --- a/chrome/browser/resources/settings/site_settings/category_default_setting.js
 +++ b/chrome/browser/resources/settings/site_settings/category_default_setting.js
 @@ -171,6 +171,7 @@ Polymer({
diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.js.patch b/patches/chrome-browser-resources-settings-site_settings-constants.js.patch
index 5b2d9270780a..7388cea70ad9 100644
--- a/patches/chrome-browser-resources-settings-site_settings-constants.js.patch
+++ b/patches/chrome-browser-resources-settings-site_settings-constants.js.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/site_settings/constants.js b/chrome/browser/resources/settings/site_settings/constants.js
-index 726f9d3648f3aecbf431bdafebb7c569d8327be2..626ff962e9c234c1c693256be1177c8df3fe5335 100644
+index c34cdcf313c606ad69616eb67f6d572e80db947b..cdf7d1b20c1745859d5dad2b2c56038c627415e8 100644
 --- a/chrome/browser/resources/settings/site_settings/constants.js
 +++ b/chrome/browser/resources/settings/site_settings/constants.js
-@@ -34,6 +34,7 @@ cr.define('settings', function() {
+@@ -35,6 +35,7 @@ cr.define('settings', function() {
      ADS: 'ads',
      CLIPBOARD: 'clipboard',
      SENSORS: 'sensors',
diff --git a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch
index 39b49795c0ef..3b8252060f40 100644
--- a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch
+++ b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html
-index ed75de755d801bdd995a0e2ce035c1a17f0bcc48..443bbabcbc66b00b8f56dc7904fdff2ac1d81eaa 100644
+index b78613bc2fbb1fdf566f74bde1e7b053a52bd1ac..5bcd3af6315b9c0b617e07a8295819df5cb57ea7 100644
 --- a/chrome/browser/resources/settings/site_settings/site_details.html
 +++ b/chrome/browser/resources/settings/site_settings/site_details.html
-@@ -230,6 +230,11 @@
+@@ -237,6 +237,11 @@
            icon="cr:extension" id="unsandboxedPlugins"
            label="$i18n{siteSettingsUnsandboxedPlugins}">
        </site-details-permission>
diff --git a/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch b/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch
index 5d6c787a5e5e..1899cf795032 100644
--- a/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch
+++ b/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc
-index 1f626d44cb86745e6ae8fc257cd6a569312b20b0..5da42d9f12dc4a16089191c64ddb06131baea003 100644
+index 11e245be0c7b047d655370c1c5702e7a735ad2d0..aa991a834872a46f27b7f93160c3d3e559b27b6f 100644
 --- a/chrome/browser/safe_browsing/client_side_model_loader.cc
 +++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
-@@ -34,7 +34,7 @@ namespace safe_browsing {
+@@ -58,7 +58,7 @@ std::string ReadFileIntoString(base::FilePath path) {
  const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
  const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
  const char ModelLoader::kClientModelUrlPrefix[] =
diff --git a/patches/chrome-browser-shell_integration_linux.cc.patch b/patches/chrome-browser-shell_integration_linux.cc.patch
index a52049047a42..a01611179d1d 100644
--- a/patches/chrome-browser-shell_integration_linux.cc.patch
+++ b/patches/chrome-browser-shell_integration_linux.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
-index 55be2dc19fb52a4aeb04c311a87a8cdff0fc3bab..22cd7fecf958a943543409a17c3d8010fb8d101d 100644
+index 8f8f6b822137c6e77155487a49bda2dd1e4aa6ea..6879107a1d2a1c63100a146d882311d1d0433dae 100644
 --- a/chrome/browser/shell_integration_linux.cc
 +++ b/chrome/browser/shell_integration_linux.cc
-@@ -411,7 +411,7 @@ std::string GetIconName() {
+@@ -413,7 +413,7 @@ std::string GetIconName() {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    return "google-chrome";
  #else  // BUILDFLAG(CHROMIUM_BRANDING)
diff --git a/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch b/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch
index 6297e1bc74a7..f33d1d2e9a30 100644
--- a/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch
+++ b/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
-index e1e53d483a34658df926be3f11d6dcb30a0d2bbb..b865d1075af36e7f4ec7ba8a3b38ef22e80b825d 100644
+index 50ad9257b9e5f1bf037373ff79d9f04f1a213143..073a5d8ea5814abe6e75c329e3d703e40718fa60 100644
 --- a/chrome/browser/signin/account_consistency_mode_manager.cc
 +++ b/chrome/browser/signin/account_consistency_mode_manager.cc
-@@ -188,7 +188,9 @@ bool AccountConsistencyModeManager::ShouldBuildServiceForProfile(
+@@ -155,7 +155,9 @@ bool AccountConsistencyModeManager::ShouldBuildServiceForProfile(
  
  AccountConsistencyMethod
  AccountConsistencyModeManager::GetAccountConsistencyMethod() {
diff --git a/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch b/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch
index d38ced18e2bf..820ff2e8e20d 100644
--- a/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch
+++ b/patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-index 707b48f8b4a4c740a798ea6b78e8fca8a40fadb0..6134517c9be73da242a8e3d2d2169a51acdeabc0 100644
+index 47179fbe844505c1401b0ff56ba9695c9390272e..8c38656351aa027cfcfe18e1fcb43c8b7bace675 100644
 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-@@ -256,7 +256,7 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
+@@ -255,7 +255,7 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
    DCHECK(!bdict_file.empty());
  
    static const char kDownloadServerUrl[] =
diff --git a/patches/chrome-browser-sync-profile_sync_service_factory.cc.patch b/patches/chrome-browser-sync-profile_sync_service_factory.cc.patch
index e1a32eb813f1..2131c00e7fc3 100644
--- a/patches/chrome-browser-sync-profile_sync_service_factory.cc.patch
+++ b/patches/chrome-browser-sync-profile_sync_service_factory.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
-index 2478919ffea6460b17d90b6b839b83026f0f01ce..110ab04798ad6093b66e610c5b4a286003ab3a4a 100644
+index b250bbb79abbd9c881284a2762d6b741fd6edd1b..3efa096e4e94edc4b26fc06cb1d3218f2046a7fa 100644
 --- a/chrome/browser/sync/profile_sync_service_factory.cc
 +++ b/chrome/browser/sync/profile_sync_service_factory.cc
-@@ -283,7 +283,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
+@@ -269,7 +269,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
    }
  
    auto pss =
diff --git a/patches/chrome-browser-tracing-crash_service_uploader.cc.patch b/patches/chrome-browser-tracing-crash_service_uploader.cc.patch
index 5354cd43a1f7..5ec2e92a4084 100644
--- a/patches/chrome-browser-tracing-crash_service_uploader.cc.patch
+++ b/patches/chrome-browser-tracing-crash_service_uploader.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
-index fb5c354c729fd9a345fbac808379bedb60fb0cf3..4560a829122ec47d86b62db9c106f2e32e2efca0 100644
+index 4e801eea7d5f44d3838701e60e1f5e242a4e8602..1e467e3347f3e2d07b22addf5f7621bed16c90cc 100644
 --- a/chrome/browser/tracing/crash_service_uploader.cc
 +++ b/chrome/browser/tracing/crash_service_uploader.cc
-@@ -40,7 +40,7 @@ using std::string;
+@@ -41,7 +41,7 @@ using std::string;
  
  namespace {
  
diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch
index 4154ecfcd783..9c1905d8a813 100644
--- a/patches/chrome-browser-ui-BUILD.gn.patch
+++ b/patches/chrome-browser-ui-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
-index efacc93f730f99f2faf0b0cb5b3f2a1090b8d262..e2deff6133c00b940ebce5248eafc62e9bc19087 100644
+index 1d04b98ce3544c8654ab321cdbef707446b584cc..33994cdbc3667172cb5491b24097fa1cdbd358fc 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -600,6 +600,9 @@ jumbo_static_library("ui") {
+@@ -613,6 +613,9 @@ jumbo_static_library("ui") {
      "//ui/webui",
      "//v8:v8_version",
    ]
@@ -12,7 +12,7 @@ index efacc93f730f99f2faf0b0cb5b3f2a1090b8d262..e2deff6133c00b940ebce5248eafc62e
    allow_circular_includes_from +=
        [ "//chrome/browser/ui/webui/bluetooth_internals" ]
  
-@@ -2528,10 +2531,13 @@ jumbo_static_library("ui") {
+@@ -2601,10 +2604,13 @@ jumbo_static_library("ui") {
        ]
        deps += [ "//google_update" ]
      } else {
diff --git a/patches/chrome-browser-ui-autofill-payments-save_card_bubble_controller_impl.cc.patch b/patches/chrome-browser-ui-autofill-payments-save_card_bubble_controller_impl.cc.patch
index c90c020875d4..3757e882da87 100644
--- a/patches/chrome-browser-ui-autofill-payments-save_card_bubble_controller_impl.cc.patch
+++ b/patches/chrome-browser-ui-autofill-payments-save_card_bubble_controller_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
-index 6d05f4a06df05af4a96be8db36ed28e8d2592edd..2b863a2fd0abdadb47845ba06a271d24fca39982 100644
+index 9818d49b7014a41a3fb51874bfc981822a16065c..d76b2d49ad99ec38c455d14077fc7147b1605bee 100644
 --- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
 +++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
-@@ -359,6 +359,7 @@ bool SaveCardBubbleControllerImpl::ShouldRequestExpirationDateFromUser() const {
+@@ -338,6 +338,7 @@ bool SaveCardBubbleControllerImpl::ShouldRequestExpirationDateFromUser() const {
  }
  
  bool SaveCardBubbleControllerImpl::ShouldShowSignInPromo() const {
diff --git a/patches/chrome-browser-ui-browser.h.patch b/patches/chrome-browser-ui-browser.h.patch
index adac2dc5c213..40ec23da5d52 100644
--- a/patches/chrome-browser-ui-browser.h.patch
+++ b/patches/chrome-browser-ui-browser.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index ff8399e6c417dad97952ed1290483eb9ca070afa..4a68abdf74de7b901219f4b6c917355b438f3170 100644
+index 019bf3003af20174c181a2a5841178b4c6ca2383..49f7316130d02ad4c80f22529a43a59fabe02889 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -638,6 +638,7 @@ class Browser : public TabStripModelObserver,
+@@ -663,6 +663,7 @@ class Browser : public TabStripModelObserver,
    // dragging.
    void SetIsInTabDragging(bool is_in_tab_dragging);
  
diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch
index 96e93f51f25d..c38962f8bf0d 100644
--- a/patches/chrome-browser-ui-browser_navigator.cc.patch
+++ b/patches/chrome-browser-ui-browser_navigator.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
-index f069d00cad74c4d22a90589bf3e58902eec0f194..0a10d489d307c1842828365857654d5cc6874eaf 100644
+index 0829ab084d9e99dc4c254c993e6a63630f18d0a7..0875ef2842a252fb30dbb14c2d99a00564ba10d3 100644
 --- a/chrome/browser/ui/browser_navigator.cc
 +++ b/chrome/browser/ui/browser_navigator.cc
-@@ -462,6 +462,7 @@ void Navigate(NavigateParams* params) {
+@@ -475,6 +475,7 @@ void Navigate(NavigateParams* params) {
      params->initiating_profile = source_browser->profile();
    DCHECK(params->initiating_profile);
  
@@ -10,7 +10,7 @@ index f069d00cad74c4d22a90589bf3e58902eec0f194..0a10d489d307c1842828365857654d5c
    if (!AdjustNavigateParamsForURL(params))
      return;
  
-@@ -728,6 +729,7 @@ void Navigate(NavigateParams* params) {
+@@ -742,6 +743,7 @@ void Navigate(NavigateParams* params) {
  bool IsHostAllowedInIncognito(const GURL& url) {
    std::string scheme = url.scheme();
    base::StringPiece host = url.host_piece();
diff --git a/patches/chrome-browser-ui-content_settings-content_setting_bubble_model.cc.patch b/patches/chrome-browser-ui-content_settings-content_setting_bubble_model.cc.patch
index c55c4c1741c1..a1f97f8f7ffa 100644
--- a/patches/chrome-browser-ui-content_settings-content_setting_bubble_model.cc.patch
+++ b/patches/chrome-browser-ui-content_settings-content_setting_bubble_model.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
-index 61b95b750eb00c2d4068217cc740d38a452a90d5..f50b14a35019da75af8c86cc6a3bed65758891a6 100644
+index b2f5d026dee2447a96886d7be8c1ba7f024a3bf9..a9c2a6a97fce9178e30c1975d7b1da5212a1f1c7 100644
 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
 +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
 @@ -15,6 +15,7 @@
@@ -10,7 +10,7 @@ index 61b95b750eb00c2d4068217cc740d38a452a90d5..f50b14a35019da75af8c86cc6a3bed65
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/content_settings/chrome_content_settings_utils.h"
  #include "chrome/browser/content_settings/cookie_settings_factory.h"
-@@ -1693,7 +1694,7 @@ ContentSettingBubbleModel::CreateContentSettingBubbleModel(
+@@ -1698,7 +1699,7 @@ ContentSettingBubbleModel::CreateContentSettingBubbleModel(
          delegate, web_contents, content_type);
    }
    if (content_type == ContentSettingsType::PLUGINS) {
diff --git a/patches/chrome-browser-ui-content_settings-content_setting_image_model.cc.patch b/patches/chrome-browser-ui-content_settings-content_setting_image_model.cc.patch
index da53cf80e391..739b16b1336d 100644
--- a/patches/chrome-browser-ui-content_settings-content_setting_image_model.cc.patch
+++ b/patches/chrome-browser-ui-content_settings-content_setting_image_model.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc
-index 0ecda0a3bcc9ff95c990f5dcb27aa2388240b668..f7ced842436d068fe4bf9add0da38004176b382e 100644
+index de103df3af778629eb7b0824ea774d89163edb05..6eae12cfcb9c7c8938994f1e1579b933d17b03ba 100644
 --- a/chrome/browser/ui/content_settings/content_setting_image_model.cc
 +++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc
 @@ -11,6 +11,7 @@
@@ -10,7 +10,7 @@ index 0ecda0a3bcc9ff95c990f5dcb27aa2388240b668..f7ced842436d068fe4bf9add0da38004
  #include "build/build_config.h"
  #include "chrome/app/vector_icons/vector_icons.h"
  #include "chrome/browser/browser_process.h"
-@@ -968,6 +969,9 @@ ContentSettingImageModel::GenerateContentSettingImageModels() {
+@@ -971,6 +972,9 @@ ContentSettingImageModel::GenerateContentSettingImageModels() {
    std::vector<std::unique_ptr<ContentSettingImageModel>> result;
    for (auto type : kContentSettingImageOrder)
      result.push_back(CreateForContentType(type));
diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
index 4e82773bdf4e..b811fa4b23e1 100644
--- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
+++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc
-index 9df4ed4f7d0efd267d4390c2d798e7c5cc58da8e..323afcbdf83d93f63bed898b2fc1fd733e027bc6 100644
+index 4b1e239146b242649c652b2b99a96d81fd56dad6..cc36febdce3cf0ac7c6e0f2fd2ae8e9e126eaf93 100644
 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc
 +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc
 @@ -59,7 +59,6 @@ ExtensionActionViewController::ExtensionActionViewController(
diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch
index 775ab2629f26..e633442f06f6 100644
--- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch
+++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.h b/chrome/browser/ui/extensions/extension_action_view_controller.h
-index 17506070f59779efde356983ed4be48031575d4a..ecb1cb4bee705dbb060240bbcc072a2595b61211 100644
+index cc6007305f5f513f1ff811ff76fe8c8e56ef95b7..577754af9843f256a2771c45abfff03863fed3c6 100644
 --- a/chrome/browser/ui/extensions/extension_action_view_controller.h
 +++ b/chrome/browser/ui/extensions/extension_action_view_controller.h
 @@ -15,6 +15,7 @@
@@ -18,7 +18,7 @@ index 17506070f59779efde356983ed4be48031575d4a..ecb1cb4bee705dbb060240bbcc072a25
    // The different options for showing a popup.
    enum PopupShowAction { SHOW_POPUP, SHOW_POPUP_AND_INSPECT };
  
-@@ -114,6 +116,7 @@ class ExtensionActionViewController
+@@ -115,6 +117,7 @@ class ExtensionActionViewController
    // In some cases (such as when an action is shown in a menu), a substitute
    // ToolbarActionViewController should be used for showing popups. This
    // returns the preferred controller.
@@ -26,7 +26,7 @@ index 17506070f59779efde356983ed4be48031575d4a..ecb1cb4bee705dbb060240bbcc072a25
    ExtensionActionViewController* GetPreferredPopupViewController();
  
    // Executes the extension action with |show_action|. If
-@@ -129,6 +132,7 @@ class ExtensionActionViewController
+@@ -130,6 +133,7 @@ class ExtensionActionViewController
    // The popup may not be shown synchronously if the extension is hidden and
    // first needs to slide itself out.
    // Returns true if a popup will be shown.
@@ -34,7 +34,7 @@ index 17506070f59779efde356983ed4be48031575d4a..ecb1cb4bee705dbb060240bbcc072a25
    bool TriggerPopupWithUrl(PopupShowAction show_action,
                             const GURL& popup_url,
                             bool grant_tab_permissions);
-@@ -139,6 +143,7 @@ class ExtensionActionViewController
+@@ -140,6 +144,7 @@ class ExtensionActionViewController
                   PopupShowAction show_action);
  
    // Handles cleanup after the popup closes.
diff --git a/patches/chrome-browser-ui-page_info-page_info_ui.cc.patch b/patches/chrome-browser-ui-page_info-page_info_ui.cc.patch
index 287c9be086c5..29bb40418577 100644
--- a/patches/chrome-browser-ui-page_info-page_info_ui.cc.patch
+++ b/patches/chrome-browser-ui-page_info-page_info_ui.cc.patch
@@ -1,16 +1,16 @@
 diff --git a/chrome/browser/ui/page_info/page_info_ui.cc b/chrome/browser/ui/page_info/page_info_ui.cc
-index a12aff6505a9e2b8bda67ac64eab07e68235fd10..f12923a294ebb61d5c4d3572b103490c0870ef92 100644
+index 38f48905784266a85ccb0f2decfadbd9b6d089ea..73323f92e97b8fc39615b94938ad65dcab9fa01d 100644
 --- a/chrome/browser/ui/page_info/page_info_ui.cc
 +++ b/chrome/browser/ui/page_info/page_info_ui.cc
-@@ -32,6 +32,7 @@
+@@ -30,6 +30,7 @@
  #if defined(OS_ANDROID)
  #include "chrome/browser/android/android_theme_resources.h"
  #else
 +#include "brave/app/vector_icons/vector_icons.h"
  #include "chrome/app/vector_icons/vector_icons.h"
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/common/pref_names.h"
-@@ -618,6 +619,9 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon(const PermissionInfo& info,
+ #include "components/prefs/pref_service.h"
+ #include "media/base/media_switches.h"
+@@ -616,6 +617,9 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon(const PermissionInfo& info,
      case ContentSettingsType::USB_GUARD:
        icon = &vector_icons::kUsbIcon;
        break;
diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
index 6d53d864b904..0b9c02a37839 100644
--- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
+++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-index 568752aa8817c332fb2044db92cf4ff274dc05ad..4e20c3cbcd4ca9bb954bd9dc2263333bbd2968be 100644
+index d07c15d04d24b370328b72118d6c23527b39c2c3..88a95ac6f4e83479f99b409350672af554841fbf 100644
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -646,6 +646,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
+@@ -662,6 +662,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
    welcome_enabled =
        welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_);
  #endif  // !defined(OS_CHROMEOS)
diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch
index 485b2ce5fed7..0a6708117b60 100644
--- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
-index b9a9d6f59e4727e520fbaa0123c85881b0cd642f..a801ff522786298ad75bc62d9823be4ecd992924 100644
+index ff43d7e511fce90fe8dd4f798b9d575dec283681..10f92d16721d16e968f7295a954b4ed446b558dd 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
 @@ -73,7 +73,7 @@ views::Widget* BookmarkBubbleView::ShowBubble(
diff --git a/patches/chrome-browser-ui-views-download-download_item_view.h.patch b/patches/chrome-browser-ui-views-download-download_item_view.h.patch
index cba57e7b244f..f9b84f80d8e5 100644
--- a/patches/chrome-browser-ui-views-download-download_item_view.h.patch
+++ b/patches/chrome-browser-ui-views-download-download_item_view.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h
-index 23f68a74f827a4c31d34fe4e00b6b0dafe3b354d..2158c944e061d2d55cfcad2ab45cf140e02f4451 100644
+index c7d667fa2755f3ad454c6531887538a9b29decbb..77ed766cead51a480803204123bd97c21c6f47ea 100644
 --- a/chrome/browser/ui/views/download/download_item_view.h
 +++ b/chrome/browser/ui/views/download/download_item_view.h
 @@ -123,6 +123,7 @@ class DownloadItemView : public views::View,
diff --git a/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch b/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch
index edeca36855fb..d0b5725ceaa9 100644
--- a/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch
+++ b/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc
-index b98ab3fcf354fae46137a61d31ea9c37a1192ce9..37c10e56d15cf579651e43c68dde1e446bf1b8fd 100644
+index 3f0ed849c90098e9cbc0a64d580879b87b9468bf..b3f38c8025d2b3a305d6612f606480d36f987cd2 100644
 --- a/chrome/browser/ui/views/extensions/extension_popup.cc
 +++ b/chrome/browser/ui/views/extensions/extension_popup.cc
 @@ -67,7 +67,7 @@ gfx::Size ExtensionPopup::CalculatePreferredSize() const {
diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
index d020a4215396..08b54ac04282 100644
--- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
+++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-index 5f0a38eea3e3b47b0d7d6e2c45bf9ce9e08608dc..870cf598da8e410876124ca653196ffa59c87980 100644
+index 62652585d10091da49d5bac4c4d25d2d0be6298b..90df44d8c0a50c493ee040a3f8e5103af10bdac8 100644
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-@@ -446,7 +446,7 @@ void LocationBarView::OnKeywordFaviconFetched(const gfx::Image& icon) {
+@@ -442,7 +442,7 @@ void LocationBarView::OnKeywordFaviconFetched(const gfx::Image& icon) {
    selected_keyword_view_->SetCustomImage(icon);
  }
  
@@ -11,7 +11,7 @@ index 5f0a38eea3e3b47b0d7d6e2c45bf9ce9e08608dc..870cf598da8e410876124ca653196ffa
    if (!IsInitialized())
      return;
  
-@@ -548,6 +548,7 @@ void LocationBarView::Layout() {
+@@ -544,6 +544,7 @@ void LocationBarView::Layout() {
      }
    };
  
diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch
index 5efe09cdf03e..bf5c50d0190e 100644
--- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch
+++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
-index baeba401df2e36187a4f93f3eb8a2076b86e62bf..d3ef526cbfdad7aaefc4feb1da9270ca33350127 100644
+index 6ee9457c3daf10e6bee50bd822c8694416969180..afd7cf00bf63637a696c1c2e6de17afc3501b52f 100644
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
-@@ -107,6 +107,7 @@ class LocationBarView : public LocationBar,
+@@ -106,6 +106,7 @@ class LocationBarView : public LocationBar,
    int GetBorderRadius() const;
  
    // Initializes the LocationBarView.
@@ -10,7 +10,7 @@ index baeba401df2e36187a4f93f3eb8a2076b86e62bf..d3ef526cbfdad7aaefc4feb1da9270ca
    void Init();
  
    // True if this instance has been initialized by calling Init, which can only
-@@ -159,6 +160,7 @@ class LocationBarView : public LocationBar,
+@@ -158,6 +159,7 @@ class LocationBarView : public LocationBar,
  
    // Updates the controller, and, if |contents| is non-null, restores saved
    // state that the tab holds.
@@ -18,7 +18,7 @@ index baeba401df2e36187a4f93f3eb8a2076b86e62bf..d3ef526cbfdad7aaefc4feb1da9270ca
    void Update(const content::WebContents* contents);
  
    // Clears the location bar's state for |contents|.
-@@ -178,6 +180,7 @@ class LocationBarView : public LocationBar,
+@@ -177,6 +179,7 @@ class LocationBarView : public LocationBar,
    void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
    gfx::Size GetMinimumSize() const override;
    gfx::Size CalculatePreferredSize() const override;
@@ -26,7 +26,7 @@ index baeba401df2e36187a4f93f3eb8a2076b86e62bf..d3ef526cbfdad7aaefc4feb1da9270ca
    void Layout() override;
    void OnThemeChanged() override;
    void ChildPreferredSizeChanged(views::View* child) override;
-@@ -228,6 +231,7 @@ class LocationBarView : public LocationBar,
+@@ -227,6 +230,7 @@ class LocationBarView : public LocationBar,
                                       on_icon_fetched) const override;
  
   private:
diff --git a/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch b/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch
index 763e2961d8f4..c578eb06388f 100644
--- a/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
-index 432c52e538f314377fac74ef525019097c315e9b..70fec5371d6374571871affeee5db9465bb99b76 100644
+index 8f17dbc2f3c005892222034f9a0a165da5890c43..d49fcef80f4529b7ab1c6ef7bf522b31ec0fe096 100644
 --- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
 +++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
-@@ -34,8 +34,12 @@ namespace {
+@@ -35,8 +35,12 @@ namespace {
  
  // The URL to be used to re-install Chrome when auto-update failed for too long.
  constexpr char kDownloadChromeUrl[] =
diff --git a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch
index 99881e3bc2b5..7613a521644c 100644
--- a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
-index 321ece12aef667fa24204dcd220c5ea8608fed31..e054d02323413d82d9dc22da977e1368f507725f 100644
+index d27ebe2d566c0060abf558d943e18647f39326f2..1073940539d80092a153907ad121e01db4bc273a 100644
 --- a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
 +++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
-@@ -53,6 +53,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
+@@ -72,6 +72,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
  
    for (permissions::PermissionRequest* request : delegate_->Requests())
      AddPermissionRequestLine(request);
diff --git a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch
index 26c71012f525..c1fed987b8a3 100644
--- a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch
+++ b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
-index 511b472cc01a1ec134689edbd6e5bf33b9ad6e52..03edfbfd9a8488cf83647b195c270e0275845277 100644
+index faf1d11d84ca5fbb7f6217ec134a4276c794ed88..5293bf388f51cc308619852040cfb3ec24c5eb59 100644
 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
 +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
-@@ -223,6 +223,7 @@ void AvatarToolbarButton::OnHighlightChanged() {
+@@ -208,6 +208,7 @@ void AvatarToolbarButton::OnHighlightChanged() {
  }
  
  base::string16 AvatarToolbarButton::GetAvatarTooltipText() const {
diff --git a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch
index 7c0926349718..deb4366857bf 100644
--- a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch
+++ b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
-index a6b5b48da0fe2025b5ac2ee31e608deb7d7968eb..57af15f5a00ba1d8eacecc5219275525587d7b51 100644
+index d246624806755dcc7a843d7045c88422d0df05ac..5b74316edc235bc3051663487d58f66f4ba5cdf9 100644
 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
 +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
-@@ -63,6 +63,7 @@ class AvatarToolbarButton : public ToolbarButton,
+@@ -61,6 +61,7 @@ class AvatarToolbarButton : public ToolbarButton,
    static const char kAvatarToolbarButtonClassName[];
  
   private:
diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch
index ad6f3497bb02..a624e2b05b6e 100644
--- a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch
+++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch
@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.h b/chrome/browser/ui/views/profiles/profile_menu_view.h
-index c64faf29bb5a310ce8ed1b9c7ad19df522f34563..e03cbb87255505d5788a720c0dcce92b4e3b9682 100644
+index 17994ce6cd5fb69ae71407a3da5f03bda5f7aded..f3c6d1220bdbae9f416e6b37438bc2b96c3ecc6f 100644
 --- a/chrome/browser/ui/views/profiles/profile_menu_view.h
 +++ b/chrome/browser/ui/views/profiles/profile_menu_view.h
-@@ -38,6 +38,7 @@ class ProfileMenuView : public ProfileMenuViewBase {
-   void BuildMenu() override;
+@@ -40,6 +40,7 @@ class ProfileMenuView : public ProfileMenuViewBase {
+   gfx::ImageSkia GetSyncIcon() const override;
  
   private:
 +  BRAVE_PROFILE_MENU_VIEW_H
diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch
index a0f10cf7c995..f46feaf099bd 100644
--- a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch
+++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h
-index e1e103c41109a9bbdd291e3e1aaf223503b1cf91..52cf1098fe31f2d05ee227dc6feb26cdaade8114 100644
+index a3ddb11eeeaad2d28555f899b76cd1b082bc0217..a19e9bcea089ad4f9f04b4d6de69aa6aab6b6470 100644
 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h
 +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h
-@@ -141,6 +141,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate,
+@@ -147,6 +147,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate,
  
    views::Button* anchor_button() const { return anchor_button_; }
  
diff --git a/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch
index 1262637ce8d5..e41a57b0bd14 100644
--- a/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch
+++ b/patches/chrome-browser-ui-views-tabs-tab_icon.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/tabs/tab_icon.cc b/chrome/browser/ui/views/tabs/tab_icon.cc
-index 217bb4660c683fc92d8ef9a7828c8abcff7a10f0..4931948ea61e7b15d8430333977f425e9281c50d 100644
+index f3bcff381e9bd61be5e5c471293a6716e06e0db1..61dcae48074564382cfd4942c0046f3cdd0c3733 100644
 --- a/chrome/browser/ui/views/tabs/tab_icon.cc
 +++ b/chrome/browser/ui/views/tabs/tab_icon.cc
-@@ -355,7 +355,7 @@ void TabIcon::SetIcon(const GURL& url, const gfx::ImageSkia& icon) {
+@@ -356,7 +356,7 @@ void TabIcon::SetIcon(const GURL& url, const gfx::ImageSkia& icon) {
  
    favicon_ = icon;
  
diff --git a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch
index d99923318717..5788a5a31fc7 100644
--- a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch
+++ b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc
-index 233f2582892321e0bf09ca749a873b7e5aae2ab4..27ef9992707d075ceb5786c57e8469af10bae5b6 100644
+index ee91707b46ab0677232c8fef7877a875e6178418..355d0d043c7282a11951797b1902d61555ab191b 100644
 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc
 +++ b/chrome/browser/ui/views/tabs/tab_style_views.cc
 @@ -279,6 +279,7 @@ SkPath GM2TabStyle::GetPath(PathType path_type,
@@ -19,7 +19,7 @@ index 233f2582892321e0bf09ca749a873b7e5aae2ab4..27ef9992707d075ceb5786c57e8469af
                   separator_size.width(), separator_size.height());
  
    separator_bounds.trailing = separator_bounds.leading;
-@@ -883,12 +884,16 @@ void GM2TabStyle::PaintSeparators(gfx::Canvas* canvas) const {
+@@ -887,12 +888,16 @@ void GM2TabStyle::PaintSeparators(gfx::Canvas* canvas) const {
                                                     SK_AlphaOPAQUE));
    };
  
diff --git a/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch b/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch
index 33b8b99ffd48..592d36860de5 100644
--- a/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch
+++ b/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
-index 58a8eae8ed6101654ba77cde12d719231bca9814..7becff27aa290dd7db1bdc17f08841900290e720 100644
+index 59e399de0f7bdf299fdebfb747d471a7e0abcd34..25d44423224e8e54205c1a2b9e4209308462b4e1 100644
 --- a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
 +++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
 @@ -11,6 +11,7 @@
@@ -10,7 +10,7 @@ index 58a8eae8ed6101654ba77cde12d719231bca9814..7becff27aa290dd7db1bdc17f0884190
  #include "cc/paint/paint_flags.h"
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_otr_state.h"
-@@ -248,7 +249,7 @@ void BrowserAppMenuButton::ShowMenu(int run_types) {
+@@ -246,7 +247,7 @@ void BrowserAppMenuButton::ShowMenu(int run_types) {
        promo_feature_ == InProductHelpFeature::kReopenTab;
  
    RunMenu(
diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
index 75701986e3b9..cd2b08e7e836 100644
--- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
+++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
-index b02fd82cdac956cae104e1475dbb9022f0ad9836..31113c07ba47ee5109504b25f3ba0142eab15933 100644
+index 229a56349e3d35407daf511045ae29edbb65fd90..3810b4fa04002d954130bb1851d9d64005efd646 100644
 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
-@@ -236,7 +236,7 @@ void ToolbarView::Init() {
+@@ -242,7 +242,7 @@ void ToolbarView::Init() {
  
    std::unique_ptr<AvatarToolbarButton> avatar;
    if (show_avatar_toolbar_button)
diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch
index c1918e821455..a99fe7af5b97 100644
--- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch
+++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h
-index 2042bb75893ec161f3cb5acc480c2f07473b8523..7103cb29700b4e2ca383e4dca4a9bf02c32686ce 100644
+index 21510da06867ca1e2b286010c44be71d33ae5168..1e039e2a559aaf6d767abdd1ce0c3d39fda6f8bf 100644
 --- a/chrome/browser/ui/views/toolbar/toolbar_view.h
 +++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
-@@ -94,12 +94,14 @@ class ToolbarView : public views::AccessiblePaneView,
+@@ -93,12 +93,14 @@ class ToolbarView : public views::AccessiblePaneView,
    ~ToolbarView() override;
  
    // Create the contents of the Browser Toolbar.
@@ -17,7 +17,7 @@ index 2042bb75893ec161f3cb5acc480c2f07473b8523..7103cb29700b4e2ca383e4dca4a9bf02
    void Update(content::WebContents* tab);
  
    // Updates the visibility of the custom tab bar, potentially animating the
-@@ -130,6 +132,7 @@ class ToolbarView : public views::AccessiblePaneView,
+@@ -129,6 +131,7 @@ class ToolbarView : public views::AccessiblePaneView,
        IntentPickerResponse callback);
  
    // Shows a bookmark bubble and anchors it appropriately.
@@ -25,7 +25,7 @@ index 2042bb75893ec161f3cb5acc480c2f07473b8523..7103cb29700b4e2ca383e4dca4a9bf02
    void ShowBookmarkBubble(const GURL& url,
                            bool already_bookmarked,
                            bookmarks::BookmarkBubbleObserver* observer);
-@@ -196,6 +199,7 @@ class ToolbarView : public views::AccessiblePaneView,
+@@ -195,6 +198,7 @@ class ToolbarView : public views::AccessiblePaneView,
    void ChildPreferredSizeChanged(views::View* child) override;
  
   protected:
@@ -33,7 +33,7 @@ index 2042bb75893ec161f3cb5acc480c2f07473b8523..7103cb29700b4e2ca383e4dca4a9bf02
    // AccessiblePaneView:
    bool SetPaneFocusAndFocusDefault() override;
  
-@@ -245,6 +249,7 @@ class ToolbarView : public views::AccessiblePaneView,
+@@ -242,6 +246,7 @@ class ToolbarView : public views::AccessiblePaneView,
    views::View* GetViewForDrop() override;
  
    // Loads the images for all the child views.
diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
index b903c2cd6906..4618c4b77bca 100644
--- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
-index 97195506832bb3487a9f111ea47f6c772c28eb1a..de46e979a446ddf3c15f16e2325a105a34fc86ad 100644
+index 7df689afe0660000064a98670151a0a372aba9e5..946e3c5d6bc4b9853e3fb1f142435990c5315564 100644
 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
 +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
 @@ -182,7 +182,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
diff --git a/patches/chrome-browser-ui-views-update_recommended_message_box.h.patch b/patches/chrome-browser-ui-views-update_recommended_message_box.h.patch
index 95676cdc82e5..edc542898238 100644
--- a/patches/chrome-browser-ui-views-update_recommended_message_box.h.patch
+++ b/patches/chrome-browser-ui-views-update_recommended_message_box.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/update_recommended_message_box.h b/chrome/browser/ui/views/update_recommended_message_box.h
-index b171f5c3a0b0fda43609027d7d14ca948418cf25..64f442c7e954510d37b1ba91df09671313f11f6e 100644
+index f3b52a4b730f6583d3a89618485b3f15329929a3..152b6f2e4a3773fe3c13e693d52a528b7d9c4d28 100644
 --- a/chrome/browser/ui/views/update_recommended_message_box.h
 +++ b/chrome/browser/ui/views/update_recommended_message_box.h
 @@ -20,6 +20,8 @@ class UpdateRecommendedMessageBox : public views::DialogDelegate {
diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch
index ed3957a35b1a..085147f071b6 100644
--- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch
+++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-index c4ab1e9c46f070f61085bf8719d74bae99c578e4..c002c02694b2a100d87196ed417f174d1a5d0d1c 100644
+index 2d329b13752728337a6a551efcee54b913fa0f73..af69b40cdd25f194f40d521097b9815d6911725d 100644
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 @@ -12,6 +12,7 @@
@@ -10,7 +10,7 @@ index c4ab1e9c46f070f61085bf8719d74bae99c578e4..c002c02694b2a100d87196ed417f174d
  #include "build/build_config.h"
  #include "chrome/browser/about_flags.h"
  #include "chrome/browser/accessibility/accessibility_ui.h"
-@@ -869,7 +870,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
+@@ -908,7 +909,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
  
  // static
  ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
diff --git a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch
index 3f7136f79758..eb434be7d080 100644
--- a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch
+++ b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc
-index 95892243db06ac6147cff0b41ce8949a94a10caa..46221f07d044a914909b5206a1686af8056f9f6f 100644
+index 0f976c11afb43d0dec932a9078ce4dd6d71406b0..2435963d9c01b07a54b1d58e8f7d53c378295c7a 100644
 --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc
 +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
 @@ -61,6 +61,7 @@ content::WebUIDataSource* CreateDownloadsUIHTMLSource(Profile* profile) {
diff --git a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch
index 87a792a3ba23..efdfd13f8308 100644
--- a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch
+++ b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
-index 5503ae014956276d8feeaece53d1c7c2553ef06b..716dc600b3072360d305435fc1a1a044fb8fcab8 100644
+index e8519afadf8a848ecf0a4038bc92d1672e289ff1..b97f3e262e202bf0a1f1eb94740525e1672869f8 100644
 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
 +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
-@@ -352,6 +352,8 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile,
+@@ -351,6 +351,8 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile,
    }
    source->AddString(kLoadTimeClassesKey, GetLoadTimeClasses(in_dev_mode));
  
diff --git a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch
index 7098791d8a3e..420223a34e43 100644
--- a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch
+++ b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/settings/import_data_handler.cc b/chrome/browser/ui/webui/settings/import_data_handler.cc
-index d58683fd6bac17138282b17b9e4b0f4e45d0c09d..bd1e9f9943481db842d9576d3a1a9dabb1af2a5c 100644
+index 1637dc014a75986cab0ec4abd327034f975a102b..1a53fdc6fb3850d502d43e62f5d3f2231950ada9 100644
 --- a/chrome/browser/ui/webui/settings/import_data_handler.cc
 +++ b/chrome/browser/ui/webui/settings/import_data_handler.cc
 @@ -126,6 +126,7 @@ void ImportDataHandler::HandleImportData(const base::ListValue* args) {
@@ -10,7 +10,7 @@ index d58683fd6bac17138282b17b9e4b0f4e45d0c09d..bd1e9f9943481db842d9576d3a1a9dab
  
    const importer::SourceProfile& source_profile =
        importer_list_->GetSourceProfileAt(browser_index);
-@@ -202,6 +203,7 @@ void ImportDataHandler::SendBrowserProfileData(const std::string& callback_id) {
+@@ -203,6 +204,7 @@ void ImportDataHandler::SendBrowserProfileData(const std::string& callback_id) {
      browser_profile->SetBoolean(
          "autofillFormData",
          (browser_services & importer::AUTOFILL_FORM_DATA) != 0);
diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
index e01653935528..117f32b3d6bc 100644
--- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
+++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-index f9d4c03ac0e132fd74bb6ce3871cb27df871381b..af0c31985f18039d197d82a9bd741a598a639f39 100644
+index e991f66b595e690d12e78230b11107f6bec8b263..df7eeace7cdbb7db72c33e0ec773f3e065737c5e 100644
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -2323,6 +2323,7 @@ void AddBrowserLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -2033,6 +2033,7 @@ void AddBrowserLocalizedStrings(content::WebUIDataSource* html_source,
    policy_indicator::AddLocalizedStrings(html_source);
    AddSecurityKeysStrings(html_source);
  
diff --git a/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch b/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch
index 84c853e39b84..c3e7460a9018 100644
--- a/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch
+++ b/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm
-index bb7cb34025102878352df1f33be6ad6ed2a9a6d0..7067025388dc76c8056768d45454c8277419f689 100644
+index af747b870e9c20eee45b877e79ea6f84288971d8..e6fadcb63adddd590d95d34897b6b1b91811ef3d 100644
 --- a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm
 +++ b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm
-@@ -719,6 +719,7 @@ base::FilePath GetChromeAppsFolder() {
+@@ -718,6 +718,7 @@ base::FilePath GetChromeAppsFolder() {
    if (path.empty())
      return path;
  
diff --git a/patches/chrome-chrome_repack_locales.gni.patch b/patches/chrome-chrome_repack_locales.gni.patch
index da804550d505..63446e2fb824 100644
--- a/patches/chrome-chrome_repack_locales.gni.patch
+++ b/patches/chrome-chrome_repack_locales.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni
-index aac49b9a662d47b89500e453f6005a0dff5dbc6f..b370dd46cb4a7c61e5f8bfbbd49d7d13df8d49e9 100644
+index 9160857c6c4eedb5de1463e17cf15fa3aa1881fe..e0ca4ad524e26238e5c12213d4e6fa5813c7ec01 100644
 --- a/chrome/chrome_repack_locales.gni
 +++ b/chrome/chrome_repack_locales.gni
 @@ -36,6 +36,7 @@ template("chrome_repack_locales") {
diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch
index 7aefbe9045a9..34322beb1fa2 100644
--- a/patches/chrome-common-BUILD.gn.patch
+++ b/patches/chrome-common-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
-index 1c037e568b807f0c42ec4ab1d298100a659a90ac..63a25632efb783371ed50264e449d8ec016b9a1e 100644
+index 0ee5857b7e42e866d46956f9931b2c9071fe0cc9..bc1982f595564ec03974ecde11a325de98b20773 100644
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -67,6 +67,7 @@ source_set("channel_info") {
+@@ -69,6 +69,7 @@ source_set("channel_info") {
    }
  
    deps = [ "//build:branding_buildflags" ]
@@ -10,7 +10,7 @@ index 1c037e568b807f0c42ec4ab1d298100a659a90ac..63a25632efb783371ed50264e449d8ec
  
    public_deps = [
      "//base",
-@@ -177,6 +178,7 @@ static_library("common") {
+@@ -181,6 +182,7 @@ static_library("common") {
    ]
  
    public_deps = [
@@ -18,7 +18,7 @@ index 1c037e568b807f0c42ec4ab1d298100a659a90ac..63a25632efb783371ed50264e449d8ec
      ":available_offline_content_mojom",
      ":buildflags",
      ":channel_info",
-@@ -550,6 +552,7 @@ static_library("non_code_constants") {
+@@ -555,6 +557,7 @@ static_library("non_code_constants") {
      "//printing/buildflags",
      "//ui/base:buildflags",
    ]
diff --git a/patches/chrome-common-importer-importer_data_types.h.patch b/patches/chrome-common-importer-importer_data_types.h.patch
index bd1255427efa..b72b95056a15 100644
--- a/patches/chrome-common-importer-importer_data_types.h.patch
+++ b/patches/chrome-common-importer-importer_data_types.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/common/importer/importer_data_types.h b/chrome/common/importer/importer_data_types.h
-index 0fc90c62398a93eb89568ce78c8ded2bc9b232b6..61d3d5425a728a5b004ed4536d64d4e895510616 100644
+index 65cfcd480bd575bb5aa1953332c52b92a7606a70..388bec98f179047d56968531fb81bc7e75aafc41 100644
 --- a/chrome/common/importer/importer_data_types.h
 +++ b/chrome/common/importer/importer_data_types.h
 @@ -31,7 +31,7 @@ enum ImportItem {
@@ -11,7 +11,7 @@ index 0fc90c62398a93eb89568ce78c8ded2bc9b232b6..61d3d5425a728a5b004ed4536d64d4e8
  };
  
  // Information about a profile needed by an importer to do import work.
-@@ -83,6 +83,7 @@ enum VisitSource {
+@@ -84,6 +84,7 @@ enum VisitSource {
    VISIT_SOURCE_FIREFOX_IMPORTED = 1,
    VISIT_SOURCE_IE_IMPORTED = 2,
    VISIT_SOURCE_SAFARI_IMPORTED = 3,
diff --git a/patches/chrome-installer-linux-BUILD.gn.patch b/patches/chrome-installer-linux-BUILD.gn.patch
index 8cbc224eeec5..e083c4c14fa1 100644
--- a/patches/chrome-installer-linux-BUILD.gn.patch
+++ b/patches/chrome-installer-linux-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
-index d2197940b4faef9d7d157a0583ab67b78a610b7c..6cd1e3f9ca7e5abaa69a38033e05e39e60fd1ef1 100644
+index f1129b48a91054e81e0c340533bf683334775431..cc01f86585c407a772c02c00592b796ee7d53ac6 100644
 --- a/chrome/installer/linux/BUILD.gn
 +++ b/chrome/installer/linux/BUILD.gn
 @@ -26,8 +26,8 @@ declare_args() {
@@ -71,9 +71,9 @@ index d2197940b4faef9d7d157a0583ab67b78a610b7c..6cd1e3f9ca7e5abaa69a38033e05e39e
 +    channel = "dev"
 +  }
  
-   if (current_cpu == "x86") {
-     # The shell scripts use "ia32" instead of "x86".
-@@ -493,3 +507,6 @@ linux_package("beta") {
+   deb_target_name = "${target_name}_deb"
+   action(deb_target_name) {
+@@ -486,3 +500,6 @@ linux_package("beta") {
  linux_package("unstable") {
    channel = "unstable"
  }
diff --git a/patches/chrome-installer-linux-debian-build.sh.patch b/patches/chrome-installer-linux-debian-build.sh.patch
index 6ba3f9d5c545..b56110361d36 100644
--- a/patches/chrome-installer-linux-debian-build.sh.patch
+++ b/patches/chrome-installer-linux-debian-build.sh.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh
-index 0a510aa0655780511bc90677264f3610a9acd994..1555fee518ec0560a5a1d7664a0032b824261097 100755
+index c8e2130d81c95692c4298a6418f2bf00c78c4d5e..bdd0a2098752863de7fe20c635e9d97c4c85083a 100755
 --- a/chrome/installer/linux/debian/build.sh
 +++ b/chrome/installer/linux/debian/build.sh
 @@ -21,7 +21,7 @@ gen_changelog() {
@@ -58,7 +58,7 @@ index 0a510aa0655780511bc90677264f3610a9acd994..1555fee518ec0560a5a1d7664a0032b8
  }
  
  process_opts() {
-@@ -259,6 +263,17 @@ fi
+@@ -253,6 +257,17 @@ fi
  eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \
    "${BUILDDIR}/installer/theme/BRANDING")
  
@@ -76,7 +76,7 @@ index 0a510aa0655780511bc90677264f3610a9acd994..1555fee518ec0560a5a1d7664a0032b8
  verify_channel
  
  # Some Debian packaging tools want these set.
-@@ -271,6 +286,10 @@ COMMON_PREDEPS="dpkg (>= 1.14.0)"
+@@ -266,6 +281,10 @@ COMMON_PREDEPS="dpkg (>= 1.14.0)"
  MANUAL_RECOMMENDS="${SCRIPTDIR}/manual_recommends"
  COMMON_RECOMMENDS=$(grep -v ^$ "${MANUAL_RECOMMENDS}" | grep -v ^# |
                          sed ':a;N;$!ba;s/\n/, /g')
diff --git a/patches/chrome-installer-linux-rpm-build.sh.patch b/patches/chrome-installer-linux-rpm-build.sh.patch
index 316252a4d7cd..5f6b772d4afe 100644
--- a/patches/chrome-installer-linux-rpm-build.sh.patch
+++ b/patches/chrome-installer-linux-rpm-build.sh.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh
-index 0bcd8689d45850ad539f99423fa211785db4f343..cec0813f491a570fb499e7de5adb9d13e950e7e4 100755
+index 8e9c7e56813d8791c46fa28c866e67dbde03e60a..0c433285add2b2dbfd06bb2fdcca0a81a07d39be 100755
 --- a/chrome/installer/linux/rpm/build.sh
 +++ b/chrome/installer/linux/rpm/build.sh
 @@ -15,8 +15,9 @@ gen_spec() {
diff --git a/patches/chrome-installer-mac-BUILD.gn.patch b/patches/chrome-installer-mac-BUILD.gn.patch
index 8f8ea25fe118..c234bd22f30e 100644
--- a/patches/chrome-installer-mac-BUILD.gn.patch
+++ b/patches/chrome-installer-mac-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/mac/BUILD.gn b/chrome/installer/mac/BUILD.gn
-index c335cad745f1373eb4288064efefc660b9cbd2c8..2d640c7219b0da5320653e234ed293bdee95fea3 100644
+index c6f23f82ac2e78e113b8aebb192482d9653f8224..e0dc1c9b1800760d00073d9ba56fd9e15a9eec95 100644
 --- a/chrome/installer/mac/BUILD.gn
 +++ b/chrome/installer/mac/BUILD.gn
 @@ -13,7 +13,7 @@ group("mac") {
diff --git a/patches/chrome-installer-mac-signing-pipeline.py.patch b/patches/chrome-installer-mac-signing-pipeline.py.patch
index a561b6c74e9e..150c6a84e5f2 100644
--- a/patches/chrome-installer-mac-signing-pipeline.py.patch
+++ b/patches/chrome-installer-mac-signing-pipeline.py.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/mac/signing/pipeline.py b/chrome/installer/mac/signing/pipeline.py
-index 715e46e55692d206e15049f4f3e66e1804121b05..2270664b54550d311f59481799fe7af483c21774 100644
+index 84a09df705b21f69ce69815cfa6b76921d35e96e..7d1d3b84c12bd02648d6978162c405fbf2deb8d7 100644
 --- a/chrome/installer/mac/signing/pipeline.py
 +++ b/chrome/installer/mac/signing/pipeline.py
-@@ -536,5 +536,8 @@ def sign_all(orig_paths,
+@@ -535,5 +535,8 @@ def sign_all(orig_paths,
                          uuids_to_package_path.keys(), config):
                      package_path = uuids_to_package_path[result]
                      notarize.staple(package_path)
diff --git a/patches/chrome-installer-mini_installer-BUILD.gn.patch b/patches/chrome-installer-mini_installer-BUILD.gn.patch
index 51a3cfdfe957..b89a499fe845 100644
--- a/patches/chrome-installer-mini_installer-BUILD.gn.patch
+++ b/patches/chrome-installer-mini_installer-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
-index 7d835183ab85b5b0eb628bba236ca44279b69366..a4dbbfbc21f08ddc6a7c20b112fc5acb915f0aac 100644
+index b2c99d4721dd90a750f85fbedcb2bec4502e1ed7..93079f85a2d28756977f87d1f135e05294f3b814 100644
 --- a/chrome/installer/mini_installer/BUILD.gn
 +++ b/chrome/installer/mini_installer/BUILD.gn
 @@ -11,6 +11,7 @@ import("//third_party/icu/config.gni")
diff --git a/patches/chrome-installer-mini_installer-chrome.release.patch b/patches/chrome-installer-mini_installer-chrome.release.patch
index 2c2f3e92a49f..c0a4b5bc49c8 100644
--- a/patches/chrome-installer-mini_installer-chrome.release.patch
+++ b/patches/chrome-installer-mini_installer-chrome.release.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
-index 1352dc18e31ea9e775949620db9e29fb1ba86ac0..2df1f312961706b0cd2a41f4157affc9587939cc 100644
+index 358dbff5bc2bbfd8887b06b3170d4727ed842648..6e01e6ad766513c6d8e70724659a905f18d123f2 100644
 --- a/chrome/installer/mini_installer/chrome.release
 +++ b/chrome/installer/mini_installer/chrome.release
 @@ -6,7 +6,7 @@
@@ -24,7 +24,7 @@ index 1352dc18e31ea9e775949620db9e29fb1ba86ac0..2df1f312961706b0cd2a41f4157affc9
  chrome_child.dll: %(VersionDir)s\
 +chrome_child.dll.sig: %(VersionDir)s\
  chrome_elf.dll: %(VersionDir)s\
- chrome_watcher.dll: %(VersionDir)s\
+ chrome_pwa_launcher.exe: %(VersionDir)s\
  d3dcompiler_47.dll: %(VersionDir)s\
 @@ -63,6 +68,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\
  
diff --git a/patches/chrome-installer-util-BUILD.gn.patch b/patches/chrome-installer-util-BUILD.gn.patch
index 2efea9e332b9..4def2be0e1ea 100644
--- a/patches/chrome-installer-util-BUILD.gn.patch
+++ b/patches/chrome-installer-util-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn
-index 0f5e97d02fe8e955ff6cb3d865f84fb75e8a4c8a..9abde952e44ef68227a9cbcf96e474fc6c1aaebe 100644
+index dae16bd9569eb23ce882df850bfe0295d1a9f2e9..9f93eae6e11e551c59c41130c474cfd54cea2347 100644
 --- a/chrome/installer/util/BUILD.gn
 +++ b/chrome/installer/util/BUILD.gn
-@@ -220,7 +220,20 @@ generate_embedded_i18n("generate_strings") {
+@@ -224,7 +224,20 @@ generate_embedded_i18n("generate_strings") {
  
    output_file_name_base = "installer_util_strings"
  
diff --git a/patches/chrome-installer-util-google_update_settings.cc.patch b/patches/chrome-installer-util-google_update_settings.cc.patch
index d6d98e85c00a..1cee35ec7bb7 100644
--- a/patches/chrome-installer-util-google_update_settings.cc.patch
+++ b/patches/chrome-installer-util-google_update_settings.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
-index 81969fb4994f01110e17385acfe7f2bfaf3f9302..49374ed4823b68dd7534f1ca0385bef6fbd6b623 100644
+index 350eb833bc2fcfc7bc6f679c25252698703bf5c3..b57803773977301ebe136413b71a27be9f0deaae 100644
 --- a/chrome/installer/util/google_update_settings.cc
 +++ b/chrome/installer/util/google_update_settings.cc
-@@ -29,7 +29,11 @@ using base::win::RegKey;
+@@ -30,7 +30,11 @@ using base::win::RegKey;
  using installer::InstallationState;
  
  const wchar_t GoogleUpdateSettings::kPoliciesKey[] =
@@ -14,7 +14,7 @@ index 81969fb4994f01110e17385acfe7f2bfaf3f9302..49374ed4823b68dd7534f1ca0385bef6
  const wchar_t GoogleUpdateSettings::kUpdatePolicyValue[] = L"UpdateDefault";
  const wchar_t GoogleUpdateSettings::kDownloadPreferencePolicyValue[] =
      L"DownloadPreference";
-@@ -41,6 +45,10 @@ const wchar_t GoogleUpdateSettings::kCheckPeriodOverrideMinutes[] =
+@@ -42,6 +46,10 @@ const wchar_t GoogleUpdateSettings::kCheckPeriodOverrideMinutes[] =
  const int GoogleUpdateSettings::kCheckPeriodOverrideMinutesMax =
      60 * 24 * 7 * 6;
  
diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch
index 9bc99a88af51..1bd3f8ed4ca4 100644
--- a/patches/chrome-renderer-BUILD.gn.patch
+++ b/patches/chrome-renderer-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
-index b2eaaf2b29fd4d95efa7547398d492fd709df1c9..9ae90b24d9cfb64d56266703d9de5426455b00ec 100644
+index 9b93e72eee7b41587f7e7c63a8797e8ed2b98f1d..5dd5924462094517cb2a3e364c1bb73e5e8889fe 100644
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -129,6 +129,7 @@ jumbo_static_library("renderer") {
+@@ -127,6 +127,7 @@ jumbo_static_library("renderer") {
    defines = []
  
    deps = [
diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch
index 8c7757585426..732566c43af1 100644
--- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch
+++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
-index e03ad3a5a115383143d1324164dfd37f87c6f2f2..c98392b8175456a13d42c56d0e69429c03f81d5b 100644
+index 42383cda5a9ccb39e64ee65d0202bee60639623f..81b57564c40c7c6fbd1ec0b2464ff3fa92460c21 100644
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
 @@ -23,6 +23,7 @@
@@ -10,7 +10,7 @@ index e03ad3a5a115383143d1324164dfd37f87c6f2f2..c98392b8175456a13d42c56d0e69429c
  #include "chrome/common/buildflags.h"
  #include "chrome/common/channel_info.h"
  #include "chrome/common/chrome_content_client.h"
-@@ -472,7 +473,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -469,7 +470,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
    bool should_whitelist_for_content_settings =
        base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kInstantProcess);
diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch
index fdb8210bfe9b..653a5932118a 100644
--- a/patches/chrome-renderer-chrome_content_renderer_client.h.patch
+++ b/patches/chrome-renderer-chrome_content_renderer_client.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
-index 496c03c32e3c72274cba1dabe0a03d46e38ec3c6..0ab913c960c00902202b1f48d9e825a635107201 100644
+index 8969adb44800e925c9066e51793463c09eb78622..27e189b6fb21ee994a54d520a739500a9890f2a6 100644
 --- a/chrome/renderer/chrome_content_renderer_client.h
 +++ b/chrome/renderer/chrome_content_renderer_client.h
-@@ -242,6 +242,7 @@ class ChromeContentRendererClient
+@@ -225,6 +225,7 @@ class ChromeContentRendererClient
  #endif
  
   private:
diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
index 01a4085fc295..d44c01c28ca9 100644
--- a/patches/chrome-test-BUILD.gn.patch
+++ b/patches/chrome-test-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 021f7ad27b922525cf8ee1c2da0faa8ed4adadf7..d765d4a0b2a85fc872207cdcc27fb861551b0dc3 100644
+index a55dac1d2eeb7c3c5fc5a0c2cedd3a780b71635c..3dcbe38bcd17ec3b06ca923e6d21bc0d90500fb2 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -762,6 +762,7 @@ if (!is_android) {
+@@ -737,6 +737,7 @@ if (!is_android) {
        "//v8",
      ]
  
diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch
index c1927752ab1f..222e72375b1b 100644
--- a/patches/chrome-utility-BUILD.gn.patch
+++ b/patches/chrome-utility-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
-index 76bf112ce1f35526519f5f85df265755ec87c660..ab3aa5813965ac45f1cef57d0d932db2bc5eca3e 100644
+index a413210c2e41fb47eed96ae29c1b63bfeb68a83e..bd86bd0535f58ac13caece241d3c528ff20f4bcd 100644
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
 @@ -29,6 +29,7 @@ static_library("utility") {
diff --git a/patches/components-bookmarks-browser-bookmark_model.h.patch b/patches/components-bookmarks-browser-bookmark_model.h.patch
index d1a7387558a4..8cd5d5ebdbf3 100644
--- a/patches/components-bookmarks-browser-bookmark_model.h.patch
+++ b/patches/components-bookmarks-browser-bookmark_model.h.patch
@@ -1,8 +1,8 @@
 diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
-index 1dbfe99d44442a0a2ade363c404c5428385aee7c..f9b2d3ed5229c92dcad4b8daf020d3999499f0fa 100644
+index ed953cc352ed4623e59ad1ec216d0395a6f3e442..3063952b338119ba6c1444579e0e41251e5fa009 100644
 --- a/components/bookmarks/browser/bookmark_model.h
 +++ b/components/bookmarks/browser/bookmark_model.h
-@@ -324,6 +324,7 @@ class BookmarkModel : public BookmarkUndoProvider,
+@@ -313,6 +313,7 @@ class BookmarkModel : public BookmarkUndoProvider,
      return weak_factory_.GetWeakPtr();
    }
  
diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch
index 017ef8803fda..381da3f6ff37 100644
--- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch
+++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml
-index 41ab5b17ee1969402268691d30b20f0751d51a81..ff43bd23b7fd017893166a67e1923814e4e88f56 100644
+index 19cfeaa3a18292b2d7f2ea1fbd3c5167ec25c9cf..93c001dde27811d066f3d823640d290436d0f227 100644
 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml
 +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml
-@@ -65,7 +65,7 @@
+@@ -63,7 +63,7 @@
      <dimen name="modern_toolbar_background_size">40dp</dimen>
      <!-- Sometimes the modern toolbar is shown at 48dp so a corner radius of
           24dp is needed to completely round the corners. -->
diff --git a/patches/components-content_settings-core-browser-BUILD.gn.patch b/patches/components-content_settings-core-browser-BUILD.gn.patch
index c8bd410160b5..8bb416cc1c01 100644
--- a/patches/components-content_settings-core-browser-BUILD.gn.patch
+++ b/patches/components-content_settings-core-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
-index 3918713bb0bba7664023146ce01311b1a6e807b7..e06c41a6dcd1f77808155105584aed5b43376250 100644
+index fe0850fd12e21fa1dd99c78cd4a237ad750d0021..30872a6305fc99fee3460f047e27f2b7c7f21808 100644
 --- a/components/content_settings/core/browser/BUILD.gn
 +++ b/components/content_settings/core/browser/BUILD.gn
-@@ -61,6 +61,7 @@ jumbo_static_library("browser") {
+@@ -63,6 +63,7 @@ jumbo_static_library("browser") {
      "//services/preferences/public/cpp",
      "//url",
    ]
diff --git a/patches/components-content_settings-core-browser-content_settings_utils.cc.patch b/patches/components-content_settings-core-browser-content_settings_utils.cc.patch
index 195dfd0bf744..0d18c26a3cd1 100644
--- a/patches/components-content_settings-core-browser-content_settings_utils.cc.patch
+++ b/patches/components-content_settings-core-browser-content_settings_utils.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
-index a66ca0ac3f01cc6a92c54bbaaef031b7e6414510..8e6d8b24f554ed34ca26a3bd1e9127a7918f53c3 100644
+index d585f9cb249955ad9749c0c6296cf9440839dbb9..87ccdeb4c702d03a3a37747f77f38329d91c9599 100644
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -148,6 +148,7 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
+@@ -149,6 +149,7 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
                               &(rules->client_hints_rules));
    map->GetSettingsForOneType(ContentSettingsType::POPUPS, ResourceIdentifier(),
                               &(rules->popup_redirect_rules));
diff --git a/patches/components-content_settings-core-common-content_settings.cc.patch b/patches/components-content_settings-core-common-content_settings.cc.patch
index ca8e747ce5ba..7533822bf2b6 100644
--- a/patches/components-content_settings-core-common-content_settings.cc.patch
+++ b/patches/components-content_settings-core-common-content_settings.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
-index 12e6bca9a4fddfc32249e00e32dba61ae35b37d0..be5c9485b44a9252f0a298a2c593fe8d2e853291 100644
+index 55be84ee488d0a8277e22acc6bf11617c17208e0..64516af6f772bc7effd23ece4340e4b7f45dc028 100644
 --- a/components/content_settings/core/common/content_settings.cc
 +++ b/components/content_settings/core/common/content_settings.cc
-@@ -164,6 +164,7 @@ bool RendererContentSettingRules::IsRendererContentSetting(
+@@ -166,6 +166,7 @@ bool RendererContentSettingRules::IsRendererContentSetting(
           content_type == ContentSettingsType::JAVASCRIPT ||
           content_type == ContentSettingsType::CLIENT_HINTS ||
           content_type == ContentSettingsType::POPUPS ||
diff --git a/patches/components-content_settings-core-common-content_settings.h.patch b/patches/components-content_settings-core-common-content_settings.h.patch
index 2b0d0e091feb..60727bb3400b 100644
--- a/patches/components-content_settings-core-common-content_settings.h.patch
+++ b/patches/components-content_settings-core-common-content_settings.h.patch
@@ -1,5 +1,5 @@
 diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
-index 1203cc6ada248375bce7cb37054bcf0cd9957ea0..406743f971e93c821d4737ec4927b1df12d6a7a2 100644
+index 9ad36e5e7f4637ce9fb9b8362bf42d69c2d640a2..242325a05dc65674667162ecc5317fe3a14e410b 100644
 --- a/components/content_settings/core/common/content_settings.h
 +++ b/components/content_settings/core/common/content_settings.h
 @@ -75,6 +75,7 @@ struct RendererContentSettingRules {
diff --git a/patches/components-crash-content-app-breakpad_linux.cc.patch b/patches/components-crash-content-app-breakpad_linux.cc.patch
index 686af44b8201..0bef9e4b4f7a 100644
--- a/patches/components-crash-content-app-breakpad_linux.cc.patch
+++ b/patches/components-crash-content-app-breakpad_linux.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/crash/content/app/breakpad_linux.cc b/components/crash/content/app/breakpad_linux.cc
-index 27683246750c4e0eaec83cfe81e170ea326d1814..f74e214fa09052ae24eca94dddeea84453767fdf 100644
+index c1edb2b014ec1edb730ce107b45235e11c42482a..d99a4a84843511672938cd0c686834503978ea16 100644
 --- a/components/crash/content/app/breakpad_linux.cc
 +++ b/components/crash/content/app/breakpad_linux.cc
 @@ -103,8 +103,12 @@ namespace {
diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch
index 59fb0f3fac21..84c9a6f5abe7 100644
--- a/patches/components-download-internal-common-download_item_impl.cc.patch
+++ b/patches/components-download-internal-common-download_item_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc
-index 30a63620c7d87a34e28b862e5ad0feefda68baa8..8a067c77763147371a0665e4a107dab4ad1d5ed6 100644
+index 15d360a82f5c9f169e9196f2f221ff5bf1e6fac5..5ceb572b348a41fb7bfc03b588fbd72fbef4819f 100644
 --- a/components/download/internal/common/download_item_impl.cc
 +++ b/components/download/internal/common/download_item_impl.cc
-@@ -1883,8 +1883,8 @@ void DownloadItemImpl::OnDownloadCompleting() {
+@@ -1868,8 +1868,8 @@ void DownloadItemImpl::OnDownloadCompleting() {
                       base::Unretained(download_file_.get()),
                       GetTargetFilePath(),
                       delegate_->GetApplicationClientIdForFileScanning(),
diff --git a/patches/components-invalidation-impl-fcm_network_handler.cc.patch b/patches/components-invalidation-impl-fcm_network_handler.cc.patch
index 09ba6dacdbc2..02cbf6a80938 100644
--- a/patches/components-invalidation-impl-fcm_network_handler.cc.patch
+++ b/patches/components-invalidation-impl-fcm_network_handler.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/invalidation/impl/fcm_network_handler.cc b/components/invalidation/impl/fcm_network_handler.cc
-index 7d6e308a7755c8527d915056c43559102d34f236..941def01683470af8725662f9b0ded165c8eb7ab 100644
+index ea99762b24c5c095343b0e14b9a331971a4a8ac2..96ff7e7ef4506b0fc4c07825a48e3fb91d5ef7dd 100644
 --- a/components/invalidation/impl/fcm_network_handler.cc
 +++ b/components/invalidation/impl/fcm_network_handler.cc
-@@ -148,6 +148,7 @@ std::unique_ptr<syncer::FCMNetworkHandler> FCMNetworkHandler::Create(
+@@ -181,6 +181,7 @@ std::unique_ptr<syncer::FCMNetworkHandler> FCMNetworkHandler::Create(
  }
  
  void FCMNetworkHandler::StartListening() {
diff --git a/patches/components-network_time-network_time_tracker.cc.patch b/patches/components-network_time-network_time_tracker.cc.patch
index 824a14ce726f..8a316f2a295e 100644
--- a/patches/components-network_time-network_time_tracker.cc.patch
+++ b/patches/components-network_time-network_time_tracker.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/network_time/network_time_tracker.cc b/components/network_time/network_time_tracker.cc
-index 3a4bed488a162d51b443176c3f380d1db549c0fb..828a5bf1532ad5dd3cf48673bf527e5852149f9a 100644
+index 76a42ceaa84da4913cf56c42c89ced5b8d8c74f3..20b397bb67b0fff7a7f2495db0b0aa81d2149530 100644
 --- a/components/network_time/network_time_tracker.cc
 +++ b/components/network_time/network_time_tracker.cc
 @@ -276,7 +276,7 @@ void NetworkTimeTracker::UpdateNetworkTime(base::Time network_time,
diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch
index 03e352ebef01..8e46746496b4 100644
--- a/patches/components-omnibox-browser-BUILD.gn.patch
+++ b/patches/components-omnibox-browser-BUILD.gn.patch
@@ -1,12 +1,12 @@
 diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
-index 34eb02f5de4131ac7365a83a8811273c2623ca2a..6172e8dee684d8a43eed1622537b3264f0079f0b 100644
+index f8028817e0a2f5cd59c6d4d54f951ea489a6e054..a9998ffd612c96b1f5aae5ab29b6a719fc922556 100644
 --- a/components/omnibox/browser/BUILD.gn
 +++ b/components/omnibox/browser/BUILD.gn
-@@ -258,6 +258,7 @@ jumbo_static_library("browser") {
+@@ -257,6 +257,7 @@ jumbo_static_library("browser") {
    if ((!is_android || enable_vr) && !is_ios) {
      deps += [ ":vector_icons" ]
    }
 +  if (brave_chromium_build) {  deps += [ "//brave/components/omnibox/browser" ] }
  
    if (is_android) {
-     deps += [ ":jni_headers" ]
+     sources += [
diff --git a/patches/components-omnibox-browser-autocomplete_controller.h.patch b/patches/components-omnibox-browser-autocomplete_controller.h.patch
index 6bbfddf7e792..b7bc6c0f1dbc 100644
--- a/patches/components-omnibox-browser-autocomplete_controller.h.patch
+++ b/patches/components-omnibox-browser-autocomplete_controller.h.patch
@@ -1,8 +1,8 @@
 diff --git a/components/omnibox/browser/autocomplete_controller.h b/components/omnibox/browser/autocomplete_controller.h
-index e48b29c2fd792156f80fd8662ffac13247b4aac9..e327317ff3ea070576f87993cf73dcab98824961 100644
+index 80fdfe2cd2f85df3f2db29f50563e19686a1c664..199d51be7b16c861c85119353fe859ee272f0aa3 100644
 --- a/components/omnibox/browser/autocomplete_controller.h
 +++ b/components/omnibox/browser/autocomplete_controller.h
-@@ -148,6 +148,7 @@ class AutocompleteController : public AutocompleteProviderListener,
+@@ -166,6 +166,7 @@ class AutocompleteController : public AutocompleteProviderListener,
    }
  
   private:
diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
index 9f6c5159f32e..0b9c89750715 100644
--- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
+++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
-index 377e6f4dcc4cc68798a98384f29b7b95ba48786a..c75b7d59a9f93000220d8d588b3ae835c3162678 100644
+index 509b8ceac0876fb6f03db4ff48dce452c2c61523..10ca18d5e7c1bbf9d5f59c23148078a60aa479b8 100644
 --- a/components/omnibox/browser/omnibox_edit_model.cc
 +++ b/components/omnibox/browser/omnibox_edit_model.cc
 @@ -384,6 +384,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch
index 065c40ed4f02..09e40b747dba 100644
--- a/patches/components-policy-tools-generate_policy_source.py.patch
+++ b/patches/components-policy-tools-generate_policy_source.py.patch
@@ -1,5 +1,5 @@
 diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py
-index 8886fb3dfcb6303bbfaa0ad7738cdad2900817ba..65674b4d8cf7787241ba4ca79920422671ff010d 100755
+index 96e3d2042722dfcc8150a48bad1ca34650ec3587..f50f275caee5137a43a90e2c53e316d227ff1197 100755
 --- a/components/policy/tools/generate_policy_source.py
 +++ b/components/policy/tools/generate_policy_source.py
 @@ -30,6 +30,7 @@ else:
diff --git a/patches/components-safe_browsing-core-db-v4_protocol_manager_util.cc.patch b/patches/components-safe_browsing-core-db-v4_protocol_manager_util.cc.patch
index 66261cb9dede..e67b9536e714 100644
--- a/patches/components-safe_browsing-core-db-v4_protocol_manager_util.cc.patch
+++ b/patches/components-safe_browsing-core-db-v4_protocol_manager_util.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/safe_browsing/core/db/v4_protocol_manager_util.cc b/components/safe_browsing/core/db/v4_protocol_manager_util.cc
-index d220a0441a7261f00e9c389b3b3b9c91f883980f..d44b679d88d1c580f307fa007a9a0f64c27a1c9f 100644
+index 2c17c0aeb7bc0d85491dcf6d0ba552eabf3fd97a..ef4313ce000d29569119b823f46f47bcd1ea0a94 100644
 --- a/components/safe_browsing/core/db/v4_protocol_manager_util.cc
 +++ b/components/safe_browsing/core/db/v4_protocol_manager_util.cc
 @@ -29,7 +29,7 @@ namespace safe_browsing {
diff --git a/patches/components-sync-driver-glue-sync_engine_impl.h.patch b/patches/components-sync-driver-glue-sync_engine_impl.h.patch
index 938638f33b41..d505a8637a06 100644
--- a/patches/components-sync-driver-glue-sync_engine_impl.h.patch
+++ b/patches/components-sync-driver-glue-sync_engine_impl.h.patch
@@ -1,8 +1,8 @@
 diff --git a/components/sync/driver/glue/sync_engine_impl.h b/components/sync/driver/glue/sync_engine_impl.h
-index 7457aefee870c5961344c9f135665d6b55bc848f..e5410ba5918a278ed2f4d37af65df8445182501a 100644
+index 9d900d5b9219a8cecb02aa6ae9555ccac375ac5d..403696d12411c39ebc6ecc0d82b3e5c719e11d75 100644
 --- a/components/sync/driver/glue/sync_engine_impl.h
 +++ b/components/sync/driver/glue/sync_engine_impl.h
-@@ -222,6 +222,7 @@ class SyncEngineImpl : public SyncEngine, public InvalidationHandler {
+@@ -225,6 +225,7 @@ class SyncEngineImpl : public SyncEngine, public InvalidationHandler {
  
    base::WeakPtrFactory<SyncEngineImpl> weak_ptr_factory_{this};
  
diff --git a/patches/components-sync-driver-profile_sync_service.h.patch b/patches/components-sync-driver-profile_sync_service.h.patch
index 970c67cefbab..e53ed26da36f 100644
--- a/patches/components-sync-driver-profile_sync_service.h.patch
+++ b/patches/components-sync-driver-profile_sync_service.h.patch
@@ -1,8 +1,8 @@
 diff --git a/components/sync/driver/profile_sync_service.h b/components/sync/driver/profile_sync_service.h
-index c2761cef61443ebc0c991fe203717c2ac07afc8c..b36adc7a3016f8fc73240de8807801abd51fa9c1 100644
+index b71429377b2068f103656834068a079fded3822d..2072bb06f5cf782664d31a610b901c5ee57a6156 100644
 --- a/components/sync/driver/profile_sync_service.h
 +++ b/components/sync/driver/profile_sync_service.h
-@@ -515,6 +515,7 @@ class ProfileSyncService : public SyncService,
+@@ -521,6 +521,7 @@ class ProfileSyncService : public SyncService,
  
    base::WeakPtrFactory<ProfileSyncService> weak_factory_{this};
  
diff --git a/patches/components-sync-engine-sync_engine.h.patch b/patches/components-sync-engine-sync_engine.h.patch
index 1214a5afc7a3..7e7604da11bf 100644
--- a/patches/components-sync-engine-sync_engine.h.patch
+++ b/patches/components-sync-engine-sync_engine.h.patch
@@ -1,5 +1,5 @@
 diff --git a/components/sync/engine/sync_engine.h b/components/sync/engine/sync_engine.h
-index 3f9c99bdcabf841b1fc622f183778ff4184e2d72..7296b1d43b01713d3ef05acd0b424207dfe9e684 100644
+index 322cbdaaadcb455baab2c19a273e96e129f0b819..cdaa6788bbea7a41c2c454f58339adf616d3d645 100644
 --- a/components/sync/engine/sync_engine.h
 +++ b/components/sync/engine/sync_engine.h
 @@ -79,6 +79,7 @@ class SyncEngine : public ModelTypeConfigurer {
diff --git a/patches/components-sync-engine_impl-sync_manager_impl.cc.patch b/patches/components-sync-engine_impl-sync_manager_impl.cc.patch
index 6ea63054c746..7a58ee69c9a9 100644
--- a/patches/components-sync-engine_impl-sync_manager_impl.cc.patch
+++ b/patches/components-sync-engine_impl-sync_manager_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/sync/engine_impl/sync_manager_impl.cc b/components/sync/engine_impl/sync_manager_impl.cc
-index 1ccf4ca79c944eaab7d5606b20960b6c32b4af40..1e765cae399c7bbb192e4c8ee247c0b5086edcd9 100644
+index 477dca4f7b12921e1b931a4f87fce55a841f5d33..de84116803c38db496a846686c55dd24f8da404a 100644
 --- a/components/sync/engine_impl/sync_manager_impl.cc
 +++ b/components/sync/engine_impl/sync_manager_impl.cc
-@@ -388,8 +388,9 @@ void SyncManagerImpl::Init(InitArgs* args) {
+@@ -364,8 +364,9 @@ void SyncManagerImpl::Init(InitArgs* args) {
        args->poll_interval);
    scheduler_ = args->engine_components_factory->BuildScheduler(
        name_, cycle_context_.get(), args->cancelation_signal,
diff --git a/patches/components-sync-engine_impl-sync_scheduler_impl.cc.patch b/patches/components-sync-engine_impl-sync_scheduler_impl.cc.patch
index 62a4a1fafe9e..9ed5d194f2c9 100644
--- a/patches/components-sync-engine_impl-sync_scheduler_impl.cc.patch
+++ b/patches/components-sync-engine_impl-sync_scheduler_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/sync/engine_impl/sync_scheduler_impl.cc b/components/sync/engine_impl/sync_scheduler_impl.cc
-index 97b4e2a32e3e9c859d27a2e41580858455c9c4a9..3999232fba71fead404ab092df20527c9cb28a86 100644
+index 73d82300993fce2707b3d2455c0e3c60eaccd893..b1fc19bd50e6949bb3c1e2cc4d51234e780482f2 100644
 --- a/components/sync/engine_impl/sync_scheduler_impl.cc
 +++ b/components/sync/engine_impl/sync_scheduler_impl.cc
-@@ -710,6 +710,7 @@ void SyncSchedulerImpl::TryCanaryJob() {
+@@ -687,6 +687,7 @@ void SyncSchedulerImpl::TryCanaryJob() {
  }
  
  void SyncSchedulerImpl::TrySyncCycleJob() {
diff --git a/patches/components-sync-engine_impl-sync_scheduler_impl.h.patch b/patches/components-sync-engine_impl-sync_scheduler_impl.h.patch
index 4dcad561ab88..ce32c24890d3 100644
--- a/patches/components-sync-engine_impl-sync_scheduler_impl.h.patch
+++ b/patches/components-sync-engine_impl-sync_scheduler_impl.h.patch
@@ -1,5 +1,5 @@
 diff --git a/components/sync/engine_impl/sync_scheduler_impl.h b/components/sync/engine_impl/sync_scheduler_impl.h
-index 37124f93a88d5bf661e05b8a663513c000470d00..3897a864ee792469b8a0104356020eb7b3ea5216 100644
+index 3dd41b315c1b2c141688bc4c971ba79f04bf20ee..837dbbaf433970b0aaeb0bd7a3c4bdab7997e08f 100644
 --- a/components/sync/engine_impl/sync_scheduler_impl.h
 +++ b/components/sync/engine_impl/sync_scheduler_impl.h
 @@ -88,6 +88,7 @@ class SyncSchedulerImpl : public SyncScheduler {
diff --git a/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch b/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch
index 48f78f03e7c2..cd4e63ba84bc 100644
--- a/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch
+++ b/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch
@@ -1,18 +1,18 @@
 diff --git a/components/sync_bookmarks/bookmark_remote_updates_handler.cc b/components/sync_bookmarks/bookmark_remote_updates_handler.cc
-index f39e969dfe0099cd6f0ce31fb63b59360b5b6b16..be7f05370b84fd7e182b6fdfda7b3754c62275e3 100644
+index 500e604acdf5e94883176726e029105445114b43..9c433804be2faf468f89ca337c03301c7b9f3e62 100644
 --- a/components/sync_bookmarks/bookmark_remote_updates_handler.cc
 +++ b/components/sync_bookmarks/bookmark_remote_updates_handler.cc
-@@ -147,6 +147,7 @@ void ApplyRemoteUpdate(
+@@ -150,6 +150,7 @@ void ApplyRemoteUpdate(
    // Compute index information before updating the |tracker|.
    const size_t old_index = size_t{old_parent->GetIndexOf(node)};
    const size_t new_index =
 +    BRAVE_APPLY_REMOTE_UPDATE
        ComputeChildNodeIndex(new_parent, update_entity.unique_position, tracker);
-   tracker->Update(update_entity.id, update.response_version,
+   tracker->Update(tracked_entity, update.response_version,
                    update_entity.modification_time,
-@@ -474,9 +475,11 @@ bool BookmarkRemoteUpdatesHandler::ProcessCreate(
-     LogProblematicBookmark(RemoteBookmarkUpdateError::kMissingParentNode);
-     return false;
+@@ -494,9 +495,11 @@ BookmarkRemoteUpdatesHandler::ProcessCreate(
+     LogProblematicBookmark(RemoteBookmarkUpdateError::kParentNotFolder);
+     return nullptr;
    }
 +  BRAVE_PROCESS_CREATE_1
    const bookmarks::BookmarkNode* bookmark_node =
diff --git a/patches/content-browser-browser_main_loop.h.patch b/patches/content-browser-browser_main_loop.h.patch
index c63545f5b640..afd12b70cffb 100644
--- a/patches/content-browser-browser_main_loop.h.patch
+++ b/patches/content-browser-browser_main_loop.h.patch
@@ -1,8 +1,8 @@
 diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
-index 12f1469f91b3c031f620684fd1aa2c50eaa452d7..ebb8cb8284536b7f7ba2667428d8e5a28e4f118b 100644
+index 42bf9a2fd82277f174f78dc5756707bba300163e..f916d0723a219285df0e74a67662733456572e0f 100644
 --- a/content/browser/browser_main_loop.h
 +++ b/content/browser/browser_main_loop.h
-@@ -135,6 +135,7 @@ class CONTENT_EXPORT BrowserMainLoop {
+@@ -136,6 +136,7 @@ class CONTENT_EXPORT BrowserMainLoop {
    void PreMainMessageLoopStart();
    void MainMessageLoopStart();
    void PostMainMessageLoopStart();
diff --git a/patches/content-browser-devtools-devtools_url_loader_interceptor.cc.patch b/patches/content-browser-devtools-devtools_url_loader_interceptor.cc.patch
index 73984619a3a8..73923bcf437b 100644
--- a/patches/content-browser-devtools-devtools_url_loader_interceptor.cc.patch
+++ b/patches/content-browser-devtools-devtools_url_loader_interceptor.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/browser/devtools/devtools_url_loader_interceptor.cc b/content/browser/devtools/devtools_url_loader_interceptor.cc
-index beed2cbab782dc938f81e9cc505335077a5f0fc6..9ec613808cc5c825c300b4bad6b5cded1bc2afa0 100644
+index 50e5b36392930e74fde4477df3e05f53f98ffcf3..9c6f116fd369345ae8db7da05f032c15213cac9f 100644
 --- a/content/browser/devtools/devtools_url_loader_interceptor.cc
 +++ b/content/browser/devtools/devtools_url_loader_interceptor.cc
-@@ -1073,6 +1073,7 @@ void InterceptionJob::ProcessSetCookies(const net::HttpResponseHeaders& headers,
+@@ -1089,6 +1089,7 @@ void InterceptionJob::ProcessSetCookies(const net::HttpResponseHeaders& headers,
    size_t iter = 0;
    while (headers.EnumerateHeader(&iter, name, &cookie_line)) {
      std::unique_ptr<net::CanonicalCookie> cookie = net::CanonicalCookie::Create(
diff --git a/patches/content-browser-frame_host-navigation_controller_impl.cc.patch b/patches/content-browser-frame_host-navigation_controller_impl.cc.patch
index 770f4a910ed8..aa1a796e3c9a 100644
--- a/patches/content-browser-frame_host-navigation_controller_impl.cc.patch
+++ b/patches/content-browser-frame_host-navigation_controller_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
-index 1bb7007c16029db901514e79171952d07b47058e..abbff171f5375aecc8eef794767d9b43cd63aea2 100644
+index f950552abbe9e9a0002156b596438fe9aa4f01b9..294b079a7c4c72e2a13adb305a52710240193a04 100644
 --- a/content/browser/frame_host/navigation_controller_impl.cc
 +++ b/content/browser/frame_host/navigation_controller_impl.cc
-@@ -2887,16 +2887,17 @@ void NavigationControllerImpl::NavigateWithoutEntry(
+@@ -2886,16 +2886,17 @@ void NavigationControllerImpl::NavigateWithoutEntry(
    // Note: we intentionally leave the pending entry in place for renderer debug
    // URLs, unlike the cases below where we clear it if the navigation doesn't
    // proceed.
diff --git a/patches/content-browser-frame_host-navigation_request.cc.patch b/patches/content-browser-frame_host-navigation_request.cc.patch
index a9bb10d52bb3..b24fdf43954f 100644
--- a/patches/content-browser-frame_host-navigation_request.cc.patch
+++ b/patches/content-browser-frame_host-navigation_request.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
-index 85cfe2167b8df80cae724fa7a1194c004e780a02..12a1ee428fd09cbc78999c9d54bffa0a8f2bea5b 100644
+index dbfc24395349cfa40b5783590d60cc7e44b31205..8d4a2276a45491d390c84af6e33f4fc52c5d70af 100644
 --- a/content/browser/frame_host/navigation_request.cc
 +++ b/content/browser/frame_host/navigation_request.cc
-@@ -2190,6 +2190,7 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -2358,6 +2358,7 @@ void NavigationRequest::OnStartChecksComplete(
    headers.MergeFrom(TakeModifiedRequestHeaders());
    begin_params_->headers = headers.ToString();
  
diff --git a/patches/content-browser-permissions-permission_controller_impl.cc.patch b/patches/content-browser-permissions-permission_controller_impl.cc.patch
index 41f64204048e..f9429d30d9c2 100644
--- a/patches/content-browser-permissions-permission_controller_impl.cc.patch
+++ b/patches/content-browser-permissions-permission_controller_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/browser/permissions/permission_controller_impl.cc b/content/browser/permissions/permission_controller_impl.cc
-index 8e93627ddb8ff468f2d4f70fb2361ec54e3c14f9..faf04cf878d71987b87b9644782894ae55bb674b 100644
+index a7cfeb8583939c2f56b41473176bc38ac03c1200..572ab911e351b97d86b9416e166a72398834937c 100644
 --- a/content/browser/permissions/permission_controller_impl.cc
 +++ b/content/browser/permissions/permission_controller_impl.cc
-@@ -61,6 +61,7 @@ PermissionToSchedulingFeature(PermissionType permission_name) {
+@@ -64,6 +64,7 @@ PermissionToSchedulingFeature(PermissionType permission_name) {
      case PermissionType::SENSORS:
      case PermissionType::AR:
      case PermissionType::VR:
diff --git a/patches/content-child-child_thread_impl.cc.patch b/patches/content-child-child_thread_impl.cc.patch
index e8b7ed74f3c9..d0917a657e18 100644
--- a/patches/content-child-child_thread_impl.cc.patch
+++ b/patches/content-child-child_thread_impl.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
-index aee66825714b4b86e6021c2c4ab9cfd789c7c5ac..707366f0186c2ab85e9976b71f8441570e89428b 100644
+index 36574e68cb09076492902dd0a6e399472d568f7c..ff522b4319e6f1e19562f3ba8e0a2aedf9cf44fa 100644
 --- a/content/child/child_thread_impl.cc
 +++ b/content/child/child_thread_impl.cc
 @@ -180,6 +180,9 @@ class SuicideOnChannelErrorFilter : public IPC::MessageFilter {
diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch
index f56cf53c07d7..4434b533d41a 100644
--- a/patches/content-common-BUILD.gn.patch
+++ b/patches/content-common-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
-index b6a056296832cb34852d68d04bdf80372832de0a..cc7ba438daaf10e41548e0d2e768b19158aadf36 100644
+index f22f6c8410d9c96392c80b6231f39d5efe064531..c2de1d11915f036e9a8ae0707048ead8f034104a 100644
 --- a/content/common/BUILD.gn
 +++ b/content/common/BUILD.gn
 @@ -36,6 +36,7 @@ source_set("common") {
diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch
index 0f32c1a48f21..46f8597806bc 100644
--- a/patches/content-public-browser-content_browser_client.h.patch
+++ b/patches/content-public-browser-content_browser_client.h.patch
@@ -1,8 +1,8 @@
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 51f31b2c7e431004f2f1bf54e043ed497d166d4f..0d11ecd8dbf94190f735daf8c1a9bebf79615bb5 100644
+index 26cd6d1afcb89148ed33ab733012a778e9b75c40..663599a225eb161ec4a92832c43dca2f485df24e 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -1714,6 +1714,7 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1724,6 +1724,7 @@ class CONTENT_EXPORT ContentBrowserClient {
    virtual ui::AXMode GetAXModeForBrowserContext(
        BrowserContext* browser_context);
  
diff --git a/patches/content-public-browser-permission_type.h.patch b/patches/content-public-browser-permission_type.h.patch
index e366f46dadd8..49259ba9fb5f 100644
--- a/patches/content-public-browser-permission_type.h.patch
+++ b/patches/content-public-browser-permission_type.h.patch
@@ -1,10 +1,10 @@
 diff --git a/content/public/browser/permission_type.h b/content/public/browser/permission_type.h
-index 187712cd58149a068dc5c0d4c74564f9884c0152..e2c797d5235b6dac2351d5286a2c8c8697688b6a 100644
+index 2082109c41697a3a9d1c85bf2456eca8c97af7c0..c085edc18f5194230514f9c4c2996831e7279c40 100644
 --- a/content/public/browser/permission_type.h
 +++ b/content/public/browser/permission_type.h
-@@ -47,6 +47,7 @@ enum class PermissionType {
-   VR = 25,
+@@ -48,6 +48,7 @@ enum class PermissionType {
    AR = 26,
+   STORAGE_ACCESS_GRANT = 27,
  
 +  AUTOPLAY,
    // Always keep this at the end.
diff --git a/patches/content-public-browser-url_data_source.cc.patch b/patches/content-public-browser-url_data_source.cc.patch
index 42968b7d7d26..2068657d879b 100644
--- a/patches/content-public-browser-url_data_source.cc.patch
+++ b/patches/content-public-browser-url_data_source.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/content/public/browser/url_data_source.cc b/content/public/browser/url_data_source.cc
-index 96c0c9a5a84f08ee391b5382a02c609e1859fc50..b9388af6a531e2cd63f22602d57c7c63883caff8 100644
+index 406ecfd3f97e618a0392661549523872c0ee42c2..f544b17b8313a9047b4cd6685e31a016ada2ddd2 100644
 --- a/content/public/browser/url_data_source.cc
 +++ b/content/public/browser/url_data_source.cc
 @@ -85,7 +85,7 @@ bool URLDataSource::ShouldAddContentSecurityPolicy() {
diff --git a/patches/content-public-test-browser_test_utils.cc.patch b/patches/content-public-test-browser_test_utils.cc.patch
index 6bae72399d20..ef7b4638b76e 100644
--- a/patches/content-public-test-browser_test_utils.cc.patch
+++ b/patches/content-public-test-browser_test_utils.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
-index da8e2dc1ed5974a2393f92949aaf7832ce55b470..9bd61cdc7324e4ccd0752d20b1572f0df93a253f 100644
+index aa20fa5f9e375e5a369f28ea2bbf296a3aa760d5..389a0a533c5425859af0204fac3995aa9a049e3f 100644
 --- a/content/public/test/browser_test_utils.cc
 +++ b/content/public/test/browser_test_utils.cc
-@@ -1887,6 +1887,7 @@ bool SetCookie(BrowserContext* browser_context,
+@@ -1906,6 +1906,7 @@ bool SetCookie(BrowserContext* browser_context,
        ->GetNetworkContext()
        ->GetCookieManager(cookie_manager.BindNewPipeAndPassReceiver());
    std::unique_ptr<net::CanonicalCookie> cc(net::CanonicalCookie::Create(
diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch
index dfc19c513591..78bd050fdb0d 100644
--- a/patches/content-renderer-render_thread_impl.cc.patch
+++ b/patches/content-renderer-render_thread_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index ae1a77a219f153f034c2702447a3ede9d9c9b960..9338614590ba54aeb9c1c6ac5e89873c4156d453 100644
+index 97bedbbbf571b34b8dcbabc308dc1dafd2ca2427..949ec0674913f2ecedb71abe7d231801812b13d4 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1028,6 +1028,8 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) {
+@@ -1042,6 +1042,14 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) {
  }
  
  void RenderThreadImpl::RegisterSchemes() {
diff --git a/patches/extensions-browser-BUILD.gn.patch b/patches/extensions-browser-BUILD.gn.patch
index 3273a95ec5e5..1002c9ad5a73 100644
--- a/patches/extensions-browser-BUILD.gn.patch
+++ b/patches/extensions-browser-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn
-index f1f2857db07c4b96d2df1ede94e8d87a0cd422c4..5730daa7e4048e24195d6fb222b5226b998a3dad 100644
+index c65bf1a827f31cec70d713da675348c830498be0..474fd6039b70f3b62c26d7a9a6cf812b6e9f16b9 100644
 --- a/extensions/browser/BUILD.gn
 +++ b/extensions/browser/BUILD.gn
 @@ -402,6 +402,7 @@ jumbo_source_set("browser_sources") {
diff --git a/patches/extensions-browser-api-web_request-web_request_api.cc.patch b/patches/extensions-browser-api-web_request-web_request_api.cc.patch
index a782f6a49458..9b2c6d30c46e 100644
--- a/patches/extensions-browser-api-web_request-web_request_api.cc.patch
+++ b/patches/extensions-browser-api-web_request-web_request_api.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc
-index ec380aaa3c431066b7801333e33244127386ac36..0182480e01fc43efd41c6c1dba330d3a68459950 100644
+index 63051401f003ef5e0d76ad958db4a137fac540fc..95b4421acaba13ddb71c10bf7d18fe0fc108a24f 100644
 --- a/extensions/browser/api/web_request/web_request_api.cc
 +++ b/extensions/browser/api/web_request/web_request_api.cc
-@@ -1372,6 +1372,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
+@@ -1371,6 +1371,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
      const net::AuthChallengeInfo& auth_info,
      AuthCallback callback,
      net::AuthCredentials* credentials) {
diff --git a/patches/extensions-browser-sandboxed_unpacker.cc.patch b/patches/extensions-browser-sandboxed_unpacker.cc.patch
index 42e0a42ed539..376807a88a01 100644
--- a/patches/extensions-browser-sandboxed_unpacker.cc.patch
+++ b/patches/extensions-browser-sandboxed_unpacker.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc
-index 9999a230df79b18ec31dd849675b15462162e4d8..96e6862e9fd34c42a3720d05340f3e4c89c5770a 100644
+index cf3356b7ef4eeb4b8aab554deca86a3514887743..8e961c612d3fcf3c8aeb6ce06f4d59d47ce3254d 100644
 --- a/extensions/browser/sandboxed_unpacker.cc
 +++ b/extensions/browser/sandboxed_unpacker.cc
-@@ -1003,6 +1003,7 @@ base::Optional<base::Value> SandboxedUnpacker::RewriteManifestFile(
+@@ -1008,6 +1008,7 @@ base::Optional<base::Value> SandboxedUnpacker::RewriteManifestFile(
    DCHECK(!public_key_.empty());
    base::Value final_manifest = manifest.Clone();
    final_manifest.SetStringKey(manifest_keys::kPublicKey, public_key_);
diff --git a/patches/extensions-browser-updater-update_service.cc.patch b/patches/extensions-browser-updater-update_service.cc.patch
index 3a274564bbaf..79311e5c96cc 100644
--- a/patches/extensions-browser-updater-update_service.cc.patch
+++ b/patches/extensions-browser-updater-update_service.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/extensions/browser/updater/update_service.cc b/extensions/browser/updater/update_service.cc
-index 967c7b0b8dea1babb0a480c4cdeb85b76ba7b0a5..e7d575c3c5a6682801f595cb501335769917e8e7 100644
+index 6e96cc25859cb3e84b4a342bd90c3072455ace91..4de3758ac3cb029d5115cb1387c71f1bc8fab492 100644
 --- a/extensions/browser/updater/update_service.cc
 +++ b/extensions/browser/updater/update_service.cc
-@@ -33,7 +33,7 @@ namespace {
+@@ -35,7 +35,7 @@ namespace {
  UpdateService* update_service_override = nullptr;
  
  // 98% of update checks have 22 or less extensions.
diff --git a/patches/extensions-renderer-native_extension_bindings_system.h.patch b/patches/extensions-renderer-native_extension_bindings_system.h.patch
index fe6a6f897195..aa0d792c44bc 100644
--- a/patches/extensions-renderer-native_extension_bindings_system.h.patch
+++ b/patches/extensions-renderer-native_extension_bindings_system.h.patch
@@ -1,5 +1,5 @@
 diff --git a/extensions/renderer/native_extension_bindings_system.h b/extensions/renderer/native_extension_bindings_system.h
-index 86d8f20e2981fbfea7a96ff19b4a04b6ac9bb1c8..bb6c802a94b9a8d1018d7b2f3b223f6e9ee41c1e 100644
+index 05a6a2b91e39f57a49a29f54d10b5df983dc02a7..9ea765e3dfaab24ffb738e8c6ea54249a4c6a35e 100644
 --- a/extensions/renderer/native_extension_bindings_system.h
 +++ b/extensions/renderer/native_extension_bindings_system.h
 @@ -34,7 +34,7 @@ class NativeExtensionBindingsSystem {
diff --git a/patches/google_apis-gaia-gaia_urls.cc.patch b/patches/google_apis-gaia-gaia_urls.cc.patch
index 64c522177460..5870d02e6924 100644
--- a/patches/google_apis-gaia-gaia_urls.cc.patch
+++ b/patches/google_apis-gaia-gaia_urls.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc
-index 1fd6fe8ee45b0be413dff76c396aec3758694b44..01acfa6c7cf6fa49ad15a3e44c89c92cd9f0a379 100644
+index c3526692b92d06148591027e37c39fa981850595..57257f37e240e538ca053538639948098d69b738 100644
 --- a/google_apis/gaia/gaia_urls.cc
 +++ b/google_apis/gaia/gaia_urls.cc
 @@ -17,7 +17,7 @@ namespace {
diff --git a/patches/media-blink-key_system_config_selector.cc.patch b/patches/media-blink-key_system_config_selector.cc.patch
index deb67b7d3aac..184a85a95d8c 100644
--- a/patches/media-blink-key_system_config_selector.cc.patch
+++ b/patches/media-blink-key_system_config_selector.cc.patch
@@ -1,12 +1,12 @@
 diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc
-index 7d2951d11747b3d95ef02fa838e091867783cc2b..d91ba81506dc6a25d58e4d52919d5ead42fb2091 100644
+index aee284570d43e8854e4a7e85c26f0e2f0438e6c2..e2789ea1d695a449200277e7542b9260e7eafdd2 100644
 --- a/media/blink/key_system_config_selector.cc
 +++ b/media/blink/key_system_config_selector.cc
-@@ -911,6 +911,7 @@ void KeySystemConfigSelector::SelectConfig(
+@@ -912,6 +912,7 @@ void KeySystemConfigSelector::SelectConfig(
  
    key_systems_->UpdateIfNeeded();
  
 +  KeySystems::GetInstance();
    std::string key_system_ascii = key_system.Ascii();
    if (!key_systems_->IsSupportedKeySystem(key_system_ascii)) {
-     not_supported_cb.Run();
+     std::move(not_supported_cb).Run();
diff --git a/patches/mojo-public-tools-bindings-chromium_bindings_configuration.gni.patch b/patches/mojo-public-tools-bindings-chromium_bindings_configuration.gni.patch
index 2e415996791c..661f374a94d7 100644
--- a/patches/mojo-public-tools-bindings-chromium_bindings_configuration.gni.patch
+++ b/patches/mojo-public-tools-bindings-chromium_bindings_configuration.gni.patch
@@ -1,10 +1,10 @@
 diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
-index a406026ceabf89ab8b0cb943272549128b958518..f6c3e6f3e784c250c40b811287c33f048e13ff28 100644
+index 98c78e56e5d4299f0705cb4910d562102e78d38c..1886b30886dbe153fcd39c2d952ead44ada5a5e1 100644
 --- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni
 +++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
-@@ -5,6 +5,7 @@
+@@ -4,6 +4,7 @@
+ 
  _typemap_imports = [
-   "//cc/typemaps.gni",
    "//chrome/chrome_cleaner/mojom/typemaps/typemaps.gni",
 +  "//brave/common/tor/typemaps.gni",
    "//chrome/common/importer/typemaps.gni",
diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch
index 3833438738f0..dcf9b7b32a52 100644
--- a/patches/net-BUILD.gn.patch
+++ b/patches/net-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/net/BUILD.gn b/net/BUILD.gn
-index 58d926b6fe82b9fba8343df644deecf121289936..2772aadbffdad1b6a762ad0b8d6b198b51bc2973 100644
+index 8ca0ca3a13e8e7e9804aafd223ad45b5941aada8..bb200a8b551ea9119938dce9133310ee83b63430 100644
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1173,6 +1173,7 @@ component("net") {
+@@ -1178,6 +1178,7 @@ component("net") {
          "reporting/reporting_uploader.h",
        ]
      }
diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch
index bc7a250491b9..d8f72b6e311b 100644
--- a/patches/net-cookies-canonical_cookie.cc.patch
+++ b/patches/net-cookies-canonical_cookie.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
-index f7d20322d8ebc0dd804ea1e1388e625fafccba27..453e781df9d94bc3fac407796f72939301da6efe 100644
+index f8c98061eb7247e46baf798353fa320ce80e16fa..4bc53d4c041ea1f401000f90822ecb36aa42d452 100644
 --- a/net/cookies/canonical_cookie.cc
 +++ b/net/cookies/canonical_cookie.cc
 @@ -248,6 +248,7 @@ Time CanonicalCookie::CanonExpiration(const ParsedCookie& pc,
diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch
index 4a4cbaf2b04d..27aed943d40b 100644
--- a/patches/services-network-public-cpp-BUILD.gn.patch
+++ b/patches/services-network-public-cpp-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn
-index 2873d13fb38ab091acd9efc323473319ebd27d2d..7c62394e4446b2f421d6639c65f4b54207d6ede1 100644
+index ee5cce195a5d9066320892139373ae82030388e2..81d17af6751a66d692b592fad1fb0ab43a0c933a 100644
 --- a/services/network/public/cpp/BUILD.gn
 +++ b/services/network/public/cpp/BUILD.gn
-@@ -109,6 +109,7 @@ jumbo_component("cpp") {
+@@ -116,6 +116,7 @@ jumbo_component("cpp") {
      "//services/proxy_resolver/public/mojom",
    ]
  
diff --git a/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch b/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch
index e0da26de4bdf..0b5af3133f0c 100644
--- a/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch
+++ b/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/services/service_manager/sandbox/win/sandbox_win.cc b/services/service_manager/sandbox/win/sandbox_win.cc
-index e8dd7fc209035181cf311c85771fd340dee9ca5e..1c8ead5fa1ca28a0f149590572e6cf5edabd1ef0 100644
+index 5eaed19bf922fc6ea2774c93abf7453fd1464f8e..8d6c81f39cdd247aad5bec9f517b03f4f5dd2be8 100644
 --- a/services/service_manager/sandbox/win/sandbox_win.cc
 +++ b/services/service_manager/sandbox/win/sandbox_win.cc
-@@ -858,6 +858,7 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess(
+@@ -863,6 +863,7 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess(
            service_manager::switches::kNoSandbox)) {
      base::LaunchOptions options;
      options.handles_to_inherit = handles_to_inherit;
diff --git a/patches/services-service_manager-zygote-host-zygote_host_impl_linux.cc.patch b/patches/services-service_manager-zygote-host-zygote_host_impl_linux.cc.patch
index 505c954d6359..65d20dfd604a 100644
--- a/patches/services-service_manager-zygote-host-zygote_host_impl_linux.cc.patch
+++ b/patches/services-service_manager-zygote-host-zygote_host_impl_linux.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/services/service_manager/zygote/host/zygote_host_impl_linux.cc b/services/service_manager/zygote/host/zygote_host_impl_linux.cc
-index d43cc31c1a710088e692c6b3a0c0e5775093dc52..1b64514830aebd2f4e86ef0d4c2bf91516cdcbc2 100644
+index 08ecc3c80c0acccae26dca0ccf46441204d809dc..c08730cb708c68c65e0a0adb585c7295c0d22c45 100644
 --- a/services/service_manager/zygote/host/zygote_host_impl_linux.cc
 +++ b/services/service_manager/zygote/host/zygote_host_impl_linux.cc
 @@ -114,13 +114,9 @@ void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch
index e1843b6ccad9..3eb67ac8f9d7 100644
--- a/patches/third_party-blink-renderer-core-BUILD.gn.patch
+++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
-index 1e7e3825f22b3964e2056d267d08f68b91e0fad9..24bae493be864b18ce8641ba174ebd2977f834fe 100644
+index de7233174e0e97867972160a734554972c1af7db..96f8a065f3099555acd668fcdeac44e0d4b5e6be 100644
 --- a/third_party/blink/renderer/core/BUILD.gn
 +++ b/third_party/blink/renderer/core/BUILD.gn
-@@ -143,6 +143,7 @@ component("core") {
+@@ -146,6 +146,7 @@ component("core") {
  
    visibility = []  # Allow re-assignment of list.
    visibility = [ "//third_party/blink/*" ]
@@ -10,11 +10,11 @@ index 1e7e3825f22b3964e2056d267d08f68b91e0fad9..24bae493be864b18ce8641ba174ebd29
  
    # If you create a new subdirectory, make a new BUILD file for that directory
    # and reference it in the deps below rather than adding the sources here.
-@@ -214,6 +215,7 @@ component("core") {
+@@ -217,6 +218,7 @@ component("core") {
      "//url",
      "//v8",
    ]
 +  public_deps += brave_blink_renderer_core_public_deps
    deps = [
+     "//components/paint_preview/common",
      "//third_party/blink/public/common",
-     "//third_party/blink/renderer/platform",
diff --git a/patches/third_party-blink-renderer-core-frame-navigator.idl.patch b/patches/third_party-blink-renderer-core-frame-navigator.idl.patch
index c273fb470d04..1cc20efcc4e7 100644
--- a/patches/third_party-blink-renderer-core-frame-navigator.idl.patch
+++ b/patches/third_party-blink-renderer-core-frame-navigator.idl.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/core/frame/navigator.idl b/third_party/blink/renderer/core/frame/navigator.idl
-index f13febb148e985aa5401ca6ae3221fce45a97261..e8dee21713a439aad1d9edb6aa087d35c7a95192 100644
+index 9a1f030202f5fd4e76083a9ddbfad5d675e89e73..b58c641dd34c8b7f64bb4708b09ab0aa264a3902 100644
 --- a/third_party/blink/renderer/core/frame/navigator.idl
 +++ b/third_party/blink/renderer/core/frame/navigator.idl
 @@ -36,7 +36,7 @@
diff --git a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch
index 2255ddf333b8..f903eab4c1c0 100644
--- a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch
+++ b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-index 3d8b51d9113ac70a8afc26c7339e73534b526a2c..8f7efb5ef251bcc826f57fbcc7f12de6ddf21726 100644
+index bec8c6160d2e7e1dcefdcb3752358c44e4763328..df6b11a1f6b4b2cd1a05ef61cd9142013a145b63 100644
 --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
 +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-@@ -183,6 +183,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(
+@@ -182,6 +182,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(
    // We use pixmap to access the image pixels. Make the image unaccelerated if
    // necessary.
    image_ = image_->MakeUnaccelerated();
diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch
index 1d14af767214..f9de35fc9271 100644
--- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch
+++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
-index 9015447c56c096afe8930dd8a09fe62157844598..a5599663c0c548a2e04631bb4eabc618df1ed5d3 100644
+index 487efcdd8ba00164b2261addc0f649026a72514c..ed0be902a813bb581d3e853d8960a2901f7186b5 100644
 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
 +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
-@@ -879,6 +879,7 @@ String HTMLCanvasElement::ToDataURLInternal(
+@@ -889,6 +889,7 @@ String HTMLCanvasElement::ToDataURLInternal(
    scoped_refptr<StaticBitmapImage> image_bitmap =
        Snapshot(source_buffer, kPreferNoAcceleration);
    if (image_bitmap) {
diff --git a/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch b/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch
index 9b8c47cf20df..053dc90e15f3 100644
--- a/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch
+++ b/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
-index 955e551050111da593ca52f63a6dcc1d3dd221d4..d9dc733060eefa40609262320c67d93071806b10 100644
+index 9e03caf66bbe9b7971de431e5bcb60abd8d1511a..26f21c9543db8e0d9ecc0e3b49e5bc9bd6521ea4 100644
 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc
 +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
-@@ -306,10 +306,12 @@ bool AutoplayPolicy::IsGestureNeededForPlayback() const {
+@@ -308,10 +308,12 @@ bool AutoplayPolicy::IsGestureNeededForPlayback() const {
    if (!IsLockedPendingUserGesture())
      return false;
  
diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch
index 16438977d342..c0246035785a 100644
--- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch
+++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn
-index 18cc391b689929595791cba5a2f535690f418db1..03c4c9bfbb74a24e3ec646e5bab5cb2704e2cdae 100644
+index 9cd07a8d81d2e00e1b8875e418379bedcfb0b3f6..5b463880d9a7de07164b3ca0a9d6c9825f15bf40 100644
 --- a/third_party/blink/renderer/modules/BUILD.gn
 +++ b/third_party/blink/renderer/modules/BUILD.gn
 @@ -16,6 +16,7 @@ if (is_android) {
diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
index 3ba9dac2beb6..1a6546fc91c3 100644
--- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
+++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-index 9ce2506096723d04b7aab6267d5c452cfe0424e8..87fafafc4cdad52cfe5cc9f62e78950358778cf2 100644
+index 3eed73aeee84d6f5ea7025aa41a2358c44764ba3..9aa7479d92f73866094af68bf9e20bc9b1dd08cb 100644
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-@@ -1545,6 +1545,7 @@ ImageData* BaseRenderingContext2D::createImageData(
+@@ -1549,6 +1549,7 @@ ImageData* BaseRenderingContext2D::createImageData(
  }
  
  ImageData* BaseRenderingContext2D::getImageData(
@@ -10,7 +10,7 @@ index 9ce2506096723d04b7aab6267d5c452cfe0424e8..87fafafc4cdad52cfe5cc9f62e789503
      int sx,
      int sy,
      int sw,
-@@ -1624,6 +1625,7 @@ ImageData* BaseRenderingContext2D::getImageData(
+@@ -1626,6 +1627,7 @@ ImageData* BaseRenderingContext2D::getImageData(
      return nullptr;
    }
  
diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch
index 95ba6b60d4e4..820355d90fd1 100644
--- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch
+++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h
-index a823b929d4c0f492eaca09bd07beccd9bbb60f7c..8f4fc6ec9bedebf278a3d29cb18d6ce54f842bc3 100644
+index dbd5ac79a3b0f5c2a5fd3a9300e26fb02db51a5f..3616da537f077cef4a5f102c306fc14ea1f70528 100644
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h
 @@ -195,7 +195,7 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin,
diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch
index 290fbe47dc66..254f1388be4d 100644
--- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch
+++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-index a8f7ceb763381fdd5b98943f4ba5aecf80eaa66d..db82351dd71b94dd03156bdada1c3d3092d70f78 100644
+index f59471191285f83f66037d546b32816528c2dcb1..0c66e6e1fae805c247a7de7c915bd16e0b96fc9e 100644
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
 @@ -35,6 +35,7 @@
@@ -10,7 +10,7 @@ index a8f7ceb763381fdd5b98943f4ba5aecf80eaa66d..db82351dd71b94dd03156bdada1c3d30
  #include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/platform/platform.h"
  #include "third_party/blink/public/platform/task_type.h"
-@@ -811,6 +812,9 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+@@ -804,6 +805,9 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
    if (!canvas()->GetDocument().GetFrame())
      return MakeGarbageCollected<TextMetrics>();
  
diff --git a/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch b/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch
index a58f68bf5b2a..98ba967c9470 100644
--- a/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch
+++ b/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc b/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc
-index 5012d2df0f49c00cd95112040685f3a3fdae6842..e804da7e6407fa55ffd321ca2448a982f671cafd 100644
+index e4b71e783c2e46c5cff30fadc862315c952f6719..57a0d3e72e039cfa110bd6c7d7e8dd2178287d0a 100644
 --- a/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc
 +++ b/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc
 @@ -176,6 +176,9 @@ ScriptPromise NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess(
diff --git a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
index d25eca3ecef2..46064f5551c7 100644
--- a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
+++ b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc
-index ad4d5666dc83d5991838f76bb0255fa6982cf15b..fb308f0ff45c3106d3095d5baabdf4da3bd21886 100644
+index 40a9642a4160877f3d79dc55cfe5181fecb0049d..cc0e54c48722b2bbf6dc515c39db27a60580c811 100644
 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
 +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
 @@ -6,6 +6,7 @@
diff --git a/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch b/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
index 4dbad03491cd..1e64e1ce2d15 100644
--- a/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
+++ b/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
-index a4749dd63a3722971905100f597b1c92b495ba12..c5e468353f3baf9bec262027f3ce02eeb3ed30fa 100644
+index 602d2ba03552486bd98df91e104491dc16d6f372..3d4b89f86f993c0233ba64c2d6652f22545ac1cd 100644
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
 @@ -39,6 +39,7 @@
@@ -10,7 +10,7 @@ index a4749dd63a3722971905100f597b1c92b495ba12..c5e468353f3baf9bec262027f3ce02ee
  #include "services/metrics/public/cpp/ukm_builders.h"
  #include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/platform/platform.h"
-@@ -802,6 +803,8 @@ void RTCPeerConnection::Dispose() {
+@@ -837,6 +838,8 @@ void RTCPeerConnection::Dispose() {
  ScriptPromise RTCPeerConnection::createOffer(ScriptState* script_state,
                                               const RTCOfferOptions* options,
                                               ExceptionState& exception_state) {
@@ -19,7 +19,7 @@ index a4749dd63a3722971905100f597b1c92b495ba12..c5e468353f3baf9bec262027f3ce02ee
    if (signaling_state_ ==
        webrtc::PeerConnectionInterface::SignalingState::kClosed) {
      exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError,
-@@ -840,6 +843,8 @@ ScriptPromise RTCPeerConnection::createOffer(
+@@ -900,6 +903,8 @@ ScriptPromise RTCPeerConnection::CreateOffer(
    ExecutionContext* context = ExecutionContext::From(script_state);
    UseCounter::Count(
        context, WebFeature::kRTCPeerConnectionCreateOfferLegacyFailureCallback);
@@ -28,7 +28,7 @@ index a4749dd63a3722971905100f597b1c92b495ba12..c5e468353f3baf9bec262027f3ce02ee
    if (CallErrorCallbackIfSignalingStateClosed(signaling_state_, error_callback))
      return ScriptPromise::CastUndefined(script_state);
  
-@@ -901,6 +906,8 @@ ScriptPromise RTCPeerConnection::createOffer(
+@@ -961,6 +966,8 @@ ScriptPromise RTCPeerConnection::CreateOffer(
  ScriptPromise RTCPeerConnection::createAnswer(ScriptState* script_state,
                                                const RTCAnswerOptions* options,
                                                ExceptionState& exception_state) {
@@ -37,7 +37,7 @@ index a4749dd63a3722971905100f597b1c92b495ba12..c5e468353f3baf9bec262027f3ce02ee
    if (signaling_state_ ==
        webrtc::PeerConnectionInterface::SignalingState::kClosed) {
      exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError,
-@@ -938,7 +945,8 @@ ScriptPromise RTCPeerConnection::createAnswer(
+@@ -1022,7 +1029,8 @@ ScriptPromise RTCPeerConnection::CreateAnswer(
      UseCounter::Count(
          context, WebFeature::kRTCPeerConnectionCreateAnswerLegacyCompliant);
    }
@@ -47,7 +47,7 @@ index a4749dd63a3722971905100f597b1c92b495ba12..c5e468353f3baf9bec262027f3ce02ee
    if (CallErrorCallbackIfSignalingStateClosed(signaling_state_, error_callback))
      return ScriptPromise::CastUndefined(script_state);
  
-@@ -1243,6 +1251,8 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
+@@ -1335,6 +1343,8 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
      ScriptState* script_state,
      const RTCSessionDescriptionInit* session_description_init,
      ExceptionState& exception_state) {
@@ -56,7 +56,7 @@ index a4749dd63a3722971905100f597b1c92b495ba12..c5e468353f3baf9bec262027f3ce02ee
    if (session_description_init->type().IsNull() &&
        session_description_init->sdp().IsNull()) {
      return setLocalDescription(script_state);
-@@ -1303,6 +1313,8 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
+@@ -1395,6 +1405,8 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
            WebFeature::
                kRTCPeerConnectionSetLocalDescriptionLegacyNoFailureCallback);
    }
@@ -65,7 +65,7 @@ index a4749dd63a3722971905100f597b1c92b495ba12..c5e468353f3baf9bec262027f3ce02ee
    String sdp;
    if (session_description_init->type() != "rollback") {
      DOMException* exception =
-@@ -1355,6 +1367,8 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
+@@ -1447,6 +1459,8 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
      ScriptState* script_state,
      const RTCSessionDescriptionInit* session_description_init,
      ExceptionState& exception_state) {
@@ -74,7 +74,7 @@ index a4749dd63a3722971905100f597b1c92b495ba12..c5e468353f3baf9bec262027f3ce02ee
    if (session_description_init->type() != "rollback") {
      MaybeWarnAboutUnsafeSdp(session_description_init);
      ReportSetSdpUsage(SetSdpOperationType::kSetRemoteDescription,
-@@ -1409,6 +1423,8 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
+@@ -1501,6 +1515,8 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
            WebFeature::
                kRTCPeerConnectionSetRemoteDescriptionLegacyNoFailureCallback);
    }
diff --git a/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch
index 1df7975302dd..551712f5440e 100644
--- a/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch
+++ b/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.cc b/third_party/blink/renderer/modules/webaudio/analyser_node.cc
-index 187f2cadbb882012554cd25f5e2fd6e235a21c86..8da365835f9701dd9505c2700e975ed73e2e651c 100644
+index cb281f5b728f737ce0a07c289d09c06a17205dd0..15e2af662b78a99363ed6bd3c323fa70f146e139 100644
 --- a/third_party/blink/renderer/modules/webaudio/analyser_node.cc
 +++ b/third_party/blink/renderer/modules/webaudio/analyser_node.cc
 @@ -35,6 +35,7 @@ namespace blink {
diff --git a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch
index 77d57a72e643..16f5839d7bf7 100644
--- a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch
+++ b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
-index a35049157303d807bb75de683db0aff4f4a0c18d..894a95b7467dbf16c431a791dc56d3d22c415581 100644
+index 37a1650dfa295c7bf25acf8fa4146c2475105bf1..f83f4980d524c6e84c63e5312c2eef354d5a2215 100644
 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
-@@ -191,6 +191,7 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
+@@ -189,6 +189,7 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
  }
  
  NotShared<DOMFloat32Array> AudioBuffer::getChannelData(
@@ -10,7 +10,7 @@ index a35049157303d807bb75de683db0aff4f4a0c18d..894a95b7467dbf16c431a791dc56d3d2
      unsigned channel_index,
      ExceptionState& exception_state) {
    if (channel_index >= channels_.size()) {
-@@ -202,6 +203,7 @@ NotShared<DOMFloat32Array> AudioBuffer::getChannelData(
+@@ -200,6 +201,7 @@ NotShared<DOMFloat32Array> AudioBuffer::getChannelData(
      return NotShared<DOMFloat32Array>(nullptr);
    }
  
@@ -18,7 +18,7 @@ index a35049157303d807bb75de683db0aff4f4a0c18d..894a95b7467dbf16c431a791dc56d3d2
    return getChannelData(channel_index);
  }
  
-@@ -212,13 +214,15 @@ NotShared<DOMFloat32Array> AudioBuffer::getChannelData(unsigned channel_index) {
+@@ -210,13 +212,15 @@ NotShared<DOMFloat32Array> AudioBuffer::getChannelData(unsigned channel_index) {
    return NotShared<DOMFloat32Array>(channels_[channel_index].Get());
  }
  
@@ -37,7 +37,7 @@ index a35049157303d807bb75de683db0aff4f4a0c18d..894a95b7467dbf16c431a791dc56d3d2
                                    int32_t channel_number,
                                    size_t buffer_offset,
                                    ExceptionState& exception_state) {
-@@ -257,6 +261,7 @@ void AudioBuffer::copyFromChannel(NotShared<DOMFloat32Array> destination,
+@@ -255,6 +259,7 @@ void AudioBuffer::copyFromChannel(NotShared<DOMFloat32Array> destination,
    DCHECK_LE(buffer_offset + count, data_length);
  
    memcpy(dst, src + buffer_offset, count * sizeof(*src));
diff --git a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.h.patch b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.h.patch
index 3481155cfc62..314414736991 100644
--- a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.h.patch
+++ b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.h.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_party/blink/renderer/modules/webaudio/audio_buffer.h
-index ca4d64d21e353a5796dcc23cafd71fffede36160..02c7e02e760c4f21c66d139ab88607dd8db4cfa8 100644
+index a70c5f013b511a1bf1935695f11506e4a10ca0f8..6f386c1f5af49e668d043b50f565152d2174b8d0 100644
 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.h
 +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.h
 @@ -43,6 +43,7 @@ class AudioBus;
diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch
index 2ee635b52168..c72d00b94c32 100644
--- a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch
+++ b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
-index b44602567f98a14715825ecbb7ff5f655f43cb88..0d91280b581a1e1211af105673ec19b8c936a2b8 100644
+index a8cae56cbe4d78551d394cdea94b73bb1a26f09e..34ff0d6341a79e3617c06d24a7296807c2a0a5be 100644
 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
 @@ -9,6 +9,7 @@
@@ -10,7 +10,7 @@ index b44602567f98a14715825ecbb7ff5f655f43cb88..0d91280b581a1e1211af105673ec19b8
  #include "gpu/command_buffer/client/gles2_interface.h"
  #include "third_party/blink/public/platform/web_graphics_context_3d_provider.h"
  #include "third_party/blink/renderer/bindings/modules/v8/webgl_any.h"
-@@ -5108,6 +5109,8 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
+@@ -5040,6 +5041,8 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
                                                       GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -19,7 +19,7 @@ index b44602567f98a14715825ecbb7ff5f655f43cb88..0d91280b581a1e1211af105673ec19b8
    switch (pname) {
      case GL_SHADING_LANGUAGE_VERSION: {
        return WebGLAny(
-@@ -5649,6 +5652,8 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter(
+@@ -5581,6 +5584,8 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter(
    if (isContextLost() || !ValidateGetFramebufferAttachmentParameterFunc(
                               kFunctionName, target, attachment))
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -28,7 +28,7 @@ index b44602567f98a14715825ecbb7ff5f655f43cb88..0d91280b581a1e1211af105673ec19b8
  
    WebGLFramebuffer* framebuffer_binding = GetFramebufferBinding(target);
    DCHECK(!framebuffer_binding || framebuffer_binding->Object());
-@@ -5861,6 +5866,8 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter(
+@@ -5793,6 +5798,8 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter(
      GLenum pname) {
    if (isContextLost() || !ValidateTextureBinding("getTexParameter", target))
      return ScriptValue::CreateNull(script_state->GetIsolate());
diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch
index 2e6b44dc1e63..91d81e46d645 100644
--- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch
+++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f6672ad367d 100644
+index 39d00937e8a17183c22dcfc99692aed9a8638ac6..14e289d214db7aa145afa23e2122ea38b388d59a 100644
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 @@ -31,6 +31,7 @@
@@ -10,7 +10,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
  #include "build/build_config.h"
  #include "gpu/GLES2/gl2extchromium.h"
  #include "gpu/command_buffer/client/gles2_interface.h"
-@@ -2830,6 +2831,8 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib(
+@@ -2836,6 +2837,8 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib(
      GLuint index) {
    if (!ValidateWebGLProgramOrShader("getActiveAttrib", program))
      return nullptr;
@@ -19,7 +19,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    GLuint program_id = ObjectNonZero(program);
    GLint max_name_length = -1;
    ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH,
-@@ -2861,6 +2864,8 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform(
+@@ -2867,6 +2870,8 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform(
      GLuint index) {
    if (!ValidateWebGLProgramOrShader("getActiveUniform", program))
      return nullptr;
@@ -28,7 +28,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    GLuint program_id = ObjectNonZero(program);
    GLint max_name_length = -1;
    ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH,
-@@ -2891,6 +2896,8 @@ base::Optional<HeapVector<Member<WebGLShader>>>
+@@ -2897,6 +2902,8 @@ base::Optional<HeapVector<Member<WebGLShader>>>
  WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) {
    if (!ValidateWebGLProgramOrShader("getAttachedShaders", program))
      return base::nullopt;
@@ -37,7 +37,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
  
    HeapVector<Member<WebGLShader>> shader_objects;
    const GLenum kShaderType[] = {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER,
-@@ -2907,6 +2914,8 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program,
+@@ -2913,6 +2920,8 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program,
                                                     const String& name) {
    if (!ValidateWebGLProgramOrShader("getAttribLocation", program))
      return -1;
@@ -46,7 +46,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    if (!ValidateLocationLength("getAttribLocation", name))
      return -1;
    if (!ValidateString("getAttribLocation", name))
-@@ -2940,6 +2949,8 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter(
+@@ -2946,6 +2955,8 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter(
      GLenum pname) {
    if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target))
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -55,7 +55,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
  
    switch (pname) {
      case GL_BUFFER_USAGE: {
-@@ -2965,6 +2976,8 @@ WebGLContextAttributes* WebGLRenderingContextBase::getContextAttributes()
+@@ -2971,6 +2982,8 @@ WebGLContextAttributes* WebGLRenderingContextBase::getContextAttributes()
      const {
    if (isContextLost())
      return nullptr;
@@ -64,7 +64,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
  
    WebGLContextAttributes* result =
        ToWebGLContextAttributes(CreationAttributes());
-@@ -3035,6 +3048,13 @@ bool WebGLRenderingContextBase::ExtensionSupportedAndAllowed(
+@@ -3041,6 +3054,13 @@ bool WebGLRenderingContextBase::ExtensionSupportedAndAllowed(
  ScriptValue WebGLRenderingContextBase::getExtension(ScriptState* script_state,
                                                      const String& name) {
    WebGLExtension* extension = nullptr;
@@ -78,7 +78,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
  
    if (name == WebGLDebugRendererInfo::ExtensionName()) {
      ExecutionContext* context = ExecutionContext::From(script_state);
-@@ -3075,6 +3095,9 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter(
+@@ -3081,6 +3101,9 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter(
                                           target, attachment))
      return ScriptValue::CreateNull(script_state->GetIsolate());
  
@@ -88,7 +88,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    if (!framebuffer_binding_ || !framebuffer_binding_->Object()) {
      SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter",
                        "no framebuffer bound");
-@@ -3156,6 +3179,8 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
+@@ -3162,6 +3185,8 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
                                                      GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -97,7 +97,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    const int kIntZero = 0;
    switch (pname) {
      case GL_ACTIVE_TEXTURE:
-@@ -3456,10 +3481,11 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
+@@ -3462,10 +3487,11 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
      ScriptState* script_state,
      WebGLProgram* program,
      GLenum pname) {
@@ -110,7 +110,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    GLint value = 0;
    switch (pname) {
      case GL_DELETE_STATUS:
-@@ -3517,6 +3543,8 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
+@@ -3523,6 +3549,8 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
  String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) {
    if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program))
      return String();
@@ -119,7 +119,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    GLStringQuery query(ContextGL());
    return query.Run<GLStringQuery::ProgramInfoLog>(ObjectNonZero(program));
  }
-@@ -3527,6 +3555,8 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter(
+@@ -3533,6 +3561,8 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter(
      GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -128,7 +128,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    if (target != GL_RENDERBUFFER) {
      SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter",
                        "invalid target");
-@@ -3572,6 +3602,8 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
+@@ -3578,6 +3608,8 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
      ScriptState* script_state,
      WebGLShader* shader,
      GLenum pname) {
@@ -137,7 +137,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) {
      return ScriptValue::CreateNull(script_state->GetIsolate());
    }
-@@ -3603,6 +3635,8 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
+@@ -3609,6 +3641,8 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
  String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) {
    if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader))
      return String();
@@ -146,7 +146,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    GLStringQuery query(ContextGL());
    return query.Run<GLStringQuery::ShaderInfoLog>(ObjectNonZero(shader));
  }
-@@ -3615,6 +3649,8 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
+@@ -3621,6 +3655,8 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
    if (!ValidateShaderType("getShaderPrecisionFormat", shader_type)) {
      return nullptr;
    }
@@ -155,7 +155,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    switch (precision_type) {
      case GL_LOW_FLOAT:
      case GL_MEDIUM_FLOAT:
-@@ -3640,6 +3676,8 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
+@@ -3646,6 +3682,8 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
  String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) {
    if (!ValidateWebGLProgramOrShader("getShaderSource", shader))
      return String();
@@ -164,7 +164,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    return EnsureNotNull(shader->Source());
  }
  
-@@ -3647,6 +3685,8 @@ base::Optional<Vector<String>>
+@@ -3653,6 +3691,8 @@ base::Optional<Vector<String>>
  WebGLRenderingContextBase::getSupportedExtensions() {
    if (isContextLost())
      return base::nullopt;
@@ -173,7 +173,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
  
    Vector<String> result;
  
-@@ -3669,6 +3709,8 @@ ScriptValue WebGLRenderingContextBase::getTexParameter(
+@@ -3675,6 +3715,8 @@ ScriptValue WebGLRenderingContextBase::getTexParameter(
      GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -182,7 +182,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    if (!ValidateTextureBinding("getTexParameter", target))
      return ScriptValue::CreateNull(script_state->GetIsolate());
    switch (pname) {
-@@ -3703,6 +3745,8 @@ ScriptValue WebGLRenderingContextBase::getUniform(
+@@ -3709,6 +3751,8 @@ ScriptValue WebGLRenderingContextBase::getUniform(
      const WebGLUniformLocation* uniform_location) {
    if (!ValidateWebGLProgramOrShader("getUniform", program))
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -191,7 +191,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    DCHECK(uniform_location);
    if (uniform_location->Program() != program) {
      SynthesizeGLError(GL_INVALID_OPERATION, "getUniform",
-@@ -3983,6 +4027,8 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation(
+@@ -3989,6 +4033,8 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation(
      const String& name) {
    if (!ValidateWebGLProgramOrShader("getUniformLocation", program))
      return nullptr;
@@ -200,7 +200,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    if (!ValidateLocationLength("getUniformLocation", name))
      return nullptr;
    if (!ValidateString("getUniformLocation", name))
-@@ -4007,6 +4053,8 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib(
+@@ -4013,6 +4059,8 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib(
      GLenum pname) {
    if (isContextLost())
      return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -209,7 +209,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    if (index >= max_vertex_attribs_) {
      SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib",
                        "index out of range");
-@@ -4084,6 +4132,8 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index,
+@@ -4090,6 +4138,8 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index,
                                                           GLenum pname) {
    if (isContextLost())
      return 0;
@@ -218,7 +218,7 @@ index bb9fc6b2caf37fd536295826742ed5febf02f79c..995d57be669df3c5143ad4344cd78f66
    GLvoid* result = nullptr;
    // NOTE: If pname is ever a value that returns more than 1 element
    // this will corrupt memory.
-@@ -4431,6 +4481,8 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x,
+@@ -4437,6 +4487,8 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x,
                                                   int64_t offset) {
    if (isContextLost())
      return;
diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch
index bd49b825a480..9a6ffc9d218c 100644
--- a/patches/tools-gritsettings-resource_ids.spec.patch
+++ b/patches/tools-gritsettings-resource_ids.spec.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index cd531c9abd2da78f0edb718575ea219d8edd456e..c4d1d6254badf6ab25c4c02bbafc94952585a6b0 100644
+index f8e27f6df77302a9af952493ebf946349466225e..0a7b669a33c161aaa61de30c067785a575af26cd 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
 @@ -47,6 +47,9 @@
@@ -12,7 +12,7 @@ index cd531c9abd2da78f0edb718575ea219d8edd456e..c4d1d6254badf6ab25c4c02bbafc9495
    "chrome/app/google_chrome_strings.grd": {
      "messages": [400],
    },
-@@ -315,6 +318,9 @@
+@@ -325,6 +328,9 @@
      "META": {"align": 100},
      "messages": [2700],
    },
diff --git a/patches/tools-json_schema_compiler-feature_compiler.py.patch b/patches/tools-json_schema_compiler-feature_compiler.py.patch
index 77b584ebaaef..6fd3a3a1af36 100644
--- a/patches/tools-json_schema_compiler-feature_compiler.py.patch
+++ b/patches/tools-json_schema_compiler-feature_compiler.py.patch
@@ -1,8 +1,8 @@
 diff --git a/tools/json_schema_compiler/feature_compiler.py b/tools/json_schema_compiler/feature_compiler.py
-index f98f165ffba99227737e020af72323ac4ed36af9..effb001c372c5cea9ca04b28125e0a32206735d4 100644
+index cc5f8edcb76aaa5965f379072f0c02073def07f3..6ee91d377e07e52e76ab3870490ccd4f414c01c1 100644
 --- a/tools/json_schema_compiler/feature_compiler.py
 +++ b/tools/json_schema_compiler/feature_compiler.py
-@@ -663,6 +663,14 @@ class FeatureCompiler(object):
+@@ -664,6 +664,14 @@ class FeatureCompiler(object):
                    abs_source_file)
          raise
        dupes = set(f_json) & set(self._json)
diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch
index a71f070b62c5..66600e3ad8a6 100644
--- a/patches/tools-metrics-histograms-histograms.xml.patch
+++ b/patches/tools-metrics-histograms-histograms.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
-index e58a616706e4bce249a36134c7bf2c43478bfe89..950c42e7c9a638e8afe5898a1ebeb1c916faa7d4 100644
+index 0f32999e3d19506893a35fc1b7c6de13a896275a..fe8fb0190c5d8ce98d05489c0b2819e8555677f4 100644
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -188603,6 +188603,7 @@ regressions. -->
+@@ -194650,6 +194650,7 @@ regressions. -->
    <suffix name="ProtectedMedia" label="Protected media permission"/>
    <suffix name="PushMessaging" label="Push messaging permission"/>
    <suffix name="Quota" label="Quota permission"/>
diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch
index b8eee13612e7..d6d93a7ac5d1 100644
--- a/patches/ui-base-BUILD.gn.patch
+++ b/patches/ui-base-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 7ec4b390a6c805868076177b02312352d825a553..82b76c03b4f44303cd91d84f7f4d247792a19ef8 100644
+index 33b8a3bb7fae6941f0aa7af47aa048ac4a932b8f..1c9f64a73fe8497c2e1aadb40cd02629fc8d8acf 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
-@@ -448,6 +448,7 @@ jumbo_component("base") {
+@@ -445,6 +445,7 @@ jumbo_component("base") {
      "//ui/strings",
      "//url",
    ]
diff --git a/patches/ui-native_theme-native_theme.h.patch b/patches/ui-native_theme-native_theme.h.patch
index c6bf2d2347af..d92c92b7c03f 100644
--- a/patches/ui-native_theme-native_theme.h.patch
+++ b/patches/ui-native_theme-native_theme.h.patch
@@ -1,8 +1,8 @@
 diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
-index 0c26cce0cb14bd9e87c3a095116501bf0c1803e4..fb9ef944ed305712809cf3b96f8165c60d8e3e87 100644
+index 380a8e78fdeb2ad5f40b298a3efffa82a70ed2dc..85a445de36f0b440a7362e0243d6e401374d3b56 100644
 --- a/ui/native_theme/native_theme.h
 +++ b/ui/native_theme/native_theme.h
-@@ -481,6 +481,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -391,6 +391,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
  
    // Returns the system's caption style.
    virtual base::Optional<CaptionStyle> GetSystemCaptionStyle() const;
diff --git a/patches/ui-native_theme-native_theme_mac.mm.patch b/patches/ui-native_theme-native_theme_mac.mm.patch
index 4269334605d1..2f4dbde96b5e 100644
--- a/patches/ui-native_theme-native_theme_mac.mm.patch
+++ b/patches/ui-native_theme-native_theme_mac.mm.patch
@@ -1,8 +1,8 @@
 diff --git a/ui/native_theme/native_theme_mac.mm b/ui/native_theme/native_theme_mac.mm
-index f383c46998ff27152a9af293c70a5a568d4cc36c..be99355f34b373f1c4f309fe64e85d22a29c2e97 100644
+index 92cbb499e69daf7673218783bcd7ea4699ba494a..d73e851887b2efc3d6a89dba83c4446bbc182a17 100644
 --- a/ui/native_theme/native_theme_mac.mm
 +++ b/ui/native_theme/native_theme_mac.mm
-@@ -204,6 +204,7 @@ SkColor NativeThemeMac::GetSystemColor(ColorId color_id,
+@@ -220,6 +220,7 @@ SkColor NativeThemeMac::GetSystemColor(ColorId color_id,
    }
    // Even with --secondary-ui-md, menus use the platform colors and styling, and
    // Mac has a couple of specific color overrides, documented below.
diff --git a/patches/ui-native_theme-native_theme_win.cc.patch b/patches/ui-native_theme-native_theme_win.cc.patch
index 37ecdd5c1599..9fc5f8d5e0b1 100644
--- a/patches/ui-native_theme-native_theme_win.cc.patch
+++ b/patches/ui-native_theme-native_theme_win.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
-index a7c06b8a046bba7096bfb41c84d2073980ffa6d3..7eb63aec060dfc3f4a23d201305b5e5764f5dda2 100644
+index f374882c8f2fc1241608e8d9dfa6abb85ae75314..ea1f8f1e220ebcb565e662d13d74dfd19ebfe531 100644
 --- a/ui/native_theme/native_theme_win.cc
 +++ b/ui/native_theme/native_theme_win.cc
-@@ -1618,6 +1618,7 @@ void NativeThemeWin::UpdateDarkModeStatus() {
+@@ -1637,6 +1637,7 @@ void NativeThemeWin::UpdateDarkModeStatus() {
                                      &apps_use_light_theme);
      dark_mode_enabled = (apps_use_light_theme == 0);
    }
diff --git a/patches/ui-native_theme-native_theme_win.h.patch b/patches/ui-native_theme-native_theme_win.h.patch
index 635b69b05cee..a575a14880f6 100644
--- a/patches/ui-native_theme-native_theme_win.h.patch
+++ b/patches/ui-native_theme-native_theme_win.h.patch
@@ -1,8 +1,8 @@
 diff --git a/ui/native_theme/native_theme_win.h b/ui/native_theme/native_theme_win.h
-index df029cfc275706f0e900f1fecd6e21ca6013e57b..2cd10d36162a1874aac26fade5138d3c840b9244 100644
+index 699d1a3b259735713d2902e78df4c427e6280abd..c00f7c9bf27d7210045d386753ee82b16b99ec73 100644
 --- a/ui/native_theme/native_theme_win.h
 +++ b/ui/native_theme/native_theme_win.h
-@@ -75,6 +75,7 @@ class NATIVE_THEME_EXPORT NativeThemeWin : public NativeTheme,
+@@ -74,6 +74,7 @@ class NATIVE_THEME_EXPORT NativeThemeWin : public NativeTheme,
    PreferredColorScheme CalculatePreferredColorScheme() const override;
    ColorScheme GetDefaultSystemColorScheme() const override;
  
diff --git a/patches/ui-views-controls-button-md_text_button.h.patch b/patches/ui-views-controls-button-md_text_button.h.patch
index c1d43cf884d6..ef857e36c97b 100644
--- a/patches/ui-views-controls-button-md_text_button.h.patch
+++ b/patches/ui-views-controls-button-md_text_button.h.patch
@@ -1,5 +1,5 @@
 diff --git a/ui/views/controls/button/md_text_button.h b/ui/views/controls/button/md_text_button.h
-index 90ae3a47b7821f78c091c5a0d796556408f57dce..c5bcddd7b6463ab8c7e43d1f9eb709445f81a8b9 100644
+index fcd66fcd425aeb5bea889467df41ed5f5dfea3ad..7990f507adf491a81867f6a255aa863bb26e572d 100644
 --- a/ui/views/controls/button/md_text_button.h
 +++ b/ui/views/controls/button/md_text_button.h
 @@ -65,7 +65,9 @@ class VIEWS_EXPORT MdTextButton : public LabelButton {
diff --git a/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch b/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch
index b62be2d39445..00e95d509a2c 100644
--- a/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch
+++ b/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch
@@ -1,5 +1,5 @@
 diff --git a/ui/webui/resources/cr_elements/shared_style_css.html b/ui/webui/resources/cr_elements/shared_style_css.html
-index 8b18b8e0d6dfe4e0964009668fb2ffc2c0c9fab0..d97ba162267d88ed72aff2a716d3e633e1300d2c 100644
+index 125bf9765e3a8b1d6f7c4f082c375d432cb4e81a..af0c992f0ffe45506bac57613bb4877e6db830b3 100644
 --- a/ui/webui/resources/cr_elements/shared_style_css.html
 +++ b/ui/webui/resources/cr_elements/shared_style_css.html
 @@ -3,12 +3,13 @@
diff --git a/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch b/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch
index 9cfec1c98937..746016fa1ded 100644
--- a/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch
+++ b/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch
@@ -1,5 +1,5 @@
 diff --git a/ui/webui/resources/cr_elements/shared_vars_css.html b/ui/webui/resources/cr_elements/shared_vars_css.html
-index 26192483e37633d2f3e32b8572a4abe36ae1ab36..68c7b26f5f1233041588f57286863f614bbc8235 100644
+index 1add20c9fab8d5152b14e099bee33a9bb1f86f7c..eb49d97fdb652fa0d731b069746c5c55c68f9501 100644
 --- a/ui/webui/resources/cr_elements/shared_vars_css.html
 +++ b/ui/webui/resources/cr_elements/shared_vars_css.html
 @@ -1,6 +1,7 @@

From 3dedc8f2c9278eccb97b21bac83a4e95359d197a Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 1 Apr 2020 16:27:57 -0400
Subject: [PATCH 002/161] Conflict-resolved patches from Chromium 81.0.4044.69
 to Chromium 83.0.4093.3.

These patches required manual conflict resolution.
---
 ...iew-browser-aw_permission_manager.cc.patch | 10 +-
 ...id-java-res-layout-toolbar_phone.xml.patch |  4 +-
 ...es-menu-website_preferences_menu.xml.patch |  4 +-
 ...me-browser-ChromeTabbedActivity.java.patch | 26 ++---
 ...-bookmarks-BookmarkEditActivity.java.patch | 14 +--
 ...ations-channels-ChannelsUpdater.java.patch | 16 ++--
 ...ottom-BottomControlsCoordinator.java.patch | 12 +--
 ...bottom-BottomToolbarCoordinator.java.patch | 24 ++---
 ...m-BottomToolbarVariationManager.java.patch | 22 ++---
 ...rivate-webrtc_logging_private_api.cc.patch |  8 +-
 ...flags-android-chrome_feature_list.cc.patch |  8 +-
 ...autofill_page-passwords_section.html.patch | 12 +--
 ...tings-privacy_page-privacy_page.html.patch | 96 +++++++++----------
 ...y_page-privacy_page_browser_proxy.js.patch | 10 +-
 ...me-browser-ui-page_info-page_info.cc.patch | 10 +-
 .../chrome-browser-ui-tabs-tab_style.cc.patch |  6 +-
 ...de_detector-upgrade_detector_impl.cc.patch | 18 ++--
 ..._updater-component_updater_service.h.patch |  4 +-
 ...browser-content_settings_registry.cc.patch |  8 +-
 ...sh-core-browser-resources-crashes.js.patch | 20 ++--
 ...nts-permissions-permission_request.h.patch |  6 +-
 ...c-driver-glue-sync_engine_backend.cc.patch |  6 +-
 ...-sync-driver-profile_sync_service.cc.patch |  8 +-
 ...omponents-sync-engine-sync_manager.h.patch |  8 +-
 ...nt-public-browser-permission_type.cc.patch |  8 +-
 ...er-extension_event_histogram_value.h.patch | 10 +-
 ...ices-network-public-cpp-cors-cors.cc.patch |  6 +-
 ...c-mojom-permissions-permission.mojom.patch |  6 +-
 ...er-modules-webaudio-audio_buffer.idl.patch | 18 ++--
 29 files changed, 205 insertions(+), 203 deletions(-)

diff --git a/patches/android_webview-browser-aw_permission_manager.cc.patch b/patches/android_webview-browser-aw_permission_manager.cc.patch
index beed8895ff23..747c7beaff83 100644
--- a/patches/android_webview-browser-aw_permission_manager.cc.patch
+++ b/patches/android_webview-browser-aw_permission_manager.cc.patch
@@ -1,19 +1,19 @@
 diff --git a/android_webview/browser/aw_permission_manager.cc b/android_webview/browser/aw_permission_manager.cc
-index 76651a3502bee327c1cc1bda9706588ab24c09f2..e95ccefd549efb6bc5d5df1ec67c10f833e91ee2 100644
+index 6d5084e46272ff6e9250ce28aaf62a2ff086d249..7db8ebe97a6a2c0ab652430d2fbed356e9b9606a 100644
 --- a/android_webview/browser/aw_permission_manager.cc
 +++ b/android_webview/browser/aw_permission_manager.cc
-@@ -338,6 +338,7 @@ int AwPermissionManager::RequestPermissions(
-       case PermissionType::NFC:
+@@ -339,6 +339,7 @@ int AwPermissionManager::RequestPermissions(
        case PermissionType::VR:
        case PermissionType::AR:
+       case PermissionType::STORAGE_ACCESS_GRANT:
 +      BRAVE_PERMISSION_TYPES
          NOTIMPLEMENTED() << "RequestPermissions is not implemented for "
                           << static_cast<int>(permissions[i]);
          pending_request_raw->SetPermissionStatus(permissions[i],
-@@ -542,6 +543,7 @@ void AwPermissionManager::CancelPermissionRequest(int request_id) {
-       case PermissionType::NFC:
+@@ -544,6 +545,7 @@ void AwPermissionManager::CancelPermissionRequest(int request_id) {
        case PermissionType::VR:
        case PermissionType::AR:
+       case PermissionType::STORAGE_ACCESS_GRANT:
 +      BRAVE_PERMISSION_TYPES
          NOTIMPLEMENTED() << "CancelPermission not implemented for "
                           << static_cast<int>(permission);
diff --git a/patches/chrome-android-java-res-layout-toolbar_phone.xml.patch b/patches/chrome-android-java-res-layout-toolbar_phone.xml.patch
index 31c26d7a867c..d5abdd76cfd5 100644
--- a/patches/chrome-android-java-res-layout-toolbar_phone.xml.patch
+++ b/patches/chrome-android-java-res-layout-toolbar_phone.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/res/layout/toolbar_phone.xml b/chrome/android/java/res/layout/toolbar_phone.xml
-index ec4bcf12f7acb943b4702f10d8a90a1379d63e71..7ae563a87450bfe52fc0af0220fb265135eb8f85 100644
+index dffb0269e36decddf02b3d2ddf9076a4205342c5..59b15116669df1320de1d48dd5c3e3daea04ad95 100644
 --- a/chrome/android/java/res/layout/toolbar_phone.xml
 +++ b/chrome/android/java/res/layout/toolbar_phone.xml
 @@ -13,6 +13,7 @@
@@ -13,7 +13,7 @@ index ec4bcf12f7acb943b4702f10d8a90a1379d63e71..7ae563a87450bfe52fc0af0220fb2651
 @@ -20,6 +21,7 @@
          android:contentDescription="@string/accessibility_toolbar_btn_home"
          android:visibility="gone"
-         app:tint="@color/standard_mode_tint" />
+         app:tint="@color/default_icon_color_tint_list" />
 +-->
  
      <org.chromium.chrome.browser.omnibox.LocationBarPhone
diff --git a/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch b/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch
index e947c0ab313e..ebb4a88f8b32 100644
--- a/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch
+++ b/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch
@@ -1,10 +1,10 @@
 diff --git a/chrome/android/java/res/menu/website_preferences_menu.xml b/chrome/android/java/res/menu/website_preferences_menu.xml
-index 41a465537e3eaa9addf3c6b17ebfacc3951138ef..f47abfc5d78de4e3d7d06de11eb045f59e6c2234 100644
+index 6371709bb96312fe31a1f4e48eee546e4e8bd746..e6c35c0b4398d43727137bb172b1c3f23fc9d316 100644
 --- a/chrome/android/java/res/menu/website_preferences_menu.xml
 +++ b/chrome/android/java/res/menu/website_preferences_menu.xml
 @@ -9,4 +9,5 @@
            android:title="@string/search"
            app:showAsAction="always"
-           app:actionViewClass="android.support.v7.widget.SearchView" />
+           app:actionViewClass="androidx.appcompat.widget.SearchView" />
 +    <item android:id="@+id/close_menu_id" android:icon="@drawable/btn_close" android:title="@string/settings_exit" app:showAsAction="ifRoom" app:iconTint="@color/standard_mode_tint" />
  </menu>
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
index c4be3e8ca607..30c290fb376c 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
@@ -1,17 +1,17 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-index 73c0640175a256cf35b30760339349a07b5cb567..7fd99daa8dd73f8ddce26e8e413afa7db3180660 100644
+index ae9f5ce8953f367917748c3013e7d9cf910675e5..5c2e0b24c1d10d394a35f13808b6827e23920d22 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -169,7 +169,7 @@ import java.util.Locale;
-  * This is the main activity for ChromeMobile when not running in document mode.  All the tabs
+@@ -177,7 +177,7 @@ import java.util.Locale;
   * are accessible via a chrome specific tab switching UI.
   */
--public class ChromeTabbedActivity extends ChromeActivity {
-+public class ChromeTabbedActivity extends BraveActivity {
+ public class ChromeTabbedActivity
+-        extends ChromeActivity<ChromeActivityComponent> implements AccessibilityUtil.Observer {
++        extends BraveActivity<ChromeActivityComponent> implements AccessibilityUtil.Observer {
      private static final String TAG = "ChromeTabbedActivity";
  
      private static final String HELP_URL_PREFIX = "https://support.google.com/chrome/";
-@@ -1612,7 +1612,7 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -1571,7 +1571,7 @@ public class ChromeTabbedActivity
  
      @Override
      public AppMenuPropertiesDelegate createAppMenuPropertiesDelegate() {
@@ -20,19 +20,19 @@ index 73c0640175a256cf35b30760339349a07b5cb567..7fd99daa8dd73f8ddce26e8e413afa7d
                  getMultiWindowModeStateDispatcher(), getTabModelSelector(), getToolbarManager(),
                  getWindow().getDecorView(), this,
                  mOverviewModeController.mOverviewModeBehaviorSupplier,
-@@ -1625,9 +1625,9 @@ public class ChromeTabbedActivity extends ChromeActivity {
-             return new TabbedModeTabDelegateFactory(
-                     this, getAppBrowserControlsVisibilityDelegate(), getShareDelegateSupplier());
-         };
+@@ -1595,9 +1595,9 @@ public class ChromeTabbedActivity
+                 }
+             };
+         }
 -        return Pair.create(new ChromeTabCreator(this, getWindowAndroid(), getStartupTabPreloader(),
 +        return Pair.create(new org.chromium.chrome.browser.tabmodel.BraveTabCreator(this, getWindowAndroid(), getStartupTabPreloader(),
-                                    tabDelegateFactorySupplier, false),
+                                    tabDelegateFactorySupplier, false, overviewNTPCreator),
 -                new ChromeTabCreator(this, getWindowAndroid(), getStartupTabPreloader(),
 +                new org.chromium.chrome.browser.tabmodel.BraveTabCreator(this, getWindowAndroid(), getStartupTabPreloader(),
-                         tabDelegateFactorySupplier, true));
+                         tabDelegateFactorySupplier, true, overviewNTPCreator));
      }
  
-@@ -2012,7 +2012,7 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -1974,7 +1974,7 @@ public class ChromeTabbedActivity
          }
      }
  
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkEditActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkEditActivity.java.patch
index 2262850ab591..2da5dde40896 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkEditActivity.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkEditActivity.java.patch
@@ -1,19 +1,19 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java
-index 958ceaf32885402fe94e2462704922fafed465b9..9ed03f2fcf678b6b01ea7b32afde6ea339f034e1 100644
+index ddad1aaabedab67882bb5236a74c4a9f8ad1d49f..be0db3e531410b0c5158dd22e8a7dc728cd60efd 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java
-@@ -140,6 +140,7 @@ public class BookmarkEditActivity extends SynchronousInitializationActivity {
-                     mModel.getBookmarkById(mBookmarkId).getUrl();
+@@ -141,6 +141,7 @@ public class BookmarkEditActivity extends SynchronousInitializationActivity {
+             final GURL originalUrl = new GURL(mModel.getBookmarkById(mBookmarkId).getUrl());
              final String title = mTitleEditText.getTrimmedText();
              final String url = mUrlEditText.getTrimmedText();
 +            final String originalTitle = mModel.getBookmarkById(mBookmarkId).getTitle(); boolean sendToSyncWorker = !mTitleEditText.isEmpty() && !title.equals(originalTitle);
  
              if (!mTitleEditText.isEmpty()) {
                  mModel.setBookmarkTitle(mBookmarkId, title);
-@@ -150,8 +151,10 @@ public class BookmarkEditActivity extends SynchronousInitializationActivity {
-                 String fixedUrl = UrlFormatter.fixupUrl(url);
-                 if (fixedUrl != null && !fixedUrl.equals(originalUrl)) {
-                     mModel.setBookmarkUrl(mBookmarkId, fixedUrl);
+@@ -151,8 +152,10 @@ public class BookmarkEditActivity extends SynchronousInitializationActivity {
+                 GURL fixedUrl = UrlFormatter.fixupUrl(url);
+                 if (fixedUrl.isValid() && !fixedUrl.equals(originalUrl)) {
+                     mModel.setBookmarkUrl(mBookmarkId, fixedUrl.getSpec());
 +                    sendToSyncWorker = true;
                  }
              }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-channels-ChannelsUpdater.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-channels-ChannelsUpdater.java.patch
index 311f5c8fbe03..668cbf20b2f9 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-channels-ChannelsUpdater.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-channels-ChannelsUpdater.java.patch
@@ -1,13 +1,13 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/channels/ChannelsUpdater.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/channels/ChannelsUpdater.java
-index d49ba4549b2a4de6e3d3503d3bb664d9b686b8c5..7294e66716e3a7dbf1b94aa753d61730107067bc 100644
+index 18f95e7235f9ec0398b0f91901792bb6be304885..fa6c39f3eeba76cd6dda24695b02815ab4d3662c 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/channels/ChannelsUpdater.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/channels/ChannelsUpdater.java
-@@ -36,7 +36,7 @@ public class ChannelsUpdater {
+@@ -35,7 +35,7 @@ public class ChannelsUpdater {
          public static final ChannelsUpdater INSTANCE = Build.VERSION.SDK_INT < Build.VERSION_CODES.O
                  ? new ChannelsUpdater(false /* isAtLeastO */, null, null, -1)
-                 : new ChannelsUpdater(true /* isAtLeastO */, ContextUtils.getAppSharedPreferences(),
--                          new ChannelsInitializer(new NotificationManagerProxyImpl(
-+                          new ChannelsInitializer(new org.chromium.chrome.browser.notifications.BraveNotificationManagerProxyImpl(
-                                                           ContextUtils.getApplicationContext()),
-                                   ContextUtils.getApplicationContext().getResources()),
-                           ChannelDefinitions.CHANNELS_VERSION);
+                 : new ChannelsUpdater(true /* isAtLeastO */, SharedPreferencesManager.getInstance(),
+-                        new ChannelsInitializer(new NotificationManagerProxyImpl(
++                        new ChannelsInitializer(new org.chromium.chrome.browser.notifications.BraveNotificationManagerProxyImpl(
+                                                         ContextUtils.getApplicationContext()),
+                                 ContextUtils.getApplicationContext().getResources()),
+                         ChannelDefinitions.CHANNELS_VERSION);
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch
index f0ea897d485b..5f0051488982 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch
@@ -1,17 +1,17 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
-index 10e9d4974f446c1de30d6f0d19da5b6d567b9b0c..d41e9acf7c2e7e2f19baa20bb537d8ddd57579cc 100644
+index f3b72d05f758107d84c9d7a1681c8432ccfffd01..624147bb14ec2f4cbf4767d345aaa554f4f6b4f1 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
-@@ -107,7 +107,7 @@ public class BottomControlsCoordinator {
+@@ -115,7 +115,7 @@ public class BottomControlsCoordinator {
              mTabGroupUi = TabManagementModuleProvider.getDelegate().createTabGroupUi(
                      root.findViewById(R.id.bottom_container_slot), themeColorProvider);
          } else {
 -            mBottomToolbarCoordinator = new BottomToolbarCoordinator(
 +            mBottomToolbarCoordinator = new BraveBottomToolbarCoordinator(
-                     root.findViewById(R.id.bottom_toolbar_stub), tabProvider, homeButtonListener,
-                     searchAcceleratorListener, shareButtonListenerSupplier,
-                     tabSwitcherLongclickListener, themeColorProvider);
-@@ -200,4 +200,5 @@ public class BottomControlsCoordinator {
+                     root.findViewById(R.id.bottom_toolbar_stub), tabProvider,
+                     tabSwitcherLongclickListener, themeColorProvider, shareDelegateSupplier,
+                     showStartSurfaceCallable, openHomepageAction, setUrlBarFocusAction);
+@@ -214,4 +214,5 @@ public class BottomControlsCoordinator {
          if (mTabGroupUi != null) mTabGroupUi.destroy();
          mMediator.destroy();
      }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
index da883e5d1c1d..3c2d6cce27fe 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
@@ -1,17 +1,17 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
-index 19475da4bf833ec8f517497cd413499769ce32ec..a1af2ff1d1cfe05c2c8c818bd8dbb6230eafb870 100644
+index c7531b702b2a2e5b966af50ce97409a62a78efef..e733defe9b68f8ff45bdf120f15fca973b4f5bd2 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
-@@ -28,7 +28,7 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper;
-  */
- class BottomToolbarCoordinator {
+@@ -43,7 +43,7 @@ class BottomToolbarCoordinator {
+             new CachedMetrics.ActionEvent("MobileToolbarOmniboxAcceleratorTap");
+ 
      /** The browsing mode bottom toolbar component */
 -    private final BrowsingModeBottomToolbarCoordinator mBrowsingModeCoordinator;
 +    protected final BrowsingModeBottomToolbarCoordinator mBrowsingModeCoordinator;
  
      /** The tab switcher mode bottom toolbar component */
      private TabSwitcherBottomToolbarCoordinator mTabSwitcherModeCoordinator;
-@@ -40,8 +40,8 @@ class BottomToolbarCoordinator {
+@@ -55,8 +55,8 @@ class BottomToolbarCoordinator {
      private final ThemeColorProvider mThemeColorProvider;
  
      /** The overview mode manager. */
@@ -22,18 +22,18 @@ index 19475da4bf833ec8f517497cd413499769ce32ec..a1af2ff1d1cfe05c2c8c818bd8dbb623
  
      /** The activity tab provider. */
      private ActivityTabProvider mTabProvider;
-@@ -62,7 +62,7 @@ class BottomToolbarCoordinator {
-             ThemeColorProvider themeColorProvider) {
-         View root = stub.inflate();
+@@ -103,7 +103,7 @@ class BottomToolbarCoordinator {
+             setUrlBarFocusAction.onResult(LocationBar.OmniboxFocusReason.ACCELERATOR_TAP);
+         };
  
 -        mBrowsingModeCoordinator = new BrowsingModeBottomToolbarCoordinator(root, tabProvider,
 +        mBrowsingModeCoordinator = new BraveBrowsingModeBottomToolbarCoordinator(root, tabProvider,
-                 homeButtonListener, searchAcceleratorListener, shareButtonListenerSupplier,
+                 homeButtonListener, searchAcceleratorListener, mShareButtonListenerSupplier,
                  tabsSwitcherLongClickListner);
  
-@@ -164,4 +164,5 @@ class BottomToolbarCoordinator {
-         }
-         mThemeColorProvider.destroy();
+@@ -263,4 +263,5 @@ class BottomToolbarCoordinator {
+             listener.onClick(v);
+         };
      }
 +    public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) {if (mBrowsingModeCoordinator != null) {((BraveBrowsingModeBottomToolbarCoordinator)mBrowsingModeCoordinator).updateBookmarkButton(isBookmarked, editingAllowed);}}
  }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarVariationManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarVariationManager.java.patch
index 88a7147f6252..ae316f4697e2 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarVariationManager.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarVariationManager.java.patch
@@ -1,24 +1,24 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java
-index 5aca8d3e33981d352282b868dd2ffaaa32a45a74..8d5dcd0f7c8ef475d2bd48a9d16a6ed7719f393c 100644
+index cf54c3785cde4ac9da4d2039b112644ebc2d7c62..7cc81b6639c41302e5265d82d3bf1f56de7d2201 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java
-@@ -52,6 +52,7 @@ public class BottomToolbarVariationManager {
+@@ -62,6 +62,7 @@ public class BottomToolbarVariationManager {
       *         in the current variation.
       */
      public static boolean isShareButtonOnBottom() {
 +        if (BraveBottomToolbarVariationManager.isBraveVariation()) return false;
-         return FeatureUtilities.isBottomToolbarEnabled()
+         return BottomToolbarConfiguration.isBottomToolbarEnabled()
                  && !getVariation().equals(Variations.HOME_SEARCH_TAB_SWITCHER);
      }
-@@ -61,6 +62,7 @@ public class BottomToolbarVariationManager {
+@@ -71,6 +72,7 @@ public class BottomToolbarVariationManager {
       *         in portrait mode in the current variation.
       */
      public static boolean isNewTabButtonOnBottom() {
 +        if (BraveBottomToolbarVariationManager.isBraveVariation()) return true;
-         return FeatureUtilities.isBottomToolbarEnabled()
+         return BottomToolbarConfiguration.isBottomToolbarEnabled()
                  && getVariation().equals(Variations.NEW_TAB_SEARCH_SHARE);
      }
-@@ -70,6 +72,7 @@ public class BottomToolbarVariationManager {
+@@ -80,6 +82,7 @@ public class BottomToolbarVariationManager {
       *         in portrait mode in the current variation.
       */
      public static boolean isMenuButtonOnBottom() {
@@ -26,19 +26,19 @@ index 5aca8d3e33981d352282b868dd2ffaaa32a45a74..8d5dcd0f7c8ef475d2bd48a9d16a6ed7
          // If we don't have variations that put menu on bottom in the future,
          // then this method can be removed.
          return false;
-@@ -80,6 +83,7 @@ public class BottomToolbarVariationManager {
+@@ -90,6 +93,7 @@ public class BottomToolbarVariationManager {
       *         in the current variation.
       */
      public static boolean shouldBottomToolbarBeVisibleInOverviewMode() {
 +        if (BraveBottomToolbarVariationManager.isBraveVariation()) return true;
          return (getVariation().equals(Variations.NEW_TAB_SEARCH_SHARE)
-                        && !FeatureUtilities.isStartSurfaceEnabled())
-                 || ((!FeatureUtilities.isGridTabSwitcherEnabled()
-@@ -101,6 +105,7 @@ public class BottomToolbarVariationManager {
+                        && !StartSurfaceConfiguration.isStartSurfaceEnabled())
+                 || ((!TabUiFeatureUtilities.isGridTabSwitcherEnabled()
+@@ -111,6 +115,7 @@ public class BottomToolbarVariationManager {
       *         of portrait mode in current variation.
       */
      public static boolean isTabSwitcherOnBottom() {
 +        if (BraveBottomToolbarVariationManager.isBraveVariation()) return true;
-         return FeatureUtilities.isBottomToolbarEnabled()
+         return BottomToolbarConfiguration.isBottomToolbarEnabled()
                  && getVariation().equals(Variations.HOME_SEARCH_TAB_SWITCHER);
      }
diff --git a/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch b/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch
index 5d503dea850e..f990f621af2e 100644
--- a/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch
+++ b/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch
@@ -1,11 +1,11 @@
 diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
-index bb110a5ba9bc6748e21c33df31ec1354f51a2057..3aa38f66ccc938cb119d5cde4a2096ee93422195 100644
+index 9ad9aefa707014f11cce82162d6440b076247f5e..d2e67d4c3c0fae1aa640148599c50977169ce21c 100644
 --- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
 +++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
-@@ -87,6 +87,7 @@ std::string HashIdWithOrigin(const std::string& security_origin,
- content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest(
+@@ -88,6 +88,7 @@ content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest(
      const api::webrtc_logging_private::RequestInfo& request,
-     const std::string& security_origin) {
+     const std::string& security_origin,
+     std::string* error) {
 +  return nullptr; // feature disabled in Brave
    // There are 2 ways these API functions can get called.
    //
diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
index 41bf7125f67a..269826365d15 100644
--- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
+++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
-index c877d3adbd7599834ce3302f27d1ee86abba3a33..157d16063431bb3451a888252dd2acd5f0b507c3 100644
+index d79112677ca4c906b9c86da87034305043852c13..dc72daf0fa5bd568cd5419334dce0f8291f3c447 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
 @@ -252,6 +252,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
@@ -7,6 +7,6 @@ index c877d3adbd7599834ce3302f27d1ee86abba3a33..157d16063431bb3451a888252dd2acd5
  
  const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
 +  BRAVE_FIND_FEATURE_EXPOSED_TO_JAVA
-   for (size_t i = 0; i < base::size(kFeaturesExposedToJava); ++i) {
-     if (kFeaturesExposedToJava[i]->name == feature_name)
-       return kFeaturesExposedToJava[i];
+   for (const auto* feature : kFeaturesExposedToJava) {
+     if (feature->name == feature_name)
+       return feature;
diff --git a/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch b/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch
index 835198ca4a5f..dda100107ce0 100644
--- a/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch
+++ b/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch
@@ -1,13 +1,13 @@
 diff --git a/chrome/browser/resources/settings/autofill_page/passwords_section.html b/chrome/browser/resources/settings/autofill_page/passwords_section.html
-index 9f6a73d370a9d7aa2bb64220a82168c1543d5342..01ef029856890ccbdfb159338666b137fbc5254c 100644
+index 169195871379d3e82738953a11c6eafff7a16572..8d2f8fce22e78d61fa85722d284906fff8d85f98 100644
 --- a/chrome/browser/resources/settings/autofill_page/passwords_section.html
 +++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html
-@@ -81,11 +81,15 @@
-         label="$i18n{passwordsAutosigninLabel}"
-         sub-label="$i18n{passwordsAutosigninDescription}">
-     </settings-toggle-button>
+@@ -153,11 +153,15 @@
+         </cr-icon-button>
+       </div>
+     </template>
 +    <!--
-     <div id="manageLink" class="settings-box first two-line"
+     <div id="manageLink" class="settings-box two-line"
          hidden$="[[hidePasswordsLink_]]">
 +    -->
        <!-- This span lays out the url correctly, relative to the label. -->
diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
index 293f7f8a712d..686fa73855c7 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
@@ -1,66 +1,66 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-index 078c52bad1638679aa2ff06f44e1f78a030dca17..0a893039e53a092cf8618079698d4777d0536e4d 100644
+index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44189388f7 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
 @@ -27,6 +27,7 @@
+ <link rel="import" href="../settings_shared_css.html">
  <link rel="import" href="../site_settings/constants.html">
  
- <link rel="import" href="privacy_page_browser_proxy.html">
 +<link rel="import" href="personalization_options.html">
- 
  <dom-module id="settings-privacy-page">
    <template>
-@@ -62,6 +63,7 @@
+     <style include="settings-shared">
+@@ -42,6 +43,7 @@
      <settings-animated-pages id="pages" section="privacy"
          focus-config="[[focusConfig_]]">
        <div route-path="default">
 +       <settings-personalization-options prefs="{{prefs}}"></settings-personalization-options>
-         <cr-link-row id="clearBrowsingData"
-             class="hr"
-             label="$i18n{clearBrowsingData}"
-@@ -72,6 +74,7 @@
-             label="$i18n{siteSettings}"
-             sub-label="$i18n{siteSettingsDescription}"
-             on-click="onSiteSettingsTap_"></cr-link-row>
+         <template is="dom-if" if="[[!privacySettingsRedesignEnabled_]]" restamp>
+           <cr-link-row id="clearBrowsingData"
+               class="hr"
+@@ -53,6 +55,7 @@
+               label="$i18n{siteSettings}"
+               sub-label="$i18n{siteSettingsDescription}"
+               on-click="onSiteSettingsTap_"></cr-link-row>
 +<if expr="_google_chrome">
-         <cr-expand-button id="moreExpansion"
-             alt="$i18n{privacyPageMore}"
-             class="settings-box"
-@@ -80,6 +83,7 @@
-         </cr-expand-button>
-         <iron-collapse id="moreCollapse" opened="[[moreOpened_]]"
-             class="iron-collapse-indented">
+           <cr-expand-button id="moreExpansion"
+               alt="$i18n{privacyPageMore}"
+               class="settings-box"
+@@ -61,6 +64,7 @@
+           </cr-expand-button>
+           <iron-collapse id="moreCollapse" opened="[[moreOpened_]]"
+               class="iron-collapse-indented">
 +</if>
-           <settings-toggle-button id="safeBrowsingToggle"
-               class="settings-box first"
-               pref="{{prefs.safebrowsing.enabled}}"
-@@ -88,6 +92,7 @@
-               on-settings-boolean-control-change=
-                   "onSafeBrowsingToggleChange_">
-           </settings-toggle-button>
+             <settings-toggle-button id="safeBrowsingToggle"
+                 class="settings-box first"
+                 pref="{{prefs.safebrowsing.enabled}}"
+@@ -69,6 +73,7 @@
+                 on-settings-boolean-control-change=
+                     "onSafeBrowsingToggleChange_">
+             </settings-toggle-button>
 +<if expr="_google_chrome">
-           <settings-passwords-leak-detection-toggle
-               id="passwordsLeakDetectionToggle"
-               prefs="{{prefs}}"
-@@ -101,6 +106,7 @@
-               on-settings-boolean-control-change=
-                   "onSafeBrowsingReportingToggleChange_">
-           </settings-toggle-button>
+             <settings-passwords-leak-detection-toggle
+                 id="passwordsLeakDetectionToggle"
+                 prefs="{{prefs}}"
+@@ -82,6 +87,7 @@
+                 on-settings-boolean-control-change=
+                     "onSafeBrowsingReportingToggleChange_">
+             </settings-toggle-button>
 +</if>
-           <settings-toggle-button id="doNotTrack"
-               pref="{{prefs.enable_do_not_track}}" label="$i18n{doNotTrack}"
-               on-settings-boolean-control-change="onDoNotTrackChange_"
-@@ -136,7 +142,9 @@
-               sub-label="$i18n{securityKeysDesc}"
-               on-click="onSecurityKeysTap_"></cr-link-row>
-           </template>
+             <settings-do-not-track-toggle id="doNotTrack" prefs="{{prefs}}">
+             </settings-do-not-track-toggle>
+             <settings-toggle-button id="canMakePaymentToggle"
+@@ -118,7 +124,9 @@
+                 sub-label="$i18n{securityKeysDesc}"
+                 on-click="onSecurityKeysTap_"></cr-link-row>
+             </template>
 +<if expr="_google_chrome">
-         </iron-collapse>
+           </iron-collapse>
 +</if>
-       </div>
- 
- <if expr="use_nss_certs">
-@@ -201,6 +209,7 @@
+         </template>
+         <template is="dom-if" if="[[privacySettingsRedesignEnabled_]]" restamp>
+           <cr-link-row id="clearBrowsingData"
+@@ -210,6 +218,7 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
@@ -68,7 +68,7 @@ index 078c52bad1638679aa2ff06f44e1f78a030dca17..0a893039e53a092cf8618079698d4777
        <template is="dom-if" route-path="/content/backgroundSync" no-search>
          <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
-@@ -218,6 +227,7 @@
+@@ -227,6 +236,7 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
@@ -76,7 +76,7 @@ index 078c52bad1638679aa2ff06f44e1f78a030dca17..0a893039e53a092cf8618079698d4777
        <template is="dom-if" route-path="/content/camera" no-search>
          <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
-@@ -246,11 +256,13 @@
+@@ -267,11 +277,13 @@
                sub-option-label="$i18n{deleteDataPostSession}"
                sub-option-mode="cookies-session-only">
            </category-default-setting>
@@ -90,7 +90,7 @@ index 078c52bad1638679aa2ff06f44e1f78a030dca17..0a893039e53a092cf8618079698d4777
            <cr-link-row id="site-data-trigger" class="hr"
                on-click="onSiteDataTap_" label="$i18n{siteSettingsCookieLink}">
            </cr-link-row>
-@@ -340,11 +352,13 @@
+@@ -361,11 +373,13 @@
          <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
              search-term="{{searchFilter_}}">
@@ -104,7 +104,7 @@ index 078c52bad1638679aa2ff06f44e1f78a030dca17..0a893039e53a092cf8618079698d4777
            <category-setting-exceptions
                category="{{ContentSettingsTypes.JAVASCRIPT}}"
                block-header="$i18n{siteSettingsBlock}"
-@@ -443,6 +457,19 @@
+@@ -464,6 +478,19 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch
index 16fb8346d055..e52b7d017c73 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch
@@ -1,17 +1,17 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js
-index 843dd6681443fce99093530045c6f26bd0b29c02..67eb1e4e6e0d7d80cf59eecd0ae4bfe11bf9ceb1 100644
+index 69fc86b355720a3e3d508628cd1d068ff19a9248..e357a4018d4d1a5f1cf30fbed786d743684716bd 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js
-@@ -10,7 +10,7 @@ let MetricsReporting;
- cr.define('settings', function() {
+@@ -44,7 +44,7 @@ cr.define('settings', function() {
+ 
    /** @interface */
    class PrivacyPageBrowserProxy {
 -    // <if expr="_google_chrome and not chromeos">
 +    // <if expr="_chromium and not chromeos">
-     /** @return {!Promise<!MetricsReporting>} */
+     /** @return {!Promise<!settings.MetricsReporting>} */
      getMetricsReporting() {}
  
-@@ -33,7 +33,7 @@ cr.define('settings', function() {
+@@ -94,7 +94,7 @@ cr.define('settings', function() {
     * @implements {settings.PrivacyPageBrowserProxy}
     */
    class PrivacyPageBrowserProxyImpl {
diff --git a/patches/chrome-browser-ui-page_info-page_info.cc.patch b/patches/chrome-browser-ui-page_info-page_info.cc.patch
index 4b92bed784a3..7099214491d8 100644
--- a/patches/chrome-browser-ui-page_info-page_info.cc.patch
+++ b/patches/chrome-browser-ui-page_info-page_info.cc.patch
@@ -1,11 +1,11 @@
 diff --git a/chrome/browser/ui/page_info/page_info.cc b/chrome/browser/ui/page_info/page_info.cc
-index 0f5ee4eaf00340bd1036605174b69cb13f0b4c0a..3f1c6eb0a5fd43a4d4ff3fe696d1060176f5fa38 100644
+index 918adb7c9628e68ba367e5dff25910536976d03b..0f1f87c99100aea01c964d726c663be0cbac1a3c 100644
 --- a/chrome/browser/ui/page_info/page_info.cc
 +++ b/chrome/browser/ui/page_info/page_info.cc
-@@ -173,6 +173,7 @@ bool ShouldShowPermission(
-     HostContentSettingsMap* content_settings,
-     content::WebContents* web_contents,
-     TabSpecificContentSettings* tab_specific_content_settings) {
+@@ -172,6 +172,7 @@ bool ShouldShowPermission(const PageInfoUI::PermissionInfo& info,
+                           HostContentSettingsMap* content_settings,
+                           content::WebContents* web_contents,
+                           bool changed_since_last_page_load) {
 +  if (!BraveShouldShowPermission(info, web_contents)) return false;
    // Note |ContentSettingsType::ADS| will show up regardless of its default
    // value when it has been activated on the current origin.
diff --git a/patches/chrome-browser-ui-tabs-tab_style.cc.patch b/patches/chrome-browser-ui-tabs-tab_style.cc.patch
index 6c102aa6ecdf..0803c6fa76c3 100644
--- a/patches/chrome-browser-ui-tabs-tab_style.cc.patch
+++ b/patches/chrome-browser-ui-tabs-tab_style.cc.patch
@@ -1,13 +1,13 @@
 diff --git a/chrome/browser/ui/tabs/tab_style.cc b/chrome/browser/ui/tabs/tab_style.cc
-index 00e4e8ad7481fc179a15fe04ab9a6d65612e3044..16dc78bc9e3f907350a878909efe0637e179392c 100644
+index ccf846d78009892396bcd66570c7d6efa48b452a..828854c620d6132ed331af38c1c6c34798c16032 100644
 --- a/chrome/browser/ui/tabs/tab_style.cc
 +++ b/chrome/browser/ui/tabs/tab_style.cc
 @@ -15,7 +15,7 @@ constexpr int kSeparatorThickness = 1;
  
  // Returns the height of the separator between tabs.
  int GetSeparatorHeight() {
--  return ui::MaterialDesignController::touch_ui() ? 24 : 20;
-+  return ui::MaterialDesignController::touch_ui() ? 24 : 24;
+-  return ui::TouchUiController::Get()->touch_ui() ? 24 : 20;
++  return ui::TouchUiController::Get()->touch_ui() ? 24 : 24;
  }
  
  }  // namespace
diff --git a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch
index 0dee3af2e7e7..aeeac38b216d 100644
--- a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch
+++ b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch
@@ -1,13 +1,13 @@
 diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
-index 8b0a0b2278e5dc7527ceb896815e8c9172cd3e95..a4d7d2598c19645034b8c816f428b4284d9eb955 100644
+index 7c85028e1a97487adeff330a27b9eeec54d3efb8..d4549ff20eeb0b8b5d4f3c9da1a807ef35fcaa1a 100644
 --- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
 +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
-@@ -230,7 +230,7 @@ UpgradeDetectorImpl::UpgradeDetectorImpl(const base::Clock* clock,
+@@ -459,7 +459,7 @@ void UpgradeDetectorImpl::Init() {
  #if defined(OS_WIN)
- // Only enable upgrade notifications for Google Chrome builds. Chromium does not
- // use an auto-updater.
--#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-+#if defined(GOOGLE_CHROME_BRANDING) || (defined(BRAVE_CHROMIUM_BUILD) && defined(OFFICIAL_BUILD))
-   // There might be a policy/enterprise environment preventing updates, so
-   // validate updatability and then call StartTimerForUpgradeCheck
-   // appropriately. Skip this step if a past attempt has been made to enable
+   // Only enable upgrade notifications for Google Chrome builds. Chromium does
+   // not use an auto-updater.
+-  if (!BUILDFLAG(GOOGLE_CHROME_BRANDING))
++  if (!BUILDFLAG(GOOGLE_CHROME_BRANDING)) && (!(defined(BRAVE_CHROMIUM_BUILD)) && defined(OFFICIAL_BUILD)))
+     return;
+ #elif defined(OS_MACOSX)
+   // Only enable upgrade notifications if the updater (Keystone) is present.
diff --git a/patches/components-component_updater-component_updater_service.h.patch b/patches/components-component_updater-component_updater_service.h.patch
index 67417bedbd67..84b73e99ab8f 100644
--- a/patches/components-component_updater-component_updater_service.h.patch
+++ b/patches/components-component_updater-component_updater_service.h.patch
@@ -1,11 +1,11 @@
 diff --git a/components/component_updater/component_updater_service.h b/components/component_updater/component_updater_service.h
-index d10071a59ea51ea3dfe1d9bebe2a76fdbcb2d7dc..ef42dd2ad162cf2288587599e74ba57ad9cc8800 100644
+index 2dd57681a7f2e823c1a58decf360ce9bc798dfdc..c60c8272a6395db5564187f5697212d4f75b4915 100644
 --- a/components/component_updater/component_updater_service.h
 +++ b/components/component_updater/component_updater_service.h
 @@ -157,6 +157,7 @@ class OnDemandUpdater {
    enum class Priority { BACKGROUND = 0, FOREGROUND = 1 };
  
-   virtual ~OnDemandUpdater() {}
+   virtual ~OnDemandUpdater() = default;
 +  BRAVE_COMPONENT_UPDATER_SERVICE_H_
  
   private:
diff --git a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch
index b448b2cd84eb..dcc00be24e97 100644
--- a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch
+++ b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch
@@ -1,11 +1,11 @@
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
-index be41b0fe2d4f7ff9eed4b0d04a5b250dc13e6d0b..c22f12b814f2a5189c9574377ae6b022741aa52f 100644
+index 79711fe3e08b219ff88aa41bb738b9106569a2c4..0d1c6c3d76c5b7ed80ff7a1e33faf2e1fd5aca3e 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -543,6 +543,7 @@ void ContentSettingsRegistry::Init() {
-            ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
+@@ -605,6 +605,7 @@ void ContentSettingsRegistry::Init() {
+            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
             ContentSettingsInfo::PERSISTENT,
-            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
+            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
 +  BRAVE_INIT
  }
  
diff --git a/patches/components-crash-core-browser-resources-crashes.js.patch b/patches/components-crash-core-browser-resources-crashes.js.patch
index 4d4c1a8c9b0a..8ad70c33553d 100644
--- a/patches/components-crash-core-browser-resources-crashes.js.patch
+++ b/patches/components-crash-core-browser-resources-crashes.js.patch
@@ -1,13 +1,13 @@
 diff --git a/components/crash/core/browser/resources/crashes.js b/components/crash/core/browser/resources/crashes.js
-index fb5d25b859fd2089b4a06cc917acfb4f4f40d889..a6610767c38dc9e870be67cb1302670f8470fb56 100644
+index 287eed28ae76ef4655441f376937ea395a405c57..d68f3bc8ac25c5a5e39675e9741513fb66bb7b6f 100644
 --- a/components/crash/core/browser/resources/crashes.js
 +++ b/components/crash/core/browser/resources/crashes.js
-@@ -130,7 +130,7 @@ function updateCrashList(
-       link.target = '_blank';
-       link.textContent = loadTimeData.getString('bugLinkText');
-       linkBlock.appendChild(link);
--      crashBlock.appendChild(linkBlock);
-+      //crashBlock.appendChild(linkBlock); // feature disabled in Brave
-     } else {
-       let textContentKey;
-       if (crash.state === 'pending_user_requested') {
+@@ -91,7 +91,7 @@ function updateCrashList(
+         crashLink.href = `https://goto.google.com/crash/${crash.id}`;
+         crashLink.target = '_blank';
+         crashLink.textContent = crash.id;
+-        uploadIdValue.appendChild(crashLink);
++        //uploadIdValue.appendChild(crashLink); // feature disabled in Brave
+       } else {
+         uploadIdValue.textContent = crash.id;
+       }
diff --git a/patches/components-permissions-permission_request.h.patch b/patches/components-permissions-permission_request.h.patch
index 40ac2459bb68..46ba065616ae 100644
--- a/patches/components-permissions-permission_request.h.patch
+++ b/patches/components-permissions-permission_request.h.patch
@@ -1,11 +1,11 @@
 diff --git a/components/permissions/permission_request.h b/components/permissions/permission_request.h
-index 0115cabdb04afc297d98d57ac46d46e8e41a0fa8..42e5f92578067753bfe290d24cb4ec0b864f8022 100644
+index 6e8dbb8bd7652c66b5f65361e57920586d76595e..60f4196592e690ae037a2a00faee113e3e3ac05e 100644
 --- a/components/permissions/permission_request.h
 +++ b/components/permissions/permission_request.h
-@@ -53,6 +53,7 @@ enum class PermissionRequestType {
-   PERMISSION_CLIPBOARD_READ_WRITE = 20,
+@@ -54,6 +54,7 @@ enum class PermissionRequestType {
    PERMISSION_VR = 21,
    PERMISSION_AR = 22,
+   PERMISSION_STORAGE_ACCESS = 23,
 +  BRAVE_PERMISSION_REQUEST_TYPES
    // NUM must be the last value in the enum.
    NUM
diff --git a/patches/components-sync-driver-glue-sync_engine_backend.cc.patch b/patches/components-sync-driver-glue-sync_engine_backend.cc.patch
index 5f3b48200e79..9b2b26d1bad0 100644
--- a/patches/components-sync-driver-glue-sync_engine_backend.cc.patch
+++ b/patches/components-sync-driver-glue-sync_engine_backend.cc.patch
@@ -1,11 +1,11 @@
 diff --git a/components/sync/driver/glue/sync_engine_backend.cc b/components/sync/driver/glue/sync_engine_backend.cc
-index 6a1b6a6b12d50a5ec96995e4ffc93b18b0a90368..c8aa24306d2668e319feb15aa18bd7c0bd00c882 100644
+index 9dd41584040da490fe5e298ea5732a7fd1276845..308ac46b0e8843d16de7ad450764be845c7edfb2 100644
 --- a/components/sync/driver/glue/sync_engine_backend.cc
 +++ b/components/sync/driver/glue/sync_engine_backend.cc
-@@ -376,6 +376,7 @@ void SyncEngineBackend::DoInitialize(SyncEngine::InitParams params) {
-   args.cache_guid = params.cache_guid;
+@@ -383,6 +383,7 @@ void SyncEngineBackend::DoInitialize(SyncEngine::InitParams params) {
    args.birthday = params.birthday;
    args.bag_of_chips = params.bag_of_chips;
+   args.sync_status_observers.push_back(this);
 +  BRAVE_SYNC_ENGINE_BACKEND_DO_INITIALIZE
    sync_manager_->Init(&args);
    base::trace_event::MemoryDumpManager::GetInstance()
diff --git a/patches/components-sync-driver-profile_sync_service.cc.patch b/patches/components-sync-driver-profile_sync_service.cc.patch
index a1d146849e54..11f59b29f954 100644
--- a/patches/components-sync-driver-profile_sync_service.cc.patch
+++ b/patches/components-sync-driver-profile_sync_service.cc.patch
@@ -1,11 +1,11 @@
 diff --git a/components/sync/driver/profile_sync_service.cc b/components/sync/driver/profile_sync_service.cc
-index 96abaa6e76e73d8896c31063a532b07a164ac9d0..78d69f5bd816455fa82e05057584bf0ced36806d 100644
+index 44a6eb15256323c76a10dcd6c412e228ae822e60..c76f70ddc3ad115051eb1f30c6bd84b7edd97319 100644
 --- a/components/sync/driver/profile_sync_service.cc
 +++ b/components/sync/driver/profile_sync_service.cc
-@@ -520,6 +520,7 @@ void ProfileSyncService::StartUpSlowEngineComponents() {
+@@ -617,6 +617,7 @@ void ProfileSyncService::StartUpSlowEngineComponents() {
+       create_http_post_provider_factory_cb_, MakeUserAgentForSync(channel_),
        url_loader_factory_->Clone(), network_time_update_callback_);
-   params.authenticated_account_id = GetAuthenticatedAccountInfo().account_id;
-   DCHECK(!params.authenticated_account_id.empty() || IsLocalSyncEnabled());
+   params.authenticated_account_id = authenticated_account_info.account_id;
 +  BRAVE_PROFILE_SYNC_SERVICE_START_UP_SLOW_ENGINE_COMPONENTS
    if (!base::FeatureList::IsEnabled(switches::kSyncE2ELatencyMeasurement)) {
      invalidation::InvalidationService* invalidator =
diff --git a/patches/components-sync-engine-sync_manager.h.patch b/patches/components-sync-engine-sync_manager.h.patch
index 2a82467f75f3..230d013fc4e8 100644
--- a/patches/components-sync-engine-sync_manager.h.patch
+++ b/patches/components-sync-engine-sync_manager.h.patch
@@ -1,12 +1,12 @@
 diff --git a/components/sync/engine/sync_manager.h b/components/sync/engine/sync_manager.h
-index 16aee17d067b29470ac81bc5d3ed995e4a5277a7..5f6c90bf08611a7c0922047072a1d89d892fc4a7 100644
+index dda74a6b330b84d67e8dac386f9aa5ea1548aded..2eda3885bb0257a3128e585ca3ab4ccc982dbe4c 100644
 --- a/components/sync/engine/sync_manager.h
 +++ b/components/sync/engine/sync_manager.h
-@@ -255,6 +255,7 @@ class SyncManager {
+@@ -256,6 +256,7 @@ class SyncManager {
      std::string cache_guid;
      std::string birthday;
      std::string bag_of_chips;
 +    BRAVE_SYNC_MANAGER_INIT_ARGS_H
-   };
  
-   // The state of sync the feature. If the user turned on sync explicitly, it
+     // List of observers to be added to AllStatus.
+     std::vector<SyncStatusObserver*> sync_status_observers;
diff --git a/patches/content-public-browser-permission_type.cc.patch b/patches/content-public-browser-permission_type.cc.patch
index 42a4ec1727b1..a0a2742ae772 100644
--- a/patches/content-public-browser-permission_type.cc.patch
+++ b/patches/content-public-browser-permission_type.cc.patch
@@ -1,11 +1,11 @@
 diff --git a/content/public/browser/permission_type.cc b/content/public/browser/permission_type.cc
-index 05632368c83c9a03b4e360f3ab50a85082890c89..322ea955218148f4a8d8a1d6998c22f929136867 100644
+index 7170e9ed97b2411891228871e70f8ef23fc2424c..ed93c92d19505cfdec769e69ed55a7b176ce2f0f 100644
 --- a/content/public/browser/permission_type.cc
 +++ b/content/public/browser/permission_type.cc
-@@ -99,6 +99,7 @@ base::Optional<PermissionType> PermissionDescriptorToPermissionType(
-       break;
-     case PermissionName::NFC:
+@@ -101,6 +101,7 @@ base::Optional<PermissionType> PermissionDescriptorToPermissionType(
        return PermissionType::NFC;
+     case PermissionName::STORAGE_ACCESS:
+       return PermissionType::STORAGE_ACCESS_GRANT;
 +    BRAVE_PERMISSIONDESCRIPTORTOPERMISSIONTYPE
    }
  
diff --git a/patches/extensions-browser-extension_event_histogram_value.h.patch b/patches/extensions-browser-extension_event_histogram_value.h.patch
index daa4b38b280a..897b098a288f 100644
--- a/patches/extensions-browser-extension_event_histogram_value.h.patch
+++ b/patches/extensions-browser-extension_event_histogram_value.h.patch
@@ -1,11 +1,11 @@
 diff --git a/extensions/browser/extension_event_histogram_value.h b/extensions/browser/extension_event_histogram_value.h
-index 0d56ccd20eb53d8b6f552964e10338617f9a5f1d..b5c2ee197b0da03f9814cfc89b5dbdfeb92f0aba 100644
+index 85e848099cf64c9c708dc54768163da49af9fe70..222046138a870af45c00ec76a59f11156f6912cc 100644
 --- a/extensions/browser/extension_event_histogram_value.h
 +++ b/extensions/browser/extension_event_histogram_value.h
-@@ -467,6 +467,20 @@ enum HistogramValue {
-   PRINTING_ON_JOB_STATUS_CHANGED = 445,
-   DECLARATIVE_NET_REQUEST_ON_RULE_MATCHED_DEBUG = 446,
-   TERMINAL_PRIVATE_ON_SETTINGS_CHANGED = 447,
+@@ -475,6 +475,20 @@ enum HistogramValue {
+   PASSWORDS_PRIVATE_ON_COMPROMISED_CREDENTIALS_INFO_CHANGED = 453,
+   TERMINAL_PRIVATE_ON_A11Y_STATUS_CHANGED = 454,
+   PASSWORDS_PRIVATE_ON_PASSWORD_CHECK_STATUS_CHANGED = 455,
 +
 +  BRAVE_START = 600,
 +  BRAVE_AD_BLOCKED,
diff --git a/patches/services-network-public-cpp-cors-cors.cc.patch b/patches/services-network-public-cpp-cors-cors.cc.patch
index b7f067f942bf..ba6eca4ec431 100644
--- a/patches/services-network-public-cpp-cors-cors.cc.patch
+++ b/patches/services-network-public-cpp-cors-cors.cc.patch
@@ -1,11 +1,11 @@
 diff --git a/services/network/public/cpp/cors/cors.cc b/services/network/public/cpp/cors/cors.cc
-index 932c5f3b4b979835a7cede469f8a491485fe3943..f3b582e4e898db36536be799710278b5bab9f44f 100644
+index 5e6e4e020c8477a2516ca18a719c158b2a8d5934..cb14d54b958bdc4af2eb8b1db61e8ffe7f6f7f6c 100644
 --- a/services/network/public/cpp/cors/cors.cc
 +++ b/services/network/public/cpp/cors/cors.cc
-@@ -455,6 +455,7 @@ bool IsCorsSafelistedHeader(
-       "sec-ch-ua-arch",
+@@ -456,6 +456,7 @@ bool IsCorsSafelistedHeader(
        "sec-ch-ua-model",
        "sec-ch-ua-mobile",
+       "sec-ch-ua-full-version",
 +      "x-brave-partner", // Prevent Allow-Cross-Origin-Request-Header failures
    };
    if (std::find(std::begin(safe_names), std::end(safe_names), lower_name) ==
diff --git a/patches/third_party-blink-public-mojom-permissions-permission.mojom.patch b/patches/third_party-blink-public-mojom-permissions-permission.mojom.patch
index 92dd7abb6c05..7587740a9701 100644
--- a/patches/third_party-blink-public-mojom-permissions-permission.mojom.patch
+++ b/patches/third_party-blink-public-mojom-permissions-permission.mojom.patch
@@ -1,11 +1,11 @@
 diff --git a/third_party/blink/public/mojom/permissions/permission.mojom b/third_party/blink/public/mojom/permissions/permission.mojom
-index be5e3edcdfbd8b437a3b55723dc816cbfae79a9b..101b8ac633810d9a9ee5fe2ff26f817b6a0831fa 100644
+index 8b2409fe513cd1afb9ba373d6ab25d42bedf2ad5..18e67432f93082c583d890245f4cb699823b7f5d 100644
 --- a/third_party/blink/public/mojom/permissions/permission.mojom
 +++ b/third_party/blink/public/mojom/permissions/permission.mojom
-@@ -25,6 +25,7 @@ enum PermissionName {
-   PERIODIC_BACKGROUND_SYNC,
+@@ -26,6 +26,7 @@ enum PermissionName {
    WAKE_LOCK,
    NFC,
+   STORAGE_ACCESS,
 +  AUTOPLAY,
  };
  
diff --git a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.idl.patch b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.idl.patch
index be4fdb420351..54179769121e 100644
--- a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.idl.patch
+++ b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.idl.patch
@@ -1,14 +1,16 @@
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
-index 7491acde6b938f8e114a913181f200e94133384f..3f2e99a151baee6dbbae83f1b0a97019feca338d 100644
+index d396fb78d87725ec603b084644c9e9610230fece..742b4c7e087b68b4a797867aadaa6c2acc3bc543 100644
 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
 +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
-@@ -37,7 +37,7 @@
+@@ -37,9 +37,9 @@
  
      // Channel access
      readonly attribute unsigned long numberOfChannels;
--    [HighEntropy, Measure, RaisesException] Float32Array getChannelData(unsigned long channelIndex);
--    [HighEntropy, Measure, RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long bufferOffset = 0);
-+    [CallWith=ScriptState, HighEntropy, Measure, RaisesException] Float32Array getChannelData(unsigned long channelIndex);
-+    [CallWith=ScriptState, HighEntropy, Measure, RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long bufferOffset = 0);
-     [RaisesException] void copyToChannel(Float32Array source, long channelNumber, optional unsigned long bufferOffset = 0);
- };
+-    [HighEntropy, Measure, RaisesException] Float32Array getChannelData(
++    [CallWith=ScriptState, HighEntropy, Measure, RaisesException] Float32Array getChannelData(
+         unsigned long channelIndex);
+-    [HighEntropy, Measure, RaisesException] void copyFromChannel(
++    [CallWith=ScriptState, HighEntropy, Measure, RaisesException] void copyFromChannel(
+         Float32Array destination,
+         unsigned long channelNumber,
+         optional unsigned long bufferOffset = 0);

From 1bb04576c809ab01dcff65a3d87e6bb7120e38fd Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 12:10:37 -0400
Subject: [PATCH 003/161] [Android] isBottomToolbarEnabled moved.

Used to be in FeatureUtilities, then the class was renamed to
CachedFeatureFlags, then the method was moved to
toolbar/bottom/BottomToolbarConfiguration.java

Chromium changes:

https://chromium.googlesource.com/chromium/src/+/732f05650ffbc5dd5ccff7e4b8a682804dab6d0b

commit 732f05650ffbc5dd5ccff7e4b8a682804dab6d0b
Author: Henrique Nakashima <hnakashima@chromium.org>
Date:   Tue Feb 4 23:42:54 2020 +0000

    Rename FeatureUtilities to CachedFeatureFlags.

    FeatureUtilities is not accurate anymore, as this shouldn't contain
    code for specific features anymore, and it is (and has been) a
    stateful class.

    The responsibility of this class is to cache feature flags for use
    without native being loaded.

    This is CL 3/5 for renaming FeatureUtilities.

    Bug: 1012975

https://chromium.googlesource.com/chromium/src/+/12f84491145a1cab6aad9f001f64e6f73d40cd27

commit 12f84491145a1cab6aad9f001f64e6f73d40cd27
Author: Henrique Nakashima <hnakashima@chromium.org>
Date:   Wed Feb 26 22:45:15 2020 +0000

    Move TabUI/Duet feature-specific methods out of CachedFeatureFlags.

    CachedFeatureFlags should only have generic methods.

    Bug: 1012975
---
 android/brave_java_sources.gni                      |  2 +-
 .../bottom/BraveBottomToolbarConfiguration.java}    |  7 ++++---
 ...chrome-browser-flags-FeatureUtilities.java.patch | 13 -------------
 ...bar-bottom-BottomToolbarConfiguration.java.patch | 13 +++++++++++++
 4 files changed, 18 insertions(+), 17 deletions(-)
 rename android/java/org/chromium/chrome/browser/{flags/BraveFeatureUtilities.java => toolbar/bottom/BraveBottomToolbarConfiguration.java} (93%)
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-flags-FeatureUtilities.java.patch
 create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarConfiguration.java.patch

diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
index 80779fe42f30..56c3d350e295 100644
--- a/android/brave_java_sources.gni
+++ b/android/brave_java_sources.gni
@@ -35,7 +35,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkWorker.java",
   "../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java",
-  "../../brave/android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java",
   "../../brave/android/java/org/chromium/chrome/browser/help/BraveHelpAndFeedback.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationManagerProxyImpl.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java",
@@ -118,6 +117,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncServiceObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java",
+  "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java",
diff --git a/android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java
similarity index 93%
rename from android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java
rename to android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java
index 338a095f6a74..38567ef82bae 100644
--- a/android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java
@@ -1,9 +1,9 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.flags;
+package org.chromium.chrome.browser.toolbar.bottom;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
@@ -16,7 +16,7 @@
 import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 
-public class BraveFeatureUtilities {
+public class BraveBottomToolbarConfiguration {
     private static final int SMALL_SCREEN_WIDTH = 360;
     private static final int SMALL_SCREEN_HEIGHT = 640;
 
@@ -57,3 +57,4 @@ private static boolean isSmallScreen() {
         return (width <= SMALL_SCREEN_WIDTH) && (height <= SMALL_SCREEN_HEIGHT);
     }
 }
+
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-flags-FeatureUtilities.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-flags-FeatureUtilities.java.patch
deleted file mode 100644
index 302938d5fbd4..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-flags-FeatureUtilities.java.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
-index 812fb94c20ef24b34cfbc941e3f07367d8d4426a..081effbbfde067178ee841f653f163324d251e4b 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
-@@ -297,7 +297,7 @@ public class FeatureUtilities {
-      */
-     public static boolean isBottomToolbarEnabled() {
-         // TODO(crbug.com/944228): TabGroupsAndroid and ChromeDuet are incompatible for now.
--        return isEnabled(ChromeFeatureList.CHROME_DUET)
-+        return BraveFeatureUtilities.isBottomToolbarEnabled()
-                 && !DeviceFormFactor.isNonMultiDisplayContextOnTablet(
-                         ContextUtils.getApplicationContext())
-                 && (isDuetTabStripIntegrationAndroidEnabled() || !isTabGroupsAndroidEnabled());
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarConfiguration.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarConfiguration.java.patch
new file mode 100644
index 000000000000..6bc4995ffc0f
--- /dev/null
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarConfiguration.java.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java
+index 3138acd77b38b31cc57e06df649e09c709a03c46..cfe1463b38ab0b519a839146e8e46fe726e82a30 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java
+@@ -18,7 +18,7 @@ public class BottomToolbarConfiguration {
+      * @return Whether or not the bottom toolbar is enabled.
+      */
+     public static boolean isBottomToolbarEnabled() {
+-        return CachedFeatureFlags.isEnabled(ChromeFeatureList.CHROME_DUET)
++        return BraveBottomToolbarConfiguration.isBottomToolbarEnabled()
+                 && !DeviceFormFactor.isNonMultiDisplayContextOnTablet(
+                         ContextUtils.getApplicationContext())
+                 && (TabUiFeatureUtilities.isDuetTabStripIntegrationAndroidEnabled()

From 2dca4ca49aaa29b56d86836d772a61b78f7a1a7a Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 13:00:50 -0400
Subject: [PATCH 004/161] [Android] About Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/9b75f752e2c060c7b3cf1ecd4d21cfdabf89a522

commit 9b75f752e2c060c7b3cf1ecd4d21cfdabf89a522
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Wed Mar 11 20:55:02 2020 +0000

    [Settings Refactor] Move About Chrome Settings

    Move About Chrome Settings to org.chromium.chrome.browser.about_settings
    package.

    Bug: 1047357
---
 ...wser-about_settings-AboutChromeSettings.java.patch} | 10 +++++-----
 ...about_settings-LegalInformationSettings.java.patch} | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-about-AboutChromeSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-about_settings-AboutChromeSettings.java.patch} (53%)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-about-LegalInformationSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-about_settings-LegalInformationSettings.java.patch} (51%)

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-about-AboutChromeSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-AboutChromeSettings.java.patch
similarity index 53%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-about-AboutChromeSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-AboutChromeSettings.java.patch
index 472e50014a85..aecbe6eed182 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-about-AboutChromeSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-AboutChromeSettings.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/about/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/about/AboutChromeSettings.java
-index fb84c0ca78431cc5339cd51092f61c959b1c6838..d9ee30ca43aeffe9b756458ec446af58a55ee5d0 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/about/AboutChromeSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/about/AboutChromeSettings.java
-@@ -24,7 +24,7 @@ import java.util.Calendar;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+index 2ec63dba837e33bb1fa7bfb07b104b34edca15a6..47246de7cb90698b41e81e199e2e5980c9248b81 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+@@ -25,7 +25,7 @@ import java.util.Calendar;
   * Settings fragment that displays information about Chrome.
   */
  public class AboutChromeSettings
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-about-LegalInformationSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-LegalInformationSettings.java.patch
similarity index 51%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-about-LegalInformationSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-LegalInformationSettings.java.patch
index f0524c1a76f0..5bb0bfe7d167 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-about-LegalInformationSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-LegalInformationSettings.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/about/LegalInformationSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/about/LegalInformationSettings.java
-index aea41fcae53c5d615124b987e21014447ad6151f..1af120ec642d435a34229c0a510d123710aec0b2 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/about/LegalInformationSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/about/LegalInformationSettings.java
-@@ -13,7 +13,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java
+index e1ad179731c8fa19f16e043f5c5785585c666615..a8aa05b2758ba4dad207dd0d1102f5434d8b1cff 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java
+@@ -14,7 +14,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
  /**
   * Fragment to display legal information about Chrome.
   */

From e4475d75312a3660e0d6535bfedc6a690e43adc4 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 14:01:25 -0400
Subject: [PATCH 005/161] [Android] Accessibility Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/e64d53eeb6130c5eac8c755b6ced4a60a30cbc20

commit e64d53eeb6130c5eac8c755b6ced4a60a30cbc20
Author: Natalie Chouinard <chouinard@google.com>
Date:   Thu Mar 12 01:48:28 2020 +0000

    [Settings Refactor] Move Accessibility settings

    Move Accessibility settings to
    org.chromium.chrome.browser.accessibility.settings and update OWNERS.

    Bug: 1047357
---
 ...sibility-settings-AccessibilitySettings.java.patch} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-accessibility-AccessibilitySettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-accessibility-settings-AccessibilitySettings.java.patch} (56%)

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-accessibility-AccessibilitySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-accessibility-settings-AccessibilitySettings.java.patch
similarity index 56%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-accessibility-AccessibilitySettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-accessibility-settings-AccessibilitySettings.java.patch
index feb04ec7fc3d..79dc913b65ab 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-accessibility-AccessibilitySettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-accessibility-settings-AccessibilitySettings.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/accessibility/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/accessibility/AccessibilitySettings.java
-index fd479e83dbb210f3f713700b89c3cf2aeaa073bd..103d475ca789086ae73ffe8adb12d8afbcea4222 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/accessibility/AccessibilitySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/accessibility/AccessibilitySettings.java
-@@ -25,7 +25,7 @@ import org.chromium.chrome.browser.util.AccessibilityUtil;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
+index ab40f6d41f27a0e7c27d6067501a7d2428d2e272..32216156145ddbcc42bd90904534c6e2c9d03dc8 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
+@@ -26,7 +26,7 @@ import org.chromium.chrome.browser.util.AccessibilityUtil;
   * Fragment to keep track of all the accessibility related preferences.
   */
  public class AccessibilitySettings

From f93902a8b448b73059b2b5379c842f8052d9a10e Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 14:19:15 -0400
Subject: [PATCH 006/161] [Android] Autofill Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/5d85a5c5ce0c4ae8fdd41addf16176652147a7d8

commit 5d85a5c5ce0c4ae8fdd41addf16176652147a7d8
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Thu Feb 6 20:32:58 2020 +0000

    Reland "[Settings Refactor] Move autofill settings"

    This is a reland of 359bdf7656ebcda379e42d1ce72ee897d36c5286

    Proguard rules now extended to ensure Fragments aren't removed in
    release: https://crrev.com/c/2036872.

    There is no change to this patch from the original.

    Original change's description:
    > [Settings Refactor] Move autofill settings
    >
    > Move autofill settings alongside autofill code.
    >
    > Bug: 1047357
---
 ...-settings-AndroidPaymentAppsFragment.java.patch} | 10 +++++-----
 ...ttings-AutofillPaymentMethodsFragment.java.patch | 13 +++++++++++++
 ...ll-settings-AutofillProfilesFragment.java.patch} |  8 ++++----
 ...ttings-AutofillServerProfileFragment.java.patch} | 10 +++++-----
 ...tofill-AutofillPaymentMethodsFragment.java.patch | 13 -------------
 5 files changed, 27 insertions(+), 27 deletions(-)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AndroidPaymentAppsFragment.java.patch => chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AndroidPaymentAppsFragment.java.patch} (52%)
 create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillPaymentMethodsFragment.java.patch
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillProfilesFragment.java.patch => chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillProfilesFragment.java.patch} (59%)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillServerProfileFragment.java.patch => chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillServerProfileFragment.java.patch} (54%)
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillPaymentMethodsFragment.java.patch

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AndroidPaymentAppsFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AndroidPaymentAppsFragment.java.patch
similarity index 52%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AndroidPaymentAppsFragment.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AndroidPaymentAppsFragment.java.patch
index bb79f08da9c3..938dc5a59d8b 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AndroidPaymentAppsFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AndroidPaymentAppsFragment.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AndroidPaymentAppsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AndroidPaymentAppsFragment.java
-index b0589b4dbf86e0c4ac81937283344ed24d41b65f..bec10b63647fe97922f1d6e059afadf7e4474a31 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AndroidPaymentAppsFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AndroidPaymentAppsFragment.java
-@@ -26,7 +26,7 @@ import java.util.Map;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppsFragment.java
+index 178be18639bf862d6292995d4e8fb0da008c7d7d..3447e61e8d57cf018cb283e33aacfa9bc16b76b0 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppsFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppsFragment.java
+@@ -27,7 +27,7 @@ import java.util.Map;
  /**
   * Preference fragment to allow users to control use of the Android payment apps on device.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillPaymentMethodsFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillPaymentMethodsFragment.java.patch
new file mode 100644
index 000000000000..55a13e0722ea
--- /dev/null
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillPaymentMethodsFragment.java.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java
+index be9ceae4670c54c767810ba5c35de76592658ec2..e4af5f1ec0b2e7da878abc83e7775826f34e8cd2 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java
+@@ -31,7 +31,7 @@ import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
+  * payment apps.
+  * TODO(crbug.com/949269): Add tests for AutofillProfilesFragment.
+  */
+-public class AutofillPaymentMethodsFragment extends PreferenceFragmentCompat
++public class AutofillPaymentMethodsFragment extends org.chromium.chrome.browser.settings.BravePreferenceFragment
+         implements PersonalDataManager.PersonalDataManagerObserver {
+     private static final String PREF_PAYMENT_APPS = "payment_apps";
+ 
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillProfilesFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillProfilesFragment.java.patch
similarity index 59%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillProfilesFragment.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillProfilesFragment.java.patch
index 7a4918649d77..9d0765f10706 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillProfilesFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillProfilesFragment.java.patch
@@ -1,7 +1,7 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragment.java
-index d39f827e6fd75d2c5c927800bafc4716336db8e0..a79be879806cfd616694ba2e1ff8d5262f898d1f 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragment.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java
+index 3ce7b2a9a1c48c6b2034de2e911fa98602597c28..bb4733eb98e0a5c170b8388870ac9f4b37c804b4 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java
 @@ -30,7 +30,7 @@ import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
  /**
   * Autofill profiles fragment, which allows the user to edit autofill profiles.
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillServerProfileFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillServerProfileFragment.java.patch
similarity index 54%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillServerProfileFragment.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillServerProfileFragment.java.patch
index 38459d933954..26181b956fe0 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillServerProfileFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillServerProfileFragment.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerProfileFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerProfileFragment.java
-index c8119f81df2fdaa5d225d68cdf2905b0f2550af6..a88326a7b0f21f9b4e76728e8b22ab8b781a680c 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerProfileFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerProfileFragment.java
-@@ -20,7 +20,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerProfileFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerProfileFragment.java
+index a7fdf7ddabf20512299c27116f0fe883227b3618..c72054d5e1ef0a836709aa13f401f1c07c38cf4b 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerProfileFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerProfileFragment.java
+@@ -21,7 +21,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
   * Fragment for settings page that allows user to view and edit a single server-provided address.
   */
  public class AutofillServerProfileFragment
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillPaymentMethodsFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillPaymentMethodsFragment.java.patch
deleted file mode 100644
index ddb89f5a5228..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-autofill-AutofillPaymentMethodsFragment.java.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillPaymentMethodsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillPaymentMethodsFragment.java
-index 7205db1f4ff9582b2938b768bd9f5d0d6a1fc88d..6ebe784918fdce6710d5bfdf5d4d14fb70e8e007 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillPaymentMethodsFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillPaymentMethodsFragment.java
-@@ -27,7 +27,7 @@ import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
-  * Autofill credit cards fragment, which allows the user to edit credit cards and control
-  * payment apps.
-  */
--public class AutofillPaymentMethodsFragment extends PreferenceFragmentCompat
-+public class AutofillPaymentMethodsFragment extends org.chromium.chrome.browser.settings.BravePreferenceFragment
-         implements PersonalDataManager.PersonalDataManagerObserver {
-     private static final String PREF_PAYMENT_APPS = "payment_apps";
- 

From a0cb17890b0eeaf460147efabc0db43082d322a9 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 14:34:44 -0400
Subject: [PATCH 007/161] [Android] DataReduction Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/cdf105b25a5f2cc90645830633ce4f1d175a2c76

commit cdf105b25a5f2cc90645830633ce4f1d175a2c76
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Tue Feb 4 20:38:18 2020 +0000

    [Settings Refactor] Move datareduction settings

    Move datareduction settings alongside other datareduction code.

    Bug: 1047357
---
 ...tings-DataReductionPreferenceFragment.java.patch | 13 +++++++++++++
 ...ction-DataReductionPreferenceFragment.java.patch | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-datareduction-DataReductionPreferenceFragment.java.patch

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch
new file mode 100644
index 000000000000..52b4f449c54f
--- /dev/null
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java
+index a076bf7aa4b027d95d8c51f2881d42cd2d92340c..34b740df6fdb04c634098e14372461f1734db901 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java
+@@ -34,7 +34,7 @@ import java.util.Locale;
+ /**
+  * Settings fragment that allows the user to configure Data Saver.
+  */
+-public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
++public class DataReductionPreferenceFragment extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
+     public static final String FROM_MAIN_MENU = "FromMainMenu";
+ 
+     public static final String PREF_DATA_REDUCTION_SWITCH = "data_reduction_switch";
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-datareduction-DataReductionPreferenceFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-datareduction-DataReductionPreferenceFragment.java.patch
deleted file mode 100644
index 49bb366109fd..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-datareduction-DataReductionPreferenceFragment.java.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionPreferenceFragment.java
-index 241932172e15b059447ed1f2c6169febabe41f68..bc96350712eb87b2572dcce73be9e41176a9b95d 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionPreferenceFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionPreferenceFragment.java
-@@ -33,7 +33,7 @@ import java.util.Locale;
- /**
-  * Settings fragment that allows the user to configure Data Saver.
-  */
--public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
-+public class DataReductionPreferenceFragment extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
-     public static final String FROM_MAIN_MENU = "FromMainMenu";
- 
-     public static final String PREF_DATA_REDUCTION_SWITCH = "data_reduction_switch";

From ab5e21ca371282dd288e05b0a0f8894a64965dba Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 14:43:44 -0400
Subject: [PATCH 008/161] [Android] Developer Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/e29477adc01dd1f7ffc9b05b48bc250e3d318651

commit e29477adc01dd1f7ffc9b05b48bc250e3d318651
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Wed Feb 5 23:31:52 2020 +0000

    [Settings Refactor] Move Developer settings

    Move Developer Settings alongside other tracing code.

    Bug: 1047357
---
 ...-settings-developer-DeveloperSettings.java.patch | 13 -------------
 ...s-developer-TracingCategoriesSettings.java.patch | 13 -------------
 ...er-tracing-settings-DeveloperSettings.java.patch | 13 +++++++++++++
 ...ng-settings-TracingCategoriesSettings.java.patch | 13 +++++++++++++
 ...ser-tracing-settings-TracingSettings.java.patch} |  8 ++++----
 5 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-DeveloperSettings.java.patch
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-TracingCategoriesSettings.java.patch
 create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch
 create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingCategoriesSettings.java.patch
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-developer-TracingSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingSettings.java.patch} (54%)

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-DeveloperSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-DeveloperSettings.java.patch
deleted file mode 100644
index 974ab96cd139..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-DeveloperSettings.java.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/DeveloperSettings.java
-index 9c3ce4011b6ec0d5bf7ef7b5eebece16a23f35c4..f54726c3153ec397f4999ac86e98d9b82c7abd5c 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/DeveloperSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/DeveloperSettings.java
-@@ -18,7 +18,7 @@ import org.chromium.components.version_info.VersionConstants;
- /**
-  * Settings fragment containing preferences aimed at Chrome and web developers.
-  */
--public class DeveloperSettings extends PreferenceFragmentCompat {
-+public class DeveloperSettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
-     private static final String UI_PREF_BETA_STABLE_HINT = "beta_stable_hint";
- 
-     // Non-translated strings:
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-TracingCategoriesSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-TracingCategoriesSettings.java.patch
deleted file mode 100644
index 6dfb60d0a3e8..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-TracingCategoriesSettings.java.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesSettings.java
-index 9e04f8f1af83d156b19148b75307096a5d0bd63d..64056fcce4b440b24ccb464458e7beccde6d65c5 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesSettings.java
-@@ -26,7 +26,7 @@ import java.util.Set;
-  * passed to the fragment via an extra (EXTRA_CATEGORY_TYPE).
-  */
- public class TracingCategoriesSettings
--        extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
-+        extends org.chromium.chrome.browser.settings.BravePreferenceFragment implements Preference.OnPreferenceChangeListener {
-     public static final String EXTRA_CATEGORY_TYPE = "type";
- 
-     // Non-translated strings:
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch
new file mode 100644
index 000000000000..1c80d886ec97
--- /dev/null
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
+index 6b41808d568199620aebba6afaf4ae5e24d02670..48506917906c959d41303083b902447b496725f5 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
+@@ -19,7 +19,7 @@ import org.chromium.components.version_info.VersionConstants;
+ /**
+  * Settings fragment containing preferences aimed at Chrome and web developers.
+  */
+-public class DeveloperSettings extends PreferenceFragmentCompat {
++public class DeveloperSettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
+     private static final String UI_PREF_BETA_STABLE_HINT = "beta_stable_hint";
+ 
+     // Non-translated strings:
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingCategoriesSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingCategoriesSettings.java.patch
new file mode 100644
index 000000000000..2a854d6759a8
--- /dev/null
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingCategoriesSettings.java.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingCategoriesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingCategoriesSettings.java
+index 7df5aa0990686125a5d25dba08ed8d4ec41d2904..011045017a4777979d51a53dd7e0362feeef78d5 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingCategoriesSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingCategoriesSettings.java
+@@ -27,7 +27,7 @@ import java.util.Set;
+  * passed to the fragment via an extra (EXTRA_CATEGORY_TYPE).
+  */
+ public class TracingCategoriesSettings
+-        extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
++        extends org.chromium.chrome.browser.settings.BravePreferenceFragment implements Preference.OnPreferenceChangeListener {
+     public static final String EXTRA_CATEGORY_TYPE = "type";
+ 
+     // Non-translated strings:
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-TracingSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingSettings.java.patch
similarity index 54%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-TracingSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingSettings.java.patch
index 72f0c8e5e366..3febc3fd45b2 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-developer-TracingSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingSettings.java.patch
@@ -1,7 +1,7 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingSettings.java
-index 17745165cc1945321c7fd41f58f58b5bc6b05740..68d080427a8fb162c1f79a5be973fd09722e0282 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingSettings.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingSettings.java
+index a8b0f537d404a2c430b9ae90c16d993d52ebb14c..56910f68bb1894f1da4c913c14005d6c3c25f310 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingSettings.java
 @@ -30,7 +30,7 @@ import java.util.Set;
   * Settings fragment that shows options for recording a performance trace.
   */

From af49e85e6e6ee11ea8288a0482e393e9bdea7c2b Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 14:56:03 -0400
Subject: [PATCH 009/161] [Android] Download Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/332deb89881bb5ac213aa0437c0da77e7979b33b

commit 332deb89881bb5ac213aa0437c0da77e7979b33b
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Wed Mar 11 23:47:26 2020 +0000

    [Settings Refactor] Move Download settings

    Move Download settings to org.chromium.chrome.browser.download package.
    This package rename will be followed by modularization
    (crbug.com/1047896).

    Bug: 1047357
---
 ...browser-download-settings-DownloadSettings.java.patch} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-download-DownloadSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-download-settings-DownloadSettings.java.patch} (62%)

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-download-DownloadSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-download-settings-DownloadSettings.java.patch
similarity index 62%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-download-DownloadSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-download-settings-DownloadSettings.java.patch
index 804472d9d882..e88f485b4b6a 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-download-DownloadSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-download-settings-DownloadSettings.java.patch
@@ -1,7 +1,7 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/download/DownloadSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/download/DownloadSettings.java
-index 26209a5256f3fa7913d1f5170af092fc06468e76..e44dd3df72e8240a2271b1eba54b6329e2525d3a 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/download/DownloadSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/download/DownloadSettings.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadSettings.java
+index faeccca2a91787e73facdbb1ad3dfd5ee9db3136..45a607aae34c49273bd1c25dc07d876636e16138 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadSettings.java
 @@ -21,7 +21,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
   * Fragment containing Download settings.
   */

From d6aa38d7cab9544c7110bacc880e74b136104676 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 15:03:31 -0400
Subject: [PATCH 010/161] [Android] Language Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/3923b9b7c936c33579c47183989fccebf9e255df

commit 3923b9b7c936c33579c47183989fccebf9e255df
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Wed Mar 4 17:41:48 2020 +0000

    [Settings Refactor] Move Language settings

    Move Language settings to org.chromium.chrome.browser.language package
    and add Language OWNERS.

    Bug: 1047357
---
 ...wser-language-settings-LanguageSettings.java.patch} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-languages-LanguageSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch} (51%)

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-languages-LanguageSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch
similarity index 51%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-languages-LanguageSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch
index 415af347654e..6664b3f53a8c 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-languages-LanguageSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/languages/LanguageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/languages/LanguageSettings.java
-index 2152e656944acdc498bb370cb67cc9110c71e56a..a889d09af768ae19e4de8c6b515afd02a4ae03d5 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/languages/LanguageSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/languages/LanguageSettings.java
-@@ -22,7 +22,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
+index 22d84ffee1a4f8ce2e0bf35bab19e08fe627555b..a0f99c076d3249e166235235a662a039374415e9 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
+@@ -23,7 +23,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
   * seamlessly find and manage their languages preferences across platforms.
   */
  public class LanguageSettings

From 4b87a61bcacbe02ba8f3ca68a9cdc9411c4550bf Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 15:42:42 -0400
Subject: [PATCH 011/161] [Android] Notification Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/e1eda2a9ab1fd4f89fbd869cd306b76a19f21a7c

commit e1eda2a9ab1fd4f89fbd869cd306b76a19f21a7c
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Wed Feb 26 18:54:51 2020 +0000

    [Settings Refactor] Move Notification settings

    Move Notification settings alongside Notification code.

    Bug: 1047357
---
 ...cations-settings-NotificationSettings.java.patch | 13 +++++++++++++
 ...s-notifications-NotificationsSettings.java.patch | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-settings-NotificationSettings.java.patch
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-notifications-NotificationsSettings.java.patch

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-settings-NotificationSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-settings-NotificationSettings.java.patch
new file mode 100644
index 000000000000..5464be231633
--- /dev/null
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-settings-NotificationSettings.java.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/settings/NotificationSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/settings/NotificationSettings.java
+index d1bfeebc3f07156937a9989e2098dbb13ba19349..904af8a216189481e336d857c7806c61cbbdc73f 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/settings/NotificationSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/settings/NotificationSettings.java
+@@ -27,7 +27,7 @@ import org.chromium.components.content_settings.ContentSettingsType;
+  * notification channels at the top level and links to website specific notifications. This is only
+  * used on pre-O devices, devices on Android O+ will link to the Android notification settings.
+  */
+-public class NotificationSettings extends PreferenceFragmentCompat {
++public class NotificationSettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
+     // These are package-private to be used in tests.
+     static final String PREF_FROM_WEBSITES = "from_websites";
+     static final String PREF_SUGGESTIONS = "content_suggestions";
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-notifications-NotificationsSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-notifications-NotificationsSettings.java.patch
deleted file mode 100644
index 8a93030642a6..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-notifications-NotificationsSettings.java.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/notifications/NotificationsSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/notifications/NotificationsSettings.java
-index 5ff9a1084c3567634e2ddbfa1e7d4cb9030d8e4d..7ca5ebc97387adf8492f2347e5732becec99c536 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/notifications/NotificationsSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/notifications/NotificationsSettings.java
-@@ -27,7 +27,7 @@ import org.chromium.components.content_settings.ContentSettingsType;
-  * notification channels at the top level and links to website specific notifications. This is only
-  * used on pre-O devices, devices on Android O+ will link to the Android notification settings.
-  */
--public class NotificationsSettings extends PreferenceFragmentCompat {
-+public class NotificationsSettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
-     // These are package-private to be used in tests.
-     static final String PREF_FROM_WEBSITES = "from_websites";
-     static final String PREF_SUGGESTIONS = "content_suggestions";

From f1ce263bcbeb0887269cfbdc112e5b450a5f67d8 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 15:49:53 -0400
Subject: [PATCH 012/161] [Android] Password Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/4709a83c783f79f5924857792f2146a623e70b78

commit 4709a83c783f79f5924857792f2146a623e70b78
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Thu Mar 12 20:44:14 2020 +0000

    [Settings Refactor] Move Password settings

    Move Password settings to password_manager package.

    Bug: 1047357
---
 ...sword_manager-settings-PasswordSettings.java.patch} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-password-PasswordSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch} (55%)

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-password-PasswordSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch
similarity index 55%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-password-PasswordSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch
index 2f2efa2fd76f..e7917c330292 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-password-PasswordSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java
-index 779ffefdcd9e55b75fc44211edcf30d71c1a10df..5ee257ecea43e2e1d70dd1940deec6ef275a4d7c 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java
-@@ -47,7 +47,7 @@ import java.util.Locale;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+index 0177e1b9e136160ec32c767ad838ea1c9c02ff1e..6376fc7977b5a4064695933e6b25385a1123707c 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+@@ -49,7 +49,7 @@ import java.util.Locale;
   * to view saved passwords (just the username and URL), and to delete saved passwords.
   */
  public class PasswordSettings

From c43adb6fbe1140721db201031179b02fdc70baec Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 16:06:55 -0400
Subject: [PATCH 013/161] [Android] Contextual Search Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/0a54e8bc03cb49ce55615a9083faca236a8f19a1

commit 0a54e8bc03cb49ce55615a9083faca236a8f19a1
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Fri Mar 6 00:41:06 2020 +0000

    [Settings Refactor][TTS] Move Contextual Search settings

    Move Contextual Search settings alongside Contextual Search code.

    Bug: 1047357
---
 ...arch-ContextualSearchPreferenceFragment.java.patch} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-ContextualSearchPreferenceFragment.java.patch => chrome-android-java-src-org-chromium-chrome-browser-contextualsearch-ContextualSearchPreferenceFragment.java.patch} (50%)

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-ContextualSearchPreferenceFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextualsearch-ContextualSearchPreferenceFragment.java.patch
similarity index 50%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-ContextualSearchPreferenceFragment.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-contextualsearch-ContextualSearchPreferenceFragment.java.patch
index e49acb9aeb04..ebb20ae5f3fc 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-ContextualSearchPreferenceFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextualsearch-ContextualSearchPreferenceFragment.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ContextualSearchPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ContextualSearchPreferenceFragment.java
-index 97ffc0cd5175f273967f649fc3770cc855ba9d15..2386682a957ec819205b5e8bc564980302c3b718 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ContextualSearchPreferenceFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ContextualSearchPreferenceFragment.java
-@@ -19,7 +19,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
+index 01bfe957125184b797c75923bba9b700634b91bb..026553ab1ab77d5d2bf971f5af0a5332568a0e05 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
+@@ -17,7 +17,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
  /**
   * Fragment to manage the Contextual Search preference and to explain to the user what it does.
   */

From 239cc829d8f4435d52a9b45247187f7fa99592b2 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 16:13:53 -0400
Subject: [PATCH 014/161] [Android] Privacy Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/a764638b06aaa69d60a43c3ceaecd0f4ce2792e8

commit a764638b06aaa69d60a43c3ceaecd0f4ce2792e8
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Wed Mar 11 23:53:23 2020 +0000

    [Settings Refactor] Move Privacy settings

    Move remaining privacy settings screens classes to
    org.chromium.chrome.browser.privacy.settings package and update OWNERS.

    Bug: 1047357
---
 android/brave_java_sources.gni                   |  2 +-
 .../settings}/BravePrivacySettings.java          |  2 +-
 .../settings/BraveMainPreferencesBase.java       |  2 +-
 ...ivacy-settings-DoNotTrackSettings.java.patch} | 10 +++++-----
 ...-privacy-settings-PrivacySettings.java.patch} | 16 ++++++++--------
 5 files changed, 16 insertions(+), 16 deletions(-)
 rename android/java/org/chromium/chrome/browser/{settings/privacy => privacy/settings}/BravePrivacySettings.java (99%)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-DoNotTrackSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-DoNotTrackSettings.java.patch} (50%)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-PrivacySettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch} (61%)

diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
index 56c3d350e295..9156bf19ec00 100644
--- a/android/brave_java_sources.gni
+++ b/android/brave_java_sources.gni
@@ -79,6 +79,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveSyncScreensObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettingsObserver.java",
+  "../../brave/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java",
@@ -104,7 +105,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java",
diff --git a/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
similarity index 99%
rename from android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java
rename to android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
index 4a5da76c933b..f3818fefd71a 100644
--- a/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java
+++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.settings.privacy;
+package org.chromium.chrome.browser.privacy.settings;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java
index 30fccbf69063..7ed1adaac0d0 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java
@@ -24,9 +24,9 @@
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
 import org.chromium.chrome.browser.preferences.BravePref;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
+import org.chromium.chrome.browser.privacy.settings.BravePrivacySettings;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.settings.homepage.BraveHomepageSettings;
-import org.chromium.chrome.browser.settings.privacy.BravePrivacySettings;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-DoNotTrackSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-DoNotTrackSettings.java.patch
similarity index 50%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-DoNotTrackSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-DoNotTrackSettings.java.patch
index 4beb285ead50..9eec77d40d5f 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-DoNotTrackSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-DoNotTrackSettings.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/DoNotTrackSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/DoNotTrackSettings.java
-index 940f2037c16e93e95fb66e5e7433cd7e21dd9501..3f140863b8a1c9ea753c40c0bb380720be303847 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/DoNotTrackSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/DoNotTrackSettings.java
-@@ -16,7 +16,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java
+index 05623db77d25fbe1e838ab39b0f9c5d2bd997fe5..03caf98ad19cdfcc607c59044e1e906adb5ee4b8 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java
+@@ -17,7 +17,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
  /**
   * Fragment to manage 'Do Not Track' preference and to explain to the user what it does.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-PrivacySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch
similarity index 61%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-PrivacySettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch
index 52eddd542472..bb88209e30fe 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-PrivacySettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
-index ad31ab23af3c39a92f2f0ed77134032e8c07ba3f..ca9d16d58f61d82da89dbe2aecc80d315d0049a5 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
-@@ -32,7 +32,7 @@ import org.chromium.ui.text.SpanApplier;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+index 06286383530f278f71411cf84317b358fedd4727..5e6647d85442d259ed1a8c7c7994cb8db604f71d 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+@@ -33,7 +33,7 @@ import org.chromium.ui.text.SpanApplier;
   * Fragment to keep track of the all the privacy related preferences.
   */
  public class PrivacySettings
@@ -11,7 +11,7 @@ index ad31ab23af3c39a92f2f0ed77134032e8c07ba3f..ca9d16d58f61d82da89dbe2aecc80d31
      private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
      private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
      private static final String PREF_USAGE_STATS = "usage_stats_reporting";
-@@ -146,6 +146,7 @@ public class PrivacySettings
+@@ -147,6 +147,7 @@ public class PrivacySettings
      @Override
      public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
          menu.clear();
@@ -19,8 +19,8 @@ index ad31ab23af3c39a92f2f0ed77134032e8c07ba3f..ca9d16d58f61d82da89dbe2aecc80d31
          MenuItem help =
                  menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help);
          help.setIcon(VectorDrawableCompat.create(
-@@ -159,6 +160,6 @@ public class PrivacySettings
-                     getString(R.string.help_context_privacy), Profile.getLastUsedProfile(), null);
+@@ -161,6 +162,6 @@ public class PrivacySettings
+                     null);
              return true;
          }
 -        return false;

From b68e8b18e2f20b62cd7ca5cec4d33b331c46be92 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 15:58:57 -0400
Subject: [PATCH 015/161] [Android] Browsing Data Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/2b3d19ca614346bef9df498c48c2ddf1d6173026

commit 2b3d19ca614346bef9df498c48c2ddf1d6173026
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Thu Mar 5 00:46:11 2020 +0000

    [Settings Refactor] Move Browsing Data settings

    Move Clear Browsing Data settings alongside other Browsing Data code,
    and update associated OWNERS files.

    Bug: 1047357
---
 .../BraveClearBrowsingDataPreferencesAdvanced.java  |  2 +-
 ...ng_data-ClearBrowsingDataTabsFragment.java.patch | 13 +++++++++++++
 ...privacy-ClearBrowsingDataTabsFragment.java.patch | 13 -------------
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename android/java/org/chromium/chrome/browser/{settings/privacy => browsing_data}/BraveClearBrowsingDataPreferencesAdvanced.java (97%)
 create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataTabsFragment.java.patch
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-ClearBrowsingDataTabsFragment.java.patch

diff --git a/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java b/android/java/org/chromium/chrome/browser/browsing_data/BraveClearBrowsingDataPreferencesAdvanced.java
similarity index 97%
rename from android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java
rename to android/java/org/chromium/chrome/browser/browsing_data/BraveClearBrowsingDataPreferencesAdvanced.java
index 856867a6165f..d70ad3141363 100644
--- a/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java
+++ b/android/java/org/chromium/chrome/browser/browsing_data/BraveClearBrowsingDataPreferencesAdvanced.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.settings.privacy;
+package org.chromium.chrome.browser.browsing_data;
 
 import androidx.annotation.DrawableRes;
 
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataTabsFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataTabsFragment.java.patch
new file mode 100644
index 000000000000..5981ddf9bcea
--- /dev/null
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataTabsFragment.java.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
+index c452db8b6abc8d5d5bea72d8b03ecafc9e0d0d0e..41f749213aba4580876810b3885e05493634537c 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
+@@ -136,7 +136,7 @@ public class ClearBrowsingDataTabsFragment extends Fragment {
+                     fragment = new ClearBrowsingDataFragmentBasic();
+                     break;
+                 case 1:
+-                    fragment = new ClearBrowsingDataFragmentAdvanced();
++                    fragment = new BraveClearBrowsingDataPreferencesAdvanced();
+                     break;
+                 default:
+                     throw new RuntimeException("invalid position: " + position);
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-ClearBrowsingDataTabsFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-ClearBrowsingDataTabsFragment.java.patch
deleted file mode 100644
index cc11c6ac982d..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-privacy-ClearBrowsingDataTabsFragment.java.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataTabsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataTabsFragment.java
-index b6c1393877a9f159cced14f17d497464a52080bf..74560068aa6a78953b6d3de564ab3b404392b5c4 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataTabsFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataTabsFragment.java
-@@ -132,7 +132,7 @@ public class ClearBrowsingDataTabsFragment extends Fragment {
-                     fragment = new ClearBrowsingDataFragmentBasic();
-                     break;
-                 case 1:
--                    fragment = new ClearBrowsingDataFragmentAdvanced();
-+                    fragment = new BraveClearBrowsingDataPreferencesAdvanced();
-                     break;
-                 default:
-                     throw new RuntimeException("invalid position: " + position);

From b5c3c12b95c427f1ac7fbed4683c78df71be0092 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 17:28:28 -0400
Subject: [PATCH 016/161] [Android] Sync Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/15e7285d53774f7ea0dc425f778b688544f6034a

commit 15e7285d53774f7ea0dc425f778b688544f6034a
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Thu Feb 6 19:20:30 2020 +0000

    [Settings Refactor] Move Sync settings

    Move Sync settings alongside Sync code.

    Bug: 1047357
---
 ...sync-settings-AccountManagementFragment.java.patch} |  8 ++++----
 ...rowser-sync-settings-ManageSyncSettings.java.patch} |  8 ++++----
 ...r-sync-settings-SyncAndServicesSettings.java.patch} | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-sync-AccountManagementFragment.java.patch => chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch} (55%)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-sync-ManageSyncSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch} (61%)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-sync-SyncAndServicesSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch} (53%)

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-sync-AccountManagementFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch
similarity index 55%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-sync-AccountManagementFragment.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch
index 92a071222eed..aa8c38e8dece 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-sync-AccountManagementFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch
@@ -1,7 +1,7 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/AccountManagementFragment.java
-index 9519624c83878093c782c0e2810b44f6e41996ff..9e33e2cab3b5f17492456704b4d8224b588e3b84 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/AccountManagementFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/AccountManagementFragment.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java
+index c2491e3f3bc6e3208da1f1fce3e3d8aada52402f..b23547991bf20f34b8534f961debe79c201c1029 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java
 @@ -63,7 +63,7 @@ import java.util.List;
   *
   * Note: This can be triggered from a web page, e.g. a GAIA sign-in page.
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-sync-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
similarity index 61%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-sync-ManageSyncSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
index 60a24db69aa0..b3d71098f25e 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-sync-ManageSyncSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
@@ -1,7 +1,7 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/ManageSyncSettings.java
-index e6c459d333b930b08e8cc6da0486292a90aa719b..0dbf8d3a05c8e6af9830bbfa1e721f797cae69a4 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/ManageSyncSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/ManageSyncSettings.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
+index ed809da44a2ce090b3a925484a409958206f403b..df079bd2e8582a83105e5276947368b6ec626451 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
 @@ -51,7 +51,7 @@ import java.util.Set;
   * Settings fragment to customize Sync options (data types, encryption). Can be accessed from
   * {@link SyncAndServicesSettings}.
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-sync-SyncAndServicesSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch
similarity index 53%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-sync-SyncAndServicesSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch
index 579d077fcc48..c9872147bb29 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-sync-SyncAndServicesSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesSettings.java
-index 7eab3f1bc4d1f27f3116bf109367eb692f37c364..e3ac3c7d092339798f2f6df3d67acc3015b25389 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesSettings.java
-@@ -74,7 +74,7 @@ import org.chromium.ui.widget.ButtonCompat;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
+index d022999465f0e674ffc8b9c3ce821089932e5112..29da932f759716fd8bc8736f86e084dc7f2c686e 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
+@@ -73,7 +73,7 @@ import org.chromium.ui.widget.ButtonCompat;
  /**
   * Settings fragment to enable Sync and other services that communicate with Google.
   */

From 39d8c45c5f054efeab9fd195683bfa5f31547305 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 17:39:46 -0400
Subject: [PATCH 017/161] [Android] Theme Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/bb5aabdc4715d8bc8f0b80be1becc8fc85ff3f0a

commit bb5aabdc4715d8bc8f0b80be1becc8fc85ff3f0a
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Wed Feb 5 19:19:35 2020 +0000

    [Settings Refactor] Move Theme settings

    Move Theme settings alongside other night_mode code.

    Bug: 1047357
---
 android/brave_java_sources.gni                      |  4 ++--
 .../BraveRadioButtonGroupThemePreference.java       |  2 +-
 .../settings}/BraveThemePreferences.java            |  4 ++--
 android/java/res/xml/appearance_preferences.xml     |  2 +-
 android/java/res/xml/brave_theme_preferences.xml    |  4 ++--
 ...t_mode-settings-ThemeSettingsFragment.java.patch | 13 +++++++++++++
 ...settings-themes-ThemeSettingsFragment.java.patch | 13 -------------
 7 files changed, 21 insertions(+), 21 deletions(-)
 rename android/java/org/chromium/chrome/browser/{settings/themes => night_mode/settings}/BraveRadioButtonGroupThemePreference.java (94%)
 rename android/java/org/chromium/chrome/browser/{settings/themes => night_mode/settings}/BraveThemePreferences.java (96%)
 create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-night_mode-settings-ThemeSettingsFragment.java.patch
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-themes-ThemeSettingsFragment.java.patch

diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
index 9156bf19ec00..0923e19882b9 100644
--- a/android/brave_java_sources.gni
+++ b/android/brave_java_sources.gni
@@ -36,6 +36,8 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java",
   "../../brave/android/java/org/chromium/chrome/browser/help/BraveHelpAndFeedback.java",
+  "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationManagerProxyImpl.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java",
@@ -106,9 +108,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java",
diff --git a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java
similarity index 94%
rename from android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java
rename to android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java
index 5cb8687e9746..77b3b4d8daa2 100644
--- a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java
+++ b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.settings.themes;
+package org.chromium.chrome.browser.night_mode.settings;
 
 import android.content.Context;
 import android.support.v7.preference.PreferenceViewHolder;
diff --git a/android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java
similarity index 96%
rename from android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java
rename to android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java
index 8d5e63d4c338..0d266bdb157a 100644
--- a/android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java
+++ b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.settings.themes;
+package org.chromium.chrome.browser.night_mode.settings;
 
 import static org.chromium.chrome.browser.preferences.ChromePreferenceKeys.UI_THEME_DARKEN_WEBSITES_ENABLED;
 import static org.chromium.chrome.browser.preferences.ChromePreferenceKeys.UI_THEME_SETTING;
@@ -16,9 +16,9 @@
 import org.chromium.base.BuildInfo;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder;
+import org.chromium.chrome.browser.night_mode.ThemeType;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.settings.SettingsUtils;
-import org.chromium.chrome.browser.settings.themes.ThemeType;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge;
 
diff --git a/android/java/res/xml/appearance_preferences.xml b/android/java/res/xml/appearance_preferences.xml
index eea67d3b90d8..5630a60993e3 100644
--- a/android/java/res/xml/appearance_preferences.xml
+++ b/android/java/res/xml/appearance_preferences.xml
@@ -18,7 +18,7 @@
         android:summaryOff="@string/text_off" />
 
     <Preference
-        android:fragment="org.chromium.chrome.browser.settings.themes.BraveThemePreferences"
+        android:fragment="org.chromium.chrome.browser.night_mode.settings.BraveThemePreferences"
         android:key="ui_theme"
         android:title="@string/theme_settings" />
 
diff --git a/android/java/res/xml/brave_theme_preferences.xml b/android/java/res/xml/brave_theme_preferences.xml
index 28abd6540a03..caa677c8cc65 100644
--- a/android/java/res/xml/brave_theme_preferences.xml
+++ b/android/java/res/xml/brave_theme_preferences.xml
@@ -9,8 +9,8 @@
 		<org.chromium.chrome.browser.settings.themes.BraveRadioButtonGroupCustomHomepageThemePreference/>
     </PreferenceCategory>
 	<PreferenceCategory android:title="@string/prefs_appearance">
-	    <org.chromium.chrome.browser.settings.themes.BraveRadioButtonGroupThemePreference
-	        android:fragment="org.chromium.chrome.browser.settings.themes.BraveThemePreferences"
+	    <org.chromium.chrome.browser.night_mode.settings.BraveRadioButtonGroupThemePreference
+	        android:fragment="org.chromium.chrome.browser.night_mode.settings.BraveThemePreferences"
 	        android:key="ui_theme_pref" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-night_mode-settings-ThemeSettingsFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-night_mode-settings-ThemeSettingsFragment.java.patch
new file mode 100644
index 000000000000..3591c46d1208
--- /dev/null
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-night_mode-settings-ThemeSettingsFragment.java.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragment.java
+index 17dc8a46660b23c549a89036039648e5f2eece7a..b08bd19f311e0a70bdb8880ed445dff9e92cadba 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragment.java
+@@ -23,7 +23,7 @@ import org.chromium.ui.UiUtils;
+ /**
+  * Fragment to manage the theme user settings.
+  */
+-public class ThemeSettingsFragment extends PreferenceFragmentCompat {
++public class ThemeSettingsFragment extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
+     static final String PREF_UI_THEME_PREF = "ui_theme_pref";
+ 
+     @Override
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-themes-ThemeSettingsFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-themes-ThemeSettingsFragment.java.patch
deleted file mode 100644
index bd971afd85b3..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-themes-ThemeSettingsFragment.java.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/themes/ThemeSettingsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/themes/ThemeSettingsFragment.java
-index 972a8e0c4f5f2bcd20e71d8be037da555b6fa554..253617a5e45fd44d9dbe55ab6d08138b5ce2aabb 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/themes/ThemeSettingsFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/themes/ThemeSettingsFragment.java
-@@ -23,7 +23,7 @@ import org.chromium.ui.UiUtils;
- /**
-  * Fragment to manage the theme user settings.
-  */
--public class ThemeSettingsFragment extends PreferenceFragmentCompat {
-+public class ThemeSettingsFragment extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
-     static final String PREF_UI_THEME_PREF = "ui_theme_pref";
- 
-     @Override

From da3bef4d92ec511987cde217b5f23be10a74da27 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 30 Mar 2020 19:11:45 -0400
Subject: [PATCH 018/161] [Android] Site Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/ee3a8d8aeec2473b93618a7fee770b7f3e7a831e

commit ee3a8d8aeec2473b93618a7fee770b7f3e7a831e
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Tue Mar 10 21:37:41 2020 +0000

    [Settings Refactor] Move Site Settings

    Move Site Settings to org.chromium.chrome.browser.site_settings package
    and update OWNERS.

    Bug: 1047357
---
 android/brave_java_sources.gni                     |  6 +++---
 .../BraveSiteSettingsPreferencesBase.java          |  2 +-
 .../DesktopModePreferences.java                    |  2 +-
 .../PlayYTVideoInBrowserPreferences.java           |  2 +-
 .../res/xml/brave_site_settings_preferences.xml    |  8 ++++----
 ...rowser-settings-website-SiteSettings.java.patch | 13 -------------
 ...-site_settings-ChosenObjectSettings.java.patch} | 14 +++++++-------
 ...ite_settings-SingleCategorySettings.java.patch} | 12 ++++++------
 ...site_settings-SingleWebsiteSettings.java.patch} |  8 ++++----
 ...e-browser-site_settings-SiteSettings.java.patch | 13 +++++++++++++
 10 files changed, 40 insertions(+), 40 deletions(-)
 rename android/java/org/chromium/chrome/browser/{settings/website => site_settings}/BraveSiteSettingsPreferencesBase.java (98%)
 rename android/java/org/chromium/chrome/browser/{settings/website => site_settings}/DesktopModePreferences.java (96%)
 rename android/java/org/chromium/chrome/browser/{settings/website => site_settings}/PlayYTVideoInBrowserPreferences.java (96%)
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SiteSettings.java.patch
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-website-ChosenObjectSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch} (54%)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-website-SingleCategorySettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch} (62%)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-website-SingleWebsiteSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleWebsiteSettings.java.patch} (57%)
 create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettings.java.patch

diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
index 0923e19882b9..75f49276e684 100644
--- a/android/brave_java_sources.gni
+++ b/android/brave_java_sources.gni
@@ -109,10 +109,10 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
+  "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java",
+  "../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java",
+  "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncService.java",
   "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncServiceObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java",
diff --git a/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java
similarity index 98%
rename from android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java
rename to android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java
index 18af76ed170e..2f99913c8b93 100644
--- a/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java
+++ b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.settings.website;
+package org.chromium.chrome.browser.site_settings;
 
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
diff --git a/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java b/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java
similarity index 96%
rename from android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java
rename to android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java
index df06cc200926..a02745e9398a 100644
--- a/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java
+++ b/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.settings.website;
+package org.chromium.chrome.browser.site_settings;
 
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
diff --git a/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java b/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java
similarity index 96%
rename from android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java
rename to android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java
index d6a4c10618a7..3c121441a485 100644
--- a/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java
+++ b/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.settings.website;
+package org.chromium.chrome.browser.site_settings;
 
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
diff --git a/android/java/res/xml/brave_site_settings_preferences.xml b/android/java/res/xml/brave_site_settings_preferences.xml
index 4de07afa0c9a..4625c8942b50 100644
--- a/android/java/res/xml/brave_site_settings_preferences.xml
+++ b/android/java/res/xml/brave_site_settings_preferences.xml
@@ -6,14 +6,14 @@
 
 <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.DesktopModePreferences"
+    <org.chromium.chrome.browser.site_settings.SiteSettingsPreference
+        android:fragment="org.chromium.chrome.browser.site_settings.DesktopModePreferences"
         android:key="desktop_mode_category"
         android:icon="@drawable/settings_desktop_mode"
         android:title="@string/settings_desktop_mode_title"
         app:iconTint="@color/default_icon_color" />
-    <org.chromium.chrome.browser.settings.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.settings.website.PlayYTVideoInBrowserPreferences"
+    <org.chromium.chrome.browser.site_settings.SiteSettingsPreference
+        android:fragment="org.chromium.chrome.browser.site_settings.PlayYTVideoInBrowserPreferences"
         android:key="play_yt_video_in_browser_category"
         android:icon="@drawable/settings_play_yt_video_in_browser"
         android:title="@string/settings_play_yt_video_in_browser_title"
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SiteSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SiteSettings.java.patch
deleted file mode 100644
index e33ad8be53a2..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SiteSettings.java.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SiteSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SiteSettings.java
-index 027d5e393fae30f52af40b28f0a2b506d548e59d..993a5c12edbf1fb9af60f635830d60ce2e4e2c48 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SiteSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SiteSettings.java
-@@ -27,7 +27,7 @@ import java.util.List;
-  * browser-wide.
-  */
- public class SiteSettings
--        extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener {
-+        extends BraveSiteSettingsPreferencesBase implements Preference.OnPreferenceClickListener {
-     // The keys for each category shown on the Site Settings page
-     // are defined in the SiteSettingsCategory.
- 
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-ChosenObjectSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch
similarity index 54%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-ChosenObjectSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch
index ac9b2119fd05..bf334ce5b474 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-ChosenObjectSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/ChosenObjectSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/ChosenObjectSettings.java
-index e16d673bc6901e6f7d504b0714ff8361d57df284..476e5962d1e027d65b928277c6d0db5fe3ae9334 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/ChosenObjectSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/ChosenObjectSettings.java
-@@ -36,7 +36,7 @@ import java.util.Locale;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
+index 46a8f69a21ef6ce6b914e48d32d917a0846eb5bb..d91bca6fa33ce8132d32737385a4db5a1b8fb6ec 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
+@@ -37,7 +37,7 @@ import java.util.Locale;
   * Shows a particular chosen object (e.g. a USB device) and the list of sites that have been
   * granted access to it by the user.
   */
@@ -11,8 +11,8 @@ index e16d673bc6901e6f7d504b0714ff8361d57df284..476e5962d1e027d65b928277c6d0db5f
      public static final String EXTRA_OBJECT_INFOS = "org.chromium.chrome.preferences.object_infos";
      public static final String EXTRA_SITES = "org.chromium.chrome.preferences.site_set";
      public static final String EXTRA_CATEGORY =
-@@ -134,7 +134,7 @@ public class ChosenObjectSettings extends PreferenceFragmentCompat {
-                     getString(R.string.help_context_settings), Profile.getLastUsedProfile(), null);
+@@ -136,7 +136,7 @@ public class ChosenObjectSettings extends PreferenceFragmentCompat {
+                     null);
              return true;
          }
 -        return false;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SingleCategorySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch
similarity index 62%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SingleCategorySettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch
index fdcb1729cd6c..c686b1619cca 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SingleCategorySettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
-index 2e24ca31012dac3411ba5f4edb67be73d9925552..921cbad4d8357c35f005642ca208e6e8e0b1c672 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
-@@ -73,7 +73,7 @@ import java.util.Set;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
+index 6a25cd6017790bf153781ca1be210e41824649c2..407acb17dfecb23d403e074cb63c6f1da04ecb1b 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
+@@ -75,7 +75,7 @@ import java.util.Set;
   * the websites with microphone permissions. When the user selects a site, SingleWebsiteSettings
   * is launched to allow the user to see or modify the settings for that particular website.
   */
@@ -11,7 +11,7 @@ index 2e24ca31012dac3411ba5f4edb67be73d9925552..921cbad4d8357c35f005642ca208e6e8
          implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
                     AddExceptionPreference.SiteAddedCallback, View.OnClickListener,
                     PreferenceManager.OnPreferenceTreeClickListener {
-@@ -401,7 +401,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
+@@ -408,7 +408,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
              if (queryHasChanged) getInfoForOrigins();
              return true;
          }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SingleWebsiteSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleWebsiteSettings.java.patch
similarity index 57%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SingleWebsiteSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleWebsiteSettings.java.patch
index 3add112878bb..483b4b7aa375 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-website-SingleWebsiteSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleWebsiteSettings.java.patch
@@ -1,7 +1,7 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java
-index 63e57af3ff07e712c82c10d650e50a897eeedd42..7c40ef42d4ed00c0e9b17a4d88a9cbdae6e79e33 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleWebsiteSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleWebsiteSettings.java
+index a02b573ff6c24e48e6e949367b79380355876f92..77cd997bd4d82d1d82eb2d2bfdcdbc666e20ade3 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleWebsiteSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleWebsiteSettings.java
 @@ -46,7 +46,7 @@ import java.util.Set;
  /**
   * Shows the permissions and other settings for a particular website.
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettings.java.patch
new file mode 100644
index 000000000000..b0e875eb181e
--- /dev/null
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettings.java.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java
+index c5b727493d132dac5102d10b14fa92940fb9e43c..a6475c8669456eab83a77474bef2ec1717bf8978 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java
+@@ -28,7 +28,7 @@ import java.util.List;
+  * browser-wide.
+  */
+ public class SiteSettings
+-        extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener {
++        extends BraveSiteSettingsPreferencesBase implements Preference.OnPreferenceClickListener {
+     // The keys for each category shown on the Site Settings page
+     // are defined in the SiteSettingsCategory.
+ 

From c019663df2131a23f5f558ea365d37193f8e8aa8 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 31 Mar 2020 12:55:26 -0400
Subject: [PATCH 019/161] PermissionManager moved to //components.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/6b73c7497419485f3c9c01a620a8ad9c3621b60d

commit 6b73c7497419485f3c9c01a620a8ad9c3621b60d
Author: Clark DuVall <cduvall@chromium.org>
Date:   Wed Mar 11 19:00:15 2020 +0000

    Move PermissionManager to //components/permissions

    The PermissionManagerFactory is kept in //chrome, and an equivalent will
    be added in //weblayer to initialize permission contexts. The map of
    permission contexts are now injected into the constructor of
    PermissionManager.

    Some unit tests were kept in //chrome which relate to chrome-specific
    logic in GetCanonicalOrigin().

    Bug: 1025609
---
 browser/BUILD.gn                              |  1 -
 browser/permissions/BUILD.gn                  | 14 -------
 .../permissions/brave_permission_manager.cc   | 17 --------
 .../permissions/brave_permission_manager.h    | 18 --------
 .../brave_permission_manager_factory.cc       | 34 ---------------
 .../brave_permission_manager_factory.h        | 28 -------------
 .../notifier_state_tracker_factory.cc         |  2 -
 .../browser/permissions/permission_manager.cc | 31 --------------
 .../permissions/permission_manager_factory.cc | 42 +++++++++++++++++++
 .../permissions/permission_manager_factory.h  | 19 +++++++++
 .../profiles/off_the_record_profile_impl.cc   |  2 -
 .../chrome/browser/profiles/profile_impl.cc   |  2 -
 .../push_messaging_service_factory.cc         |  2 -
 .../permissions/permission_manager.cc         | 11 +++++
 ...er-permissions-permission_manager.cc.patch | 21 ----------
 ...ser-permissions-permission_manager.h.patch | 12 ------
 ...issions-permission_manager_factory.h.patch | 12 ------
 ...ts-permissions-permission_manager.cc.patch | 12 ++++++
 18 files changed, 84 insertions(+), 196 deletions(-)
 delete mode 100644 browser/permissions/BUILD.gn
 delete mode 100644 browser/permissions/brave_permission_manager.cc
 delete mode 100644 browser/permissions/brave_permission_manager.h
 delete mode 100644 browser/permissions/brave_permission_manager_factory.cc
 delete mode 100644 browser/permissions/brave_permission_manager_factory.h
 delete mode 100644 chromium_src/chrome/browser/notifications/notifier_state_tracker_factory.cc
 delete mode 100644 chromium_src/chrome/browser/permissions/permission_manager.cc
 create mode 100644 chromium_src/chrome/browser/permissions/permission_manager_factory.cc
 create mode 100644 chromium_src/chrome/browser/permissions/permission_manager_factory.h
 delete mode 100644 chromium_src/chrome/browser/profiles/off_the_record_profile_impl.cc
 delete mode 100644 chromium_src/chrome/browser/push_messaging/push_messaging_service_factory.cc
 create mode 100644 chromium_src/components/permissions/permission_manager.cc
 delete mode 100644 patches/chrome-browser-permissions-permission_manager.cc.patch
 delete mode 100644 patches/chrome-browser-permissions-permission_manager.h.patch
 delete mode 100644 patches/chrome-browser-permissions-permission_manager_factory.h.patch
 create mode 100644 patches/components-permissions-permission_manager.cc.patch

diff --git a/browser/BUILD.gn b/browser/BUILD.gn
index 600f14ec80a6..e86f294eceac 100644
--- a/browser/BUILD.gn
+++ b/browser/BUILD.gn
@@ -116,7 +116,6 @@ source_set("browser_process") {
     "content_settings",
     "download",
     "net",
-    "permissions",
     "profiles",
     "renderer_context_menu",
     "ui",
diff --git a/browser/permissions/BUILD.gn b/browser/permissions/BUILD.gn
deleted file mode 100644
index dbf9e0e7a8e7..000000000000
--- a/browser/permissions/BUILD.gn
+++ /dev/null
@@ -1,14 +0,0 @@
-import("//build/config/features.gni")
-
-source_set("permissions") {
-  sources = [
-    "brave_permission_manager.cc",
-    "brave_permission_manager.h",
-    "brave_permission_manager_factory.cc",
-    "brave_permission_manager_factory.h",
-  ]
-
-  deps = [
-    "//content/public/browser",
-  ]
-}
diff --git a/browser/permissions/brave_permission_manager.cc b/browser/permissions/brave_permission_manager.cc
deleted file mode 100644
index 4eb5f917182b..000000000000
--- a/browser/permissions/brave_permission_manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/browser/permissions/brave_permission_manager.h"
-
-#include <memory>
-
-#include "brave/browser/autoplay/autoplay_permission_context.h"
-#include "components/content_settings/core/common/content_settings_types.h"
-
-BravePermissionManager::BravePermissionManager(Profile* profile)
-  : PermissionManager(profile) {
-  permission_contexts_[ContentSettingsType::AUTOPLAY] =
-      std::make_unique<AutoplayPermissionContext>(profile);
-}
diff --git a/browser/permissions/brave_permission_manager.h b/browser/permissions/brave_permission_manager.h
deleted file mode 100644
index f6990690085f..000000000000
--- a/browser/permissions/brave_permission_manager.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_H_
-#define BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_H_
-
-#include "chrome/browser/permissions/permission_manager.h"
-
-class BravePermissionManager : public PermissionManager {
- public:
-  explicit BravePermissionManager(Profile* profile);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(BravePermissionManager);
-};
-
-#endif // BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_H_
diff --git a/browser/permissions/brave_permission_manager_factory.cc b/browser/permissions/brave_permission_manager_factory.cc
deleted file mode 100644
index f84e491fcab9..000000000000
--- a/browser/permissions/brave_permission_manager_factory.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/browser/permissions/brave_permission_manager_factory.h"
-
-#include "brave/browser/permissions/brave_permission_manager.h"
-#include "chrome/browser/permissions/permission_manager.h"
-#include "chrome/browser/permissions/permission_manager.h"
-#include "chrome/browser/profiles/profile.h"
-
-// static
-PermissionManager*
-BravePermissionManagerFactory::GetForProfile(Profile* profile) {
-  return static_cast<PermissionManager*>(
-      GetInstance()->GetServiceForBrowserContext(profile, true));
-}
-
-// static
-BravePermissionManagerFactory* BravePermissionManagerFactory::GetInstance() {
-  return base::Singleton<BravePermissionManagerFactory>::get();
-}
-
-BravePermissionManagerFactory::BravePermissionManagerFactory()
-    : PermissionManagerFactory() {
-}
-
-BravePermissionManagerFactory::~BravePermissionManagerFactory() {
-}
-
-KeyedService* BravePermissionManagerFactory::BuildServiceInstanceFor(
-    content::BrowserContext* context) const {
-  return new BravePermissionManager(Profile::FromBrowserContext(context));
-}
diff --git a/browser/permissions/brave_permission_manager_factory.h b/browser/permissions/brave_permission_manager_factory.h
deleted file mode 100644
index 53e7092be569..000000000000
--- a/browser/permissions/brave_permission_manager_factory.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_FACTORR_H_
-#define BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_FACTORR_H_
-
-#include "chrome/browser/permissions/permission_manager_factory.h"
-
-class BravePermissionManagerFactory : public PermissionManagerFactory {
- public:
-  static PermissionManager* GetForProfile(Profile* profile);
-  static BravePermissionManagerFactory* GetInstance();
-
- private:
-  friend struct base::DefaultSingletonTraits<BravePermissionManagerFactory>;
-
-  BravePermissionManagerFactory();
-  ~BravePermissionManagerFactory() override;
-
-  // BrowserContextKeyedBaseFactory methods:
-  KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* profile) const override;
-
-  DISALLOW_COPY_AND_ASSIGN(BravePermissionManagerFactory);
-};
-
-#endif // BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_FACTORR_H_
diff --git a/chromium_src/chrome/browser/notifications/notifier_state_tracker_factory.cc b/chromium_src/chrome/browser/notifications/notifier_state_tracker_factory.cc
deleted file mode 100644
index 1223e159d4ff..000000000000
--- a/chromium_src/chrome/browser/notifications/notifier_state_tracker_factory.cc
+++ /dev/null
@@ -1,2 +0,0 @@
-#define PermissionManagerFactory BravePermissionManagerFactory
-#include "../../../../../../chrome/browser/notifications/notifier_state_tracker_factory.cc"
diff --git a/chromium_src/chrome/browser/permissions/permission_manager.cc b/chromium_src/chrome/browser/permissions/permission_manager.cc
deleted file mode 100644
index 7c142efb2097..000000000000
--- a/chromium_src/chrome/browser/permissions/permission_manager.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/browser/autoplay/autoplay_permission_context.h"
-#include "brave/browser/geolocation/brave_geolocation_permission_context.h"
-#include "components/content_settings/core/common/content_settings.h"
-#include "components/content_settings/core/common/content_settings_types.h"
-#include "content/public/browser/permission_type.h"
-
-using content::PermissionType;
-
-namespace {
-
-ContentSettingsType PermissionTypeToContentSettingSafe_ChromiumImpl(
-    PermissionType permission);
-
-ContentSettingsType PermissionTypeToContentSettingSafe(
-    PermissionType permission) {
-  if (permission == PermissionType::AUTOPLAY)
-    return ContentSettingsType::AUTOPLAY;
-  return PermissionTypeToContentSettingSafe_ChromiumImpl(permission);
-}
-
-}  // namespace
-
-#define GeolocationPermissionContext BraveGeolocationPermissionContext
-#define PermissionManagerFactory BravePermissionManagerFactory
-#include "../../../../../chrome/browser/permissions/permission_manager.cc"
-#undef GeolocationPermissionContext
diff --git a/chromium_src/chrome/browser/permissions/permission_manager_factory.cc b/chromium_src/chrome/browser/permissions/permission_manager_factory.cc
new file mode 100644
index 000000000000..423f5dc8b1f1
--- /dev/null
+++ b/chromium_src/chrome/browser/permissions/permission_manager_factory.cc
@@ -0,0 +1,42 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "chrome/browser/permissions/permission_manager_factory.h"
+
+#include <memory>
+
+#include "brave/browser/autoplay/autoplay_permission_context.h"
+#include "brave/browser/geolocation/brave_geolocation_permission_context.h"
+#include "components/content_settings/core/common/content_settings_types.h"
+
+namespace {
+
+// Forward declaration.
+permissions::PermissionManager::PermissionContextMap CreatePermissionContexts(
+    Profile* profile);
+
+permissions::PermissionManager::PermissionContextMap
+BraveCreatePermissionContexts(Profile* profile) {
+  permissions::PermissionManager::PermissionContextMap permission_contexts =
+      CreatePermissionContexts(profile);
+  permission_contexts[ContentSettingsType::AUTOPLAY] =
+      std::make_unique<AutoplayPermissionContext>(profile);
+  return permission_contexts;
+}
+
+}  // namespace
+
+#define BuildServiceInstanceFor BuildServiceInstanceFor_ChromiumImpl
+#define GeolocationPermissionContext BraveGeolocationPermissionContext
+#include "../../../../../chrome/browser/permissions/permission_manager_factory.cc"
+#undef GeolocationPermissionContext
+#undef BuildServiceInstanceFor
+
+KeyedService* PermissionManagerFactory::BuildServiceInstanceFor(
+    content::BrowserContext* context) const {
+  Profile* profile = Profile::FromBrowserContext(context);
+  return new permissions::PermissionManager(
+      profile, BraveCreatePermissionContexts(profile));
+}
diff --git a/chromium_src/chrome/browser/permissions/permission_manager_factory.h b/chromium_src/chrome/browser/permissions/permission_manager_factory.h
new file mode 100644
index 000000000000..b8f75a310736
--- /dev/null
+++ b/chromium_src/chrome/browser/permissions/permission_manager_factory.h
@@ -0,0 +1,19 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_FACTORY_H_
+#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_FACTORY_H_
+
+#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
+
+#define BuildServiceInstanceFor                                           \
+  BuildServiceInstanceFor_ChromiumImpl(content::BrowserContext* profile)  \
+      const;                                                              \
+  KeyedService* BuildServiceInstanceFor
+
+#include "../../../../../chrome/browser/permissions/permission_manager_factory.h"
+#undef BuildServiceInstanceFor
+
+#endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_FACTORY_H_
diff --git a/chromium_src/chrome/browser/profiles/off_the_record_profile_impl.cc b/chromium_src/chrome/browser/profiles/off_the_record_profile_impl.cc
deleted file mode 100644
index 1a5a1353460c..000000000000
--- a/chromium_src/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ /dev/null
@@ -1,2 +0,0 @@
-#define PermissionManagerFactory BravePermissionManagerFactory
-#include "../../../../../../chrome/browser/profiles/off_the_record_profile_impl.cc"
diff --git a/chromium_src/chrome/browser/profiles/profile_impl.cc b/chromium_src/chrome/browser/profiles/profile_impl.cc
index f4159d6cc4ea..7f068a67996d 100644
--- a/chromium_src/chrome/browser/profiles/profile_impl.cc
+++ b/chromium_src/chrome/browser/profiles/profile_impl.cc
@@ -6,7 +6,5 @@
 #include "brave/browser/profiles/brave_bookmark_model_loaded_observer.h"
 #include "brave/browser/profiles/brave_profile_impl.h"
 #define BookmarkModelLoadedObserver BraveBookmarkModelLoadedObserver
-#define PermissionManagerFactory BravePermissionManagerFactory
 #include "../../../../../chrome/browser/profiles/profile_impl.cc"
-#undef PermissionManagerFactory
 #undef BookmarkModelLoadedObserver
diff --git a/chromium_src/chrome/browser/push_messaging/push_messaging_service_factory.cc b/chromium_src/chrome/browser/push_messaging/push_messaging_service_factory.cc
deleted file mode 100644
index 8bec7abf7375..000000000000
--- a/chromium_src/chrome/browser/push_messaging/push_messaging_service_factory.cc
+++ /dev/null
@@ -1,2 +0,0 @@
-#define PermissionManagerFactory BravePermissionManagerFactory
-#include "../../../../../../chrome/browser/push_messaging/push_messaging_service_factory.cc"
diff --git a/chromium_src/components/permissions/permission_manager.cc b/chromium_src/components/permissions/permission_manager.cc
new file mode 100644
index 000000000000..ed32ee3cb415
--- /dev/null
+++ b/chromium_src/components/permissions/permission_manager.cc
@@ -0,0 +1,11 @@
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#define BRAVE_PERMISSION_MANAGER_PERMISSION_TYPE_TO_CONTENT_SETTING_SAFE \
+  case PermissionType::AUTOPLAY:                                         \
+    return ContentSettingsType::AUTOPLAY;
+
+#include "../../../../components/permissions/permission_manager.cc"
+#undef BRAVE_PERMISSION_MANAGER_PERMISSION_TYPE_TO_CONTENT_SETTING_SAFE
diff --git a/patches/chrome-browser-permissions-permission_manager.cc.patch b/patches/chrome-browser-permissions-permission_manager.cc.patch
deleted file mode 100644
index 1dd68abe32db..000000000000
--- a/patches/chrome-browser-permissions-permission_manager.cc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
-index 2a0e9282adbefc9c9ba32e459013ee0fbaec8b35..5d14c8243952f41d23f997b31b00c8d25ec34edb 100644
---- a/chrome/browser/permissions/permission_manager.cc
-+++ b/chrome/browser/permissions/permission_manager.cc
-@@ -109,7 +109,7 @@ ContentSetting PermissionStatusToContentSetting(PermissionStatus status) {
- // Helper method to convert PermissionType to ContentSettingType.
- // If PermissionType is not supported or found, returns
- // ContentSettingsType::DEFAULT.
--ContentSettingsType PermissionTypeToContentSettingSafe(
-+ContentSettingsType PermissionTypeToContentSettingSafe_ChromiumImpl(
-     PermissionType permission) {
-   switch (permission) {
-     case PermissionType::MIDI:
-@@ -163,6 +163,7 @@ ContentSettingsType PermissionTypeToContentSettingSafe(
-     case PermissionType::AR:
-       return ContentSettingsType::AR;
-     case PermissionType::NUM:
-+    default:
-       break;
-   }
- 
diff --git a/patches/chrome-browser-permissions-permission_manager.h.patch b/patches/chrome-browser-permissions-permission_manager.h.patch
deleted file mode 100644
index 18a63590ea72..000000000000
--- a/patches/chrome-browser-permissions-permission_manager.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
-index 5d7be3ba11e7850feb260ba31c414ac143f5fa68..c6674d6c043bdcf50f364c5a8aafc14336765d9c 100644
---- a/chrome/browser/permissions/permission_manager.h
-+++ b/chrome/browser/permissions/permission_manager.h
-@@ -134,6 +134,7 @@ class PermissionManager : public KeyedService,
-   void Shutdown() override;
- 
-  private:
-+  friend class BravePermissionManager;
-   friend class PermissionManagerTest;
-   friend class GeolocationPermissionContextTests;
-   friend class NfcPermissionContextTests;
diff --git a/patches/chrome-browser-permissions-permission_manager_factory.h.patch b/patches/chrome-browser-permissions-permission_manager_factory.h.patch
deleted file mode 100644
index 804f987fdc1f..000000000000
--- a/patches/chrome-browser-permissions-permission_manager_factory.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/chrome/browser/permissions/permission_manager_factory.h b/chrome/browser/permissions/permission_manager_factory.h
-index 8b25b70cde3e79d803ddfed253076aa2551c2507..54ec1db8d222b6295f225ae6393853152f8dde46 100644
---- a/chrome/browser/permissions/permission_manager_factory.h
-+++ b/chrome/browser/permissions/permission_manager_factory.h
-@@ -23,6 +23,7 @@ class PermissionManagerFactory : public BrowserContextKeyedServiceFactory {
- 
-  private:
-   friend struct base::DefaultSingletonTraits<PermissionManagerFactory>;
-+  friend class BravePermissionManagerFactory;
- 
-   PermissionManagerFactory();
-   ~PermissionManagerFactory() override;
diff --git a/patches/components-permissions-permission_manager.cc.patch b/patches/components-permissions-permission_manager.cc.patch
new file mode 100644
index 000000000000..dce66688184c
--- /dev/null
+++ b/patches/components-permissions-permission_manager.cc.patch
@@ -0,0 +1,12 @@
+diff --git a/components/permissions/permission_manager.cc b/components/permissions/permission_manager.cc
+index 0cc63be36ceecf3d2661708d1dda55f8d6f160b4..f0a3374bd3aa80f9da255a332b90649140957e19 100644
+--- a/components/permissions/permission_manager.cc
++++ b/components/permissions/permission_manager.cc
+@@ -124,6 +124,7 @@ ContentSettingsType PermissionTypeToContentSettingSafe(
+       return ContentSettingsType::AR;
+     case PermissionType::STORAGE_ACCESS_GRANT:
+       return ContentSettingsType::STORAGE_ACCESS;
++      BRAVE_PERMISSION_MANAGER_PERMISSION_TYPE_TO_CONTENT_SETTING_SAFE
+     case PermissionType::NUM:
+       break;
+   }

From 839df438a35e1bcbb8caef508d9099ce0809b079 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 31 Mar 2020 16:15:04 -0400
Subject: [PATCH 020/161] PermissionRequestImpl moved to //components.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/217fad8a27109428a373d61dac32e316e41c0e21

commit 217fad8a27109428a373d61dac32e316e41c0e21
Author: Clark DuVall <cduvall@chromium.org>
Date:   Wed Feb 19 19:58:00 2020 +0000

    Move PermissionRequestImpl to //components/permissions

    This required moving all the strings and icons that are referenced in
    PermissionRequestImpl as well. kProductIcon which is used for the
    PROTECTED_MEDIA_IDENTIFIER on ChromeOS was left in //chrome since
    kProductIcon is different depending on chrome branding.

    The IDR_* resources used on Android were moved in a way that still works
    with chrome's ResourceMapper. WebLayer will need a similar system to
    map the native IDR_* constants to Android drawable resources.

    Bug: 1025609
---
 app/brave_generated_resources.grd             |  3 ---
 .../permissions/permission_request_impl.cc    | 12 +++++++---
 .../permissions/permission_request_impl.h     | 23 +++++++++++++++++++
 .../resources/brave_components_strings.grd    |  5 +++-
 ...ermissions-permission_request_impl.h.patch | 20 ----------------
 ...ettings_agent_impl_autoplay_browsertest.cc |  8 +++----
 ...t_settings_agent_impl_flash_browsertest.cc |  7 +++---
 7 files changed, 44 insertions(+), 34 deletions(-)
 rename chromium_src/{chrome/browser => components}/permissions/permission_request_impl.cc (76%)
 create mode 100644 chromium_src/components/permissions/permission_request_impl.h
 delete mode 100644 patches/chrome-browser-permissions-permission_request_impl.h.patch

diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
index f1ab82d5dc99..8be5c5405f4b 100644
--- a/app/brave_generated_resources.grd
+++ b/app/brave_generated_resources.grd
@@ -206,9 +206,6 @@
 By installing this extension, you are agreeing to the Google Widevine Terms of Use. You agree that Brave is not responsible for any damages or losses in connection with your use of Google Widevine.
       </message>
       <!-- Autoplay -->
-      <message name="IDS_AUTOPLAY_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to autoplay media. Follows a prompt: 'This site would like to:'">
-        Autoplay media
-      </message>
       <message name="IDS_SETTINGS_SITE_SETTINGS_AUTOPLAY" desc="Label for autoplay site settings.">
         Autoplay
       </message>
diff --git a/chromium_src/chrome/browser/permissions/permission_request_impl.cc b/chromium_src/components/permissions/permission_request_impl.cc
similarity index 76%
rename from chromium_src/chrome/browser/permissions/permission_request_impl.cc
rename to chromium_src/components/permissions/permission_request_impl.cc
index 7d86f45d597c..306c96da6710 100644
--- a/chromium_src/chrome/browser/permissions/permission_request_impl.cc
+++ b/chromium_src/components/permissions/permission_request_impl.cc
@@ -3,15 +3,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "chrome/browser/permissions/permission_request_impl.h"
+#include "components/permissions/permission_request_impl.h"
+
+#include "components/grit/brave_components_strings.h"
 
 #define GetIconId GetIconId_ChromiumImpl
 #define GetMessageTextFragment GetMessageTextFragment_ChromiumImpl
-#include "../../../../../chrome/browser/permissions/permission_request_impl.cc"
+#include "../../../../components/permissions/permission_request_impl.cc"
 #undef GetMessageTextFragment
 #undef GetIconId
 
-permissions::PermissionRequest::IconId PermissionRequestImpl::GetIconId()
+namespace permissions {
+
+PermissionRequest::IconId PermissionRequestImpl::GetIconId()
     const {
 #if !defined(OS_ANDROID)
   switch (content_settings_type_) {
@@ -35,3 +39,5 @@ base::string16 PermissionRequestImpl::GetMessageTextFragment() const {
   }
   return l10n_util::GetStringUTF16(message_id);
 }
+
+}  // namespace permissions
diff --git a/chromium_src/components/permissions/permission_request_impl.h b/chromium_src/components/permissions/permission_request_impl.h
new file mode 100644
index 000000000000..878cf5af4538
--- /dev/null
+++ b/chromium_src/components/permissions/permission_request_impl.h
@@ -0,0 +1,23 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_PERMISSION_REQUEST_IMPL_H_
+#define BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_PERMISSION_REQUEST_IMPL_H_
+
+#include "components/permissions/permission_request.h"
+
+#define GetIconId                 \
+  GetIconId_ChromiumImpl() const; \
+  IconId GetIconId
+
+#define GetMessageTextFragment                 \
+  GetMessageTextFragment_ChromiumImpl() const; \
+  base::string16 GetMessageTextFragment
+
+#include "../../../../components/permissions/permission_request_impl.h"
+#undef GetMessageTextFragment
+#undef GetIconId
+
+#endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_PERMISSION_REQUEST_IMPL_H_
diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
index 7ad3c14bbb0e..cdde9f1c25b0 100644
--- a/components/resources/brave_components_strings.grd
+++ b/components/resources/brave_components_strings.grd
@@ -905,7 +905,10 @@
       <message name="IDS_BRAVE_WALLET_DISCLOSURE_FOUR" desc="">So if you were looking to support your favorite sites, head over there instead.</message>
       <message name="IDS_BRAVE_WALLET_BRAVE_REWARDS" desc="">Brave Rewards</message>
       <message name="IDS_BRAVE_WALLET_DISCLOSURE_CONFIRM" desc="">I understand</message>
-
+      <!-- Permissions -->
+      <message name="IDS_AUTOPLAY_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to autoplay media. Follows a prompt: 'This site would like to:'">
+        Autoplay media
+      </message>
       <part file="speedreader_strings.grdp" />
     </messages>
   </release>
diff --git a/patches/chrome-browser-permissions-permission_request_impl.h.patch b/patches/chrome-browser-permissions-permission_request_impl.h.patch
deleted file mode 100644
index 47f8164b3c95..000000000000
--- a/patches/chrome-browser-permissions-permission_request_impl.h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/chrome/browser/permissions/permission_request_impl.h b/chrome/browser/permissions/permission_request_impl.h
-index fcc7808f431775ec1248894b43b9ce5eeff424a1..e873f3e7e0a117650c31429a61674ec5bf8f0206 100644
---- a/chrome/browser/permissions/permission_request_impl.h
-+++ b/chrome/browser/permissions/permission_request_impl.h
-@@ -32,6 +32,7 @@ class PermissionRequestImpl : public permissions::PermissionRequest {
-  private:
-   // permissions::PermissionRequest:
-   IconId GetIconId() const override;
-+  IconId GetIconId_ChromiumImpl() const;
- #if defined(OS_ANDROID)
-   base::string16 GetTitleText() const override;
-   base::string16 GetMessageText() const override;
-@@ -39,6 +40,7 @@ class PermissionRequestImpl : public permissions::PermissionRequest {
-   base::string16 GetQuietMessageText() const override;
- #endif
-   base::string16 GetMessageTextFragment() const override;
-+  base::string16 GetMessageTextFragment_ChromiumImpl() const;
-   GURL GetOrigin() const override;
-   void PermissionGranted() override;
-   void PermissionDenied() override;
diff --git a/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc b/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
index 29fa34b0057c..1b79d4f7b392 100644
--- a/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
+++ b/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
@@ -105,8 +105,8 @@ class BraveContentSettingsAgentImplAutoplayTest : public InProcessBrowserTest {
 IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplAutoplayTest,
                        AllowAutoplay) {
   std::string result;
-  PermissionRequestManager* manager = PermissionRequestManager::FromWebContents(
-      contents());
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(contents());
   auto popup_prompt_factory =
       std::make_unique<MockPermissionPromptFactory>(manager);
 
@@ -129,8 +129,8 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplAutoplayTest,
                        BlockAutoplay) {
   std::string result;
   BlockAutoplay();
-  PermissionRequestManager* manager = PermissionRequestManager::FromWebContents(
-      contents());
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(contents());
   auto popup_prompt_factory =
       std::make_unique<MockPermissionPromptFactory>(manager);
 
diff --git a/renderer/brave_content_settings_agent_impl_flash_browsertest.cc b/renderer/brave_content_settings_agent_impl_flash_browsertest.cc
index a7f80429e730..dcc0bedb8904 100644
--- a/renderer/brave_content_settings_agent_impl_flash_browsertest.cc
+++ b/renderer/brave_content_settings_agent_impl_flash_browsertest.cc
@@ -153,14 +153,15 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplFlashBrowserTest,
       kFlashPluginExists, &len));
   ASSERT_EQ(len, 0);
 
-  PermissionRequestManager* manager = PermissionRequestManager::FromWebContents(
-      contents());
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(contents());
 
   auto popup_prompt_factory =
       std::make_unique<MockPermissionPromptFactory>(manager);
 
   EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount());
-  popup_prompt_factory->set_response_type(PermissionRequestManager::ACCEPT_ALL);
+  popup_prompt_factory->set_response_type(
+      permissions::PermissionRequestManager::ACCEPT_ALL);
 
   PageReloadWaiter reload_waiter(contents());
 

From 3b2abfd3a1cb88aae65be30c01480b537cb153d3 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 31 Mar 2020 17:43:11 -0400
Subject: [PATCH 021/161] PermissionUmaUtil moved to //components.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/38189ee95375d6692a8fdb43f349a6ce4cd764f6

commit 38189ee95375d6692a8fdb43f349a6ce4cd764f6
Author: Clark DuVall <cduvall@chromium.org>
Date:   Fri Feb 14 02:30:28 2020 +0000

    Move PermissionUmaUtil to //components/permissions

    This also introduces PermissionsClient, which allows code in
    //components/permissions to call embedder specific logic.

    Bug: 1025609
---
 .../permissions/permission_uma_util.cc        | 22 ++++++++++---------
 ...r-permissions-permission_uma_util.cc.patch | 21 ------------------
 ...s-permissions-permission_uma_util.cc.patch | 21 ++++++++++++++++++
 3 files changed, 33 insertions(+), 31 deletions(-)
 rename chromium_src/{chrome/browser => components}/permissions/permission_uma_util.cc (70%)
 delete mode 100644 patches/chrome-browser-permissions-permission_uma_util.cc.patch
 create mode 100644 patches/components-permissions-permission_uma_util.cc.patch

diff --git a/chromium_src/chrome/browser/permissions/permission_uma_util.cc b/chromium_src/components/permissions/permission_uma_util.cc
similarity index 70%
rename from chromium_src/chrome/browser/permissions/permission_uma_util.cc
rename to chromium_src/components/permissions/permission_uma_util.cc
index 18e1bc19a15b..d42ec6828052 100644
--- a/chromium_src/chrome/browser/permissions/permission_uma_util.cc
+++ b/chromium_src/components/permissions/permission_uma_util.cc
@@ -8,40 +8,41 @@
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/permissions/permission_request.h"
 
+namespace permissions {
 namespace {
 
-std::string GetPermissionRequestString_ChromiumImpl(
-    permissions::PermissionRequestType type);
+std::string GetPermissionRequestString_ChromiumImpl(PermissionRequestType type);
 void BraveRecordPermissionAction(ContentSettingsType permission,
                                  bool secure_origin,
-                                 permissions::PermissionAction action);
+                                 PermissionAction action);
 
-std::string GetPermissionRequestString(
-    permissions::PermissionRequestType type) {
-  if (type == permissions::PermissionRequestType::PERMISSION_AUTOPLAY)
+std::string GetPermissionRequestString(PermissionRequestType type) {
+  if (type == PermissionRequestType::PERMISSION_AUTOPLAY)
     return "Autoplay";
-  if (type == permissions::PermissionRequestType::PERMISSION_WIDEVINE)
+  if (type == PermissionRequestType::PERMISSION_WIDEVINE)
     return "Widevine";
-  if (type == permissions::PermissionRequestType::PERMISSION_WALLET)
+  if (type == PermissionRequestType::PERMISSION_WALLET)
     return "Wallet";
   return GetPermissionRequestString_ChromiumImpl(type);
 }
 
 }  // namespace
+}  // namespace permissions
 
 #define BRAVE_PERMISSIONUMAUTIL_RECORDPERMISSIONACTION              \
   case ContentSettingsType::AUTOPLAY:                               \
     BraveRecordPermissionAction(permission, secure_origin, action); \
     break; \
 
-#include "../../../../../chrome/browser/permissions/permission_uma_util.cc"  // NOLINT
+#include "../../../../components/permissions/permission_uma_util.cc"
 #undef BRAVE_PERMISSIONUMAUTIL_RECORDPERMISSIONACTION
 
+namespace permissions {
 namespace {
 
 void BraveRecordPermissionAction(ContentSettingsType permission,
                                  bool secure_origin,
-                                 permissions::PermissionAction action) {
+                                 PermissionAction action) {
   switch (permission) {
     case ContentSettingsType::AUTOPLAY:
       PERMISSION_ACTION_UMA(secure_origin, "Permissions.Action.Autoplay",
@@ -55,3 +56,4 @@ void BraveRecordPermissionAction(ContentSettingsType permission,
 }
 
 }  // namespace
+}  // namespace permissions
diff --git a/patches/chrome-browser-permissions-permission_uma_util.cc.patch b/patches/chrome-browser-permissions-permission_uma_util.cc.patch
deleted file mode 100644
index 41ffb053ba17..000000000000
--- a/patches/chrome-browser-permissions-permission_uma_util.cc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/chrome/browser/permissions/permission_uma_util.cc b/chrome/browser/permissions/permission_uma_util.cc
-index 4b2611474c21b737c8a2103c0b9b97cd0d116b38..5d939ae75eda03961eedc13a0628f753bbf6a9d0 100644
---- a/chrome/browser/permissions/permission_uma_util.cc
-+++ b/chrome/browser/permissions/permission_uma_util.cc
-@@ -68,7 +68,7 @@ namespace {
- 
- const int kPriorCountCap = 10;
- 
--std::string GetPermissionRequestString(
-+std::string GetPermissionRequestString_ChromiumImpl(
-     permissions::PermissionRequestType type) {
-   switch (type) {
-     case permissions::PermissionRequestType::MULTIPLE:
-@@ -574,6 +574,7 @@ void PermissionUmaUtil::RecordPermissionAction(
-       base::UmaHistogramEnumeration("Permissions.Action.AR", action,
-                                     permissions::PermissionAction::NUM);
-       break;
-+    BRAVE_PERMISSIONUMAUTIL_RECORDPERMISSIONACTION
-     // The user is not prompted for these permissions, thus there is no
-     // permission action recorded for them.
-     default:
diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch
new file mode 100644
index 000000000000..1fde96b8fcae
--- /dev/null
+++ b/patches/components-permissions-permission_uma_util.cc.patch
@@ -0,0 +1,21 @@
+diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc
+index 6388d4e0cf1f5c8b8f2545b5410adc93855e1ac4..dba8a04488e7f8ba162a2fc704a1c7ce03bf8625 100644
+--- a/components/permissions/permission_uma_util.cc
++++ b/components/permissions/permission_uma_util.cc
+@@ -63,7 +63,7 @@ namespace {
+ 
+ const int kPriorCountCap = 10;
+ 
+-std::string GetPermissionRequestString(PermissionRequestType type) {
++std::string GetPermissionRequestString_ChromiumImpl(PermissionRequestType type) {
+   switch (type) {
+     case PermissionRequestType::MULTIPLE:
+       return "AudioAndVideoCapture";
+@@ -552,6 +552,7 @@ void PermissionUmaUtil::RecordPermissionAction(
+       base::UmaHistogramEnumeration("Permissions.Action.StorageAccess", action,
+                                     PermissionAction::NUM);
+       break;
++    BRAVE_PERMISSIONUMAUTIL_RECORDPERMISSIONACTION
+     // The user is not prompted for these permissions, thus there is no
+     // permission action recorded for them.
+     default:

From 51f6ba6ed0fecb8a2f844bf3bf77b82410bc3aaf Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 1 Apr 2020 10:42:30 -0400
Subject: [PATCH 022/161] Legacy invalidation code has been removed.

TODO:check if we need to patch the "new infrastructure"
(fcm_invalidation).

Chromium change:

https://chromium.googlesource.com/chromium/src/+/881c881bde8acc9d507db7bf3157b18a2790d9ef

commit 881c881bde8acc9d507db7bf3157b18a2790d9ef
Author: Marc Treib <treib@chromium.org>
Date:   Wed Feb 12 19:12:45 2020 +0000

    Cleanup: Delete legacy (Tango) invalidations code

    All invalidations clients have migrated to the new infrastructure, so
    the old implementation is now unused and can be cleaned up.

    This CL deletes *most* of the code. Still left to be done:
    - DeprecatedInvalidatorRegistrar is still used by some tests (via
      FakeInvalidationService), which should be migrated off.
    - InvalidationServiceAndroid and the corresponding Java code is still
      around.

    This reduces Android binary size by about 4kB:
    Normalized APK Size: -4184 bytes

    Bug: 1029481
---
 .../push_client_channel_unittest.cc           | 61 -------------------
 ...lidation-impl-push_client_channel.cc.patch | 20 ------
 test/BUILD.gn                                 |  1 -
 3 files changed, 82 deletions(-)
 delete mode 100644 components/invalidation/push_client_channel_unittest.cc
 delete mode 100644 patches/components-invalidation-impl-push_client_channel.cc.patch

diff --git a/components/invalidation/push_client_channel_unittest.cc b/components/invalidation/push_client_channel_unittest.cc
deleted file mode 100644
index e859ccf7f94b..000000000000
--- a/components/invalidation/push_client_channel_unittest.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <stdint.h>
-
-#include <string>
-
-#include "base/compiler_specific.h"
-#include "base/memory/ptr_util.h"
-#include "components/invalidation/impl/push_client_channel.h"
-#include "jingle/notifier/listener/fake_push_client.h"
-#include "jingle/notifier/listener/notification_defines.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace syncer {
-namespace {
-
-class PushClientChannelTest
-    : public ::testing::Test,
-      public SyncNetworkChannel::Observer {
- protected:
-  PushClientChannelTest()
-      : fake_push_client_(new notifier::FakePushClient()),
-        push_client_channel_(base::WrapUnique(fake_push_client_)) {
-    push_client_channel_.AddObserver(this);
-    push_client_channel_.SetMessageReceiver(
-        invalidation::NewPermanentCallback(
-            this, &PushClientChannelTest::OnIncomingMessage));
-    push_client_channel_.SetSystemResources(nullptr);
-  }
-
-  ~PushClientChannelTest() override {
-    push_client_channel_.RemoveObserver(this);
-  }
-
-  void OnNetworkChannelStateChanged(
-      InvalidatorState invalidator_state) override {
-    NOTREACHED();
-  }
-
-  void OnIncomingMessage(std::string incoming_message) {
-    NOTREACHED();
-  }
-
-  notifier::FakePushClient* fake_push_client_;
-  PushClientChannel push_client_channel_;
-};
-
-const char kMessage[] = "message";
-const char kServiceContext[] = "service context";
-const int64_t kSchedulingHash = 100;
-
-// Simulate an incoming notification. Nothing should happen because
-// the channel should not be listening.
-TEST_F(PushClientChannelTest, OnIncomingMessage) {
-   notifier::Notification notification;
-  notification.data =
-      PushClientChannel::EncodeMessageForTest(
-          kMessage, kServiceContext, kSchedulingHash);
-  fake_push_client_->SimulateIncomingNotification(notification);
-}
-
-}  // namespace
-}  // namespace syncer
diff --git a/patches/components-invalidation-impl-push_client_channel.cc.patch b/patches/components-invalidation-impl-push_client_channel.cc.patch
deleted file mode 100644
index 153c03776fcf..000000000000
--- a/patches/components-invalidation-impl-push_client_channel.cc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/components/invalidation/impl/push_client_channel.cc b/components/invalidation/impl/push_client_channel.cc
-index e5de7eb5c1c8fcef6970a20825780ce43bce58a5..b54988be5c4c1ec11ecd5635c01c9e0156b5514f 100644
---- a/components/invalidation/impl/push_client_channel.cc
-+++ b/components/invalidation/impl/push_client_channel.cc
-@@ -28,6 +28,7 @@ PushClientChannel::PushClientChannel(
-     : push_client_(std::move(push_client)),
-       scheduling_hash_(0),
-       sent_messages_count_(0) {
-+  return; // feature disabled in Brave
-   push_client_->AddObserver(this);
-   notifier::Subscription subscription;
-   subscription.channel = kChannelName;
-@@ -43,6 +44,7 @@ PushClientChannel::~PushClientChannel() {
- 
- void PushClientChannel::UpdateCredentials(const CoreAccountId& account_id,
-                                           const std::string& token) {
-+  return; // feature disabled in Brave
-   net::NetworkTrafficAnnotationTag traffic_annotation =
-       net::DefineNetworkTrafficAnnotation("puch_client_channel", R"(
-         semantics {
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 0b354238b4e8..53dff9fe125a 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -188,7 +188,6 @@ test("brave_unit_tests") {
       "//brave/chromium_src/chrome/browser/devtools/url_constants_unittest.cc",
       "//brave/chromium_src/chrome/browser/profiles/profile_avatar_icon_util_unittest.cc",
       "//brave/chromium_src/chrome/browser/ui/bookmarks/brave_bookmark_context_menu_controller_unittest.cc",
-      "//brave/components/invalidation/push_client_channel_unittest.cc",
       "//chrome/browser/push_messaging/push_messaging_app_identifier_unittest.cc",
       "//chrome/browser/push_messaging/push_messaging_notification_manager_unittest.cc",
       "//chrome/browser/push_messaging/push_messaging_service_unittest.cc",

From 22688b4082468a32a78ab4d6376383c3e5ce09de Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 1 Apr 2020 11:43:15 -0400
Subject: [PATCH 023/161] ProxyResolutionService ->
 ConfiguredProxyResolutionService.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/d2013f9668d0587b1042572dadc6bd2e772d3248

commit d2013f9668d0587b1042572dadc6bd2e772d3248
Author: Nicolas Arciniega <niarci@microsoft.com>
Date:   Fri Feb 7 23:00:56 2020 +0000

    Rename ProxyResolutionService to ConfiguredProxyResolutionService

    This change is the first step in creating a proxy resolver that
    completely relies on the underlying system to figure out a proxy. The
    ProxyResolutionService is currently deeply tied to the notion of first
    fetching proxy configurations (ex: a PAC URL) and then using those
    configurations to resolve a proxy. Since a proxy resolver that truly
    defers to the underlying operating system for all proxy logic does not
    follow this model, it is helpful if we separate the generic
    ProxyResolutionService from the notion of configurations.

    This change renames the existing ProxyResolutionService, which relies
    on fetching proxy configurations, to ConfiguredProxyResolutionService.
    The only other changes to this file are suggestions from presubmit and
    Tricium.

    A set of future CLs will break up the ConfiguredProxyResolutionService
    into the logical pieces needed to create a new, generic
    ProxyResolutionService that does not necessarily depend on configs.

    This change is intended to introduce zero functional changes. It is a
    pure refactor change.

    Bug: 1032820
---
 ...=> configured_proxy_resolution_service.cc} |  4 ++--
 ...ured_proxy_resolution_service_unittest.cc} | 24 ++++++++++---------
 .../proxy_config_service_tor_unittest.cc      |  9 +++----
 ...nfigured_proxy_resolution_service.cc.patch | 12 ++++++++++
 ...solution-proxy_resolution_service.cc.patch | 12 ----------
 test/BUILD.gn                                 |  2 +-
 6 files changed, 33 insertions(+), 30 deletions(-)
 rename chromium_src/net/proxy_resolution/{proxy_resolution_service.cc => configured_proxy_resolution_service.cc} (84%)
 rename net/proxy_resolution/{proxy_resolution_service_unittest.cc => configured_proxy_resolution_service_unittest.cc} (70%)
 create mode 100644 patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
 delete mode 100644 patches/net-proxy_resolution-proxy_resolution_service.cc.patch

diff --git a/chromium_src/net/proxy_resolution/proxy_resolution_service.cc b/chromium_src/net/proxy_resolution/configured_proxy_resolution_service.cc
similarity index 84%
rename from chromium_src/net/proxy_resolution/proxy_resolution_service.cc
rename to chromium_src/net/proxy_resolution/configured_proxy_resolution_service.cc
index 24eccc76853c..14057c32a737 100644
--- a/chromium_src/net/proxy_resolution/proxy_resolution_service.cc
+++ b/chromium_src/net/proxy_resolution/configured_proxy_resolution_service.cc
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "net/proxy_resolution/proxy_resolution_service.h"
+#include "net/proxy_resolution/configured_proxy_resolution_service.h"
 
 #include "brave/net/proxy_resolution/proxy_config_service_tor.h"
 
@@ -23,5 +23,5 @@ void SetTorCircuitIsolation(const ProxyConfigWithAnnotation& config,
 #define BRAVE_TRY_TO_COMPLETE_SYNCHRONOUSLY \
   SetTorCircuitIsolation(config_.value(), url, result, this);
 
-#include "../../../../net/proxy_resolution/proxy_resolution_service.cc"  // NOLINT
+#include "../../../../net/proxy_resolution/configured_proxy_resolution_service.cc"
 #undef BRAVE_TRY_TO_COMPLETE_SYNCHRONOUSLY
diff --git a/net/proxy_resolution/proxy_resolution_service_unittest.cc b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
similarity index 70%
rename from net/proxy_resolution/proxy_resolution_service_unittest.cc
rename to net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
index 3f98eece0ae5..bf5ee6903cfa 100644
--- a/net/proxy_resolution/proxy_resolution_service_unittest.cc
+++ b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "net/proxy_resolution/proxy_resolution_service.h"
+#include "net/proxy_resolution/configured_proxy_resolution_service.h"
 
 #include <string>
 
@@ -21,28 +21,30 @@ using net::test::IsOk;
 
 namespace net {
 
-class ProxyResolutionServiceTest : public TestWithTaskEnvironment {
+class ConfiguredProxyResolutionServiceTest : public TestWithTaskEnvironment {
  public:
-  ProxyResolutionServiceTest() = default;
-  ~ProxyResolutionServiceTest() override = default;
+  ConfiguredProxyResolutionServiceTest() = default;
+  ~ConfiguredProxyResolutionServiceTest() override = default;
 
   void SetUp() override {
     const std::string proxy_uri("socks5://127.0.0.1:5566");
-    service_ = std::make_unique<ProxyResolutionService>(
+    service_ = std::make_unique<ConfiguredProxyResolutionService>(
         std::make_unique<ProxyConfigServiceTor>(proxy_uri),
         std::make_unique<MockAsyncProxyResolverFactory>(false),
         nullptr);
   }
 
-  ProxyResolutionService* GetProxyResolutionService() { return service_.get(); }
+  ConfiguredProxyResolutionService* GetProxyResolutionService() {
+    return service_.get();
+  }
 
  private:
-  std::unique_ptr<ProxyResolutionService> service_;
-  DISALLOW_COPY_AND_ASSIGN(ProxyResolutionServiceTest);
+  std::unique_ptr<ConfiguredProxyResolutionService> service_;
+  DISALLOW_COPY_AND_ASSIGN(ConfiguredProxyResolutionServiceTest);
 };
 
-TEST_F(ProxyResolutionServiceTest, TorProxy) {
-  ProxyResolutionService* service = GetProxyResolutionService();
+TEST_F(ConfiguredProxyResolutionServiceTest, TorProxy) {
+  ConfiguredProxyResolutionService* service = GetProxyResolutionService();
   const GURL site_url("https://check.torproject.org/");
   const std::string isolation_key =
       ProxyConfigServiceTor::CircuitIsolationKey(site_url);
@@ -50,7 +52,7 @@ TEST_F(ProxyResolutionServiceTest, TorProxy) {
   ProxyInfo info;
   TestCompletionCallback callback;
   RecordingBoundTestNetLog log;
-  std::unique_ptr<ProxyResolutionService::Request> request;
+  std::unique_ptr<ConfiguredProxyResolutionService::Request> request;
   int rv =
       service->ResolveProxy(site_url, std::string(), NetworkIsolationKey(),
                             &info, callback.callback(), &request, log.bound());
diff --git a/net/proxy_resolution/proxy_config_service_tor_unittest.cc b/net/proxy_resolution/proxy_config_service_tor_unittest.cc
index 465337f3ebfd..0517094a25e7 100644
--- a/net/proxy_resolution/proxy_config_service_tor_unittest.cc
+++ b/net/proxy_resolution/proxy_config_service_tor_unittest.cc
@@ -11,9 +11,9 @@
 #include "base/macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/proxy_server.h"
+#include "net/proxy_resolution/configured_proxy_resolution_service.h"
 #include "net/proxy_resolution/mock_proxy_resolver.h"
 #include "net/proxy_resolution/proxy_config_with_annotation.h"
-#include "net/proxy_resolution/proxy_resolution_service.h"
 #include "net/test/test_with_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
@@ -133,10 +133,11 @@ TEST_F(ProxyConfigServiceTorTest, SetProxyAuthorization) {
   const std::string isolation_key2 =
       ProxyConfigServiceTor::CircuitIsolationKey(site_url2);
 
-  auto config_service = ProxyResolutionService::CreateSystemProxyConfigService(
-      base::ThreadTaskRunnerHandle::Get());
+  auto config_service =
+      ConfiguredProxyResolutionService::CreateSystemProxyConfigService(
+          base::ThreadTaskRunnerHandle::Get());
 
-  auto* service = new ProxyResolutionService(
+  auto* service = new ConfiguredProxyResolutionService(
         std::move(config_service),
         std::make_unique<MockAsyncProxyResolverFactory>(false),
         nullptr);
diff --git a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
new file mode 100644
index 000000000000..1f7da4facfa7
--- /dev/null
+++ b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
@@ -0,0 +1,12 @@
+diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc
+index 33f1061d0ed1d7afb0dba0184d040c083269f19f..72a51d95479b13aecaff91a323f5f74fb8635cd9 100644
+--- a/net/proxy_resolution/configured_proxy_resolution_service.cc
++++ b/net/proxy_resolution/configured_proxy_resolution_service.cc
+@@ -1048,6 +1048,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously(
+   config_->value().proxy_rules().Apply(url, result);
+   result->set_traffic_annotation(
+       MutableNetworkTrafficAnnotationTag(config_->traffic_annotation()));
++  BRAVE_TRY_TO_COMPLETE_SYNCHRONOUSLY
+ 
+   return OK;
+ }
diff --git a/patches/net-proxy_resolution-proxy_resolution_service.cc.patch b/patches/net-proxy_resolution-proxy_resolution_service.cc.patch
deleted file mode 100644
index 9b47f3af182d..000000000000
--- a/patches/net-proxy_resolution-proxy_resolution_service.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/net/proxy_resolution/proxy_resolution_service.cc b/net/proxy_resolution/proxy_resolution_service.cc
-index b960c662daf0a1235c7e726e0e56b85f62aa5b51..e305a65f6d626a68beb3314f9e37c3c7d2e03030 100644
---- a/net/proxy_resolution/proxy_resolution_service.cc
-+++ b/net/proxy_resolution/proxy_resolution_service.cc
-@@ -1229,6 +1229,7 @@ int ProxyResolutionService::TryToCompleteSynchronously(
-   config_->value().proxy_rules().Apply(url, result);
-   result->set_traffic_annotation(
-       MutableNetworkTrafficAnnotationTag(config_->traffic_annotation()));
-+  BRAVE_TRY_TO_COMPLETE_SYNCHRONOUSLY
- 
-   return OK;
- }
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 53dff9fe125a..c4110f5e5647 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -455,7 +455,7 @@ test("brave_unit_tests") {
       "//brave/common/tor/tor_test_constants.cc",
       "//brave/common/tor/tor_test_constants.h",
       "//brave/net/proxy_resolution/proxy_config_service_tor_unittest.cc",
-      "//brave/net/proxy_resolution/proxy_resolution_service_unittest.cc",
+      "//brave/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc",
     ]
 
     deps += [

From 44daacf29e3045f4c4a07cb9e8287335be99732f Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 1 Apr 2020 12:23:59 -0400
Subject: [PATCH 024/161] Removed no longer needed patch to
 chrome/android/BUILD.gn.

Upstream has added the same functionality as what we patched in.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/9b743d81599bec7fddcb6ec4a633427b63474616

commit 9b743d81599bec7fddcb6ec4a633427b63474616
Author: Nate Fischer <ntfschr@chromium.org>
Date:   Tue Feb 4 22:58:49 2020 +0000

    AW: expose chrome_public_manifest_package as GN arg

    No change to logic. This exposes chrome_public_manifest_package as a GN
    arg to support WebView developers who wish to compile
    monochrome_public_apk. This updates WebView docs to mention the new GN
    arg.

    Bug: 1048327
---
 patches/chrome-android-BUILD.gn.patch | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch
index 6f3660b5b763..95c3b145afc8 100644
--- a/patches/chrome-android-BUILD.gn.patch
+++ b/patches/chrome-android-BUILD.gn.patch
@@ -1,25 +1,16 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index dd59ffa4ffb9bd12d28e10aa64dc7dcfdabc0849..c79bb7f6cfb1704e6e9f528e85c4adda5165328c 100644
+index 9b03adc50dce38eee225deaa1ec112388f70cabd..f04a6cf15bc4929579f73c2456d6d7a867930fd5 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -35,7 +35,7 @@ import("java_sources.gni")
- import("static_initializers.gni")
- import("trichrome.gni")
- 
--chrome_public_manifest_package = "org.chromium.chrome"
-+declare_args() { chrome_public_manifest_package = "org.chromium.chrome" }
- chrome_public_test_manifest_package = "org.chromium.chrome.tests"
- 
- chrome_public_jinja_variables =
-@@ -162,6 +162,7 @@ android_resources("chrome_app_java_resources") {
-     "//third_party/android_deps:com_android_support_preference_v7_java",
-     "//third_party/android_deps:com_android_support_recyclerview_v7_java",
+@@ -196,6 +196,7 @@ android_resources("chrome_app_java_resources") {
+     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+     "//third_party/android_deps:com_android_support_design_java",
    ]
 +  deps += brave_chrome_app_java_resources_deps resource_dirs += brave_chrome_app_java_resources_dirs
    custom_package = "org.chromium.chrome"
  }
  
-@@ -377,6 +378,7 @@ android_library("chrome_java") {
+@@ -444,6 +445,7 @@ android_library("chrome_java") {
    ]
  
    deps += feed_deps
@@ -27,7 +18,7 @@ index dd59ffa4ffb9bd12d28e10aa64dc7dcfdabc0849..c79bb7f6cfb1704e6e9f528e85c4adda
  
    srcjar_deps = [
      ":chrome_android_java_enums_srcjar",
-@@ -427,6 +429,7 @@ android_library("chrome_java") {
+@@ -489,6 +491,7 @@ android_library("chrome_java") {
      "//content/public/browser:contacts_picker_properties_requested_javagen",
      "//net:effective_connection_type_java",
    ]
@@ -35,15 +26,15 @@ index dd59ffa4ffb9bd12d28e10aa64dc7dcfdabc0849..c79bb7f6cfb1704e6e9f528e85c4adda
  
    android_manifest_for_lint = chrome_public_android_manifest
  
-@@ -532,6 +535,7 @@ group("jni_headers") {
-     "//chrome/browser/touch_to_fill/android:jni_headers",
+@@ -596,6 +599,7 @@ group("jni_headers") {
+     "//chrome/browser/ui/android/favicon:jni_headers",
      "//chrome/browser/util:jni_headers",
    ]
 +  public_deps += ["//brave/build/android:jni_headers"]
  }
  
  action("chrome_android_java_google_api_keys_srcjar") {
-@@ -1392,6 +1396,7 @@ if (current_toolchain == default_toolchain) {
+@@ -1506,6 +1510,7 @@ if (current_toolchain == default_toolchain) {
          ":${_variant}_locale_pak_assets",
          ":${_variant}_paks",
        ]

From 162401367aa6671460b352405f51ca62f73cc039 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 1 Apr 2020 17:07:47 -0400
Subject: [PATCH 025/161] [Android] BottomToolbar listeners moved.

Likely needs to be fixed by Android team.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/ef0081508870bc77b5daedbd7adc863f8ebfdb9c

commit ef0081508870bc77b5daedbd7adc863f8ebfdb9c
Author: Patrick Noland <pnoland@chromium.org>
Date:   Fri Jan 31 02:58:55 2020 +0000

    [ToolbarMVC] Move BottomToolbar listeners to toolbar/bottom

    Bug: 865801
---
 ...-browser-toolbar-ToolbarManager.java.patch | 22 ++-----------------
 ...bottom-BottomToolbarCoordinator.java.patch | 22 +++++++++++++++++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
index cec5261ddbb4..2a4fb47aa0c5 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
@@ -1,26 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-index 2240b1abd22366f3486e3f81277e4a489e7ae3ad..3dbc4defa78c8c1bfc9a6cb7f9d30effb3938b74 100644
+index f1b5eec21633f3c75567d12ceb54f02ce3be6906..32a5df30fa8b1f7eeee814c77492f497cea862d7 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -846,6 +846,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
-     // TODO(crbug.com/1026020): Move this logic to BottomToolbar class.
-     private void onShareDelegateAvailable(ShareDelegate shareDelegate) {
-         final OnClickListener shareButtonListener = v -> {
-+/*
-             if (BottomToolbarVariationManager.isShareButtonOnBottom()) {
-                 recordBottomToolbarUseForIPH();
-                 RecordUserAction.record("MobileBottomToolbarShareButton");
-@@ -859,7 +860,8 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
-                 activity = ((TabImpl) tab).getActivity();
-                 isIncognito = tab.isIncognito();
-             }
--            shareDelegate.share(tab, /*shareDirectly=*/false);
-+*///        shareDelegate.share(tab, /*shareDirectly=*/false);
-+            mActivity.addOrEditBookmark(mActivity.getActivityTab());
-         };
-         mShareButtonListenerSupplier.set(shareButtonListener);
-     }
-@@ -1819,6 +1821,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
+@@ -1649,6 +1649,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
          boolean editingAllowed = currentTab == null || mBookmarkBridge == null
                  || mBookmarkBridge.isEditBookmarksEnabled();
          mToolbar.updateBookmarkButton(isBookmarked, editingAllowed);
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
index 3c2d6cce27fe..c554c0d6e1c8 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
-index c7531b702b2a2e5b966af50ce97409a62a78efef..e733defe9b68f8ff45bdf120f15fca973b4f5bd2 100644
+index c7531b702b2a2e5b966af50ce97409a62a78efef..fca795089f42b922cddbfb66b5065eafc440c404 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
 @@ -43,7 +43,7 @@ class BottomToolbarCoordinator {
@@ -31,7 +31,25 @@ index c7531b702b2a2e5b966af50ce97409a62a78efef..e733defe9b68f8ff45bdf120f15fca97
                  homeButtonListener, searchAcceleratorListener, mShareButtonListenerSupplier,
                  tabsSwitcherLongClickListner);
  
-@@ -263,4 +263,5 @@ class BottomToolbarCoordinator {
+@@ -232,13 +232,16 @@ class BottomToolbarCoordinator {
+ 
+     private void onShareDelegateAvailable(ShareDelegate shareDelegate) {
+         final OnClickListener shareButtonListener = v -> {
++/*
+             if (BottomToolbarVariationManager.isShareButtonOnBottom()) {
+                 recordBottomToolbarUseForIPH();
+                 RecordUserAction.record("MobileBottomToolbarShareButton");
+             }
+ 
++*/
+             Tab tab = mTabProvider.get();
+-            shareDelegate.share(tab, /*shareDirectly=*/false);
++            tab.GetActivity().addOrEditBookmark(tab);
++//        shareDelegate.share(tab, /*shareDirectly=*/false);
+         };
+ 
+         mShareButtonListenerSupplier.set(shareButtonListener);
+@@ -263,4 +266,5 @@ class BottomToolbarCoordinator {
              listener.onClick(v);
          };
      }

From 83cf7e7291ac22e507f3b186b9fc6dabde8c2e59 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 1 Apr 2020 17:41:23 -0400
Subject: [PATCH 026/161] Converted extension_install_prompt.h patch to
 override.

---
 .../extensions/extension_install_prompt.h     | 21 +++++++++++++++++++
 ...xtensions-extension_install_prompt.h.patch | 19 +++++------------
 2 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 chromium_src/chrome/browser/extensions/extension_install_prompt.h

diff --git a/chromium_src/chrome/browser/extensions/extension_install_prompt.h b/chromium_src/chrome/browser/extensions/extension_install_prompt.h
new file mode 100644
index 000000000000..c89da67729ae
--- /dev/null
+++ b/chromium_src/chrome/browser/extensions/extension_install_prompt.h
@@ -0,0 +1,21 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
+#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
+
+#define GetDialogTitle virtual GetDialogTitle
+
+#define BRAVE_EXTENSION_INSTALL_PROMPT_H \
+ private:                                \
+  friend class BravePrompt;              \
+                                         \
+ public:
+#include "../../../../../chrome/browser/extensions/extension_install_prompt.h"
+#undef BRAVE_EXTENSION_INSTALL_PROMPT_H_
+#undef GetDialogTitle
+
+#endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
+
diff --git a/patches/chrome-browser-extensions-extension_install_prompt.h.patch b/patches/chrome-browser-extensions-extension_install_prompt.h.patch
index bb03b5a67141..ed6712c11705 100644
--- a/patches/chrome-browser-extensions-extension_install_prompt.h.patch
+++ b/patches/chrome-browser-extensions-extension_install_prompt.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_install_prompt.h b/chrome/browser/extensions/extension_install_prompt.h
-index 21899f6a1ca8ebb9ca04837ef700f6251de2fa5e..56cdc5d8f216a840d4657565b2241a441610bddd 100644
+index f797a6e2bde19ecf91443a27f97c1a227b06e54a..cdc89811407db706a540a791361831038a881f85 100644
 --- a/chrome/browser/extensions/extension_install_prompt.h
 +++ b/chrome/browser/extensions/extension_install_prompt.h
-@@ -88,7 +88,7 @@ class ExtensionInstallPrompt {
+@@ -86,7 +86,7 @@ class ExtensionInstallPrompt {
    class Prompt {
     public:
      explicit Prompt(PromptType type);
@@ -11,20 +11,11 @@ index 21899f6a1ca8ebb9ca04837ef700f6251de2fa5e..56cdc5d8f216a840d4657565b2241a44
  
      void AddPermissionSet(const extensions::PermissionSet& permissions);
      void AddPermissionMessages(
-@@ -104,7 +104,7 @@ class ExtensionInstallPrompt {
-     PromptType type() const { return type_; }
+@@ -167,6 +167,7 @@ class ExtensionInstallPrompt {
  
-     // Getters for UI element labels.
--    base::string16 GetDialogTitle() const;
-+    virtual base::string16 GetDialogTitle() const;
-     int GetDialogButtons() const;
-     // Returns the empty string when there should be no "accept" button.
-     base::string16 GetAcceptButtonLabel() const;
-@@ -168,6 +168,7 @@ class ExtensionInstallPrompt {
+     bool has_webstore_data() const { return has_webstore_data_; }
  
++    BRAVE_EXTENSION_INSTALL_PROMPT_H
     private:
-     friend class base::RefCountedThreadSafe<Prompt>;
-+    friend class BravePrompt;
- 
      bool ShouldDisplayRevokeButton() const;
  

From 7d83daefdaf51d44c6c7d2f14a61581854df1b93 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 1 Apr 2020 18:04:33 -0400
Subject: [PATCH 027/161] No longer need to patch appearance_fonts_page.html.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/da6aa73fd5178488363fcde841a0b4405eefccb6

commit da6aa73fd5178488363fcde841a0b4405eefccb6
Author: Matt Falkenhagen <falken@chromium.org>
Date:   Thu Mar 12 02:24:43 2020 +0000

    Remove link to Advanced Font Settings extension.

    This extension is owned by my personal chromium account and I'm not able
    to maintain it officially.
---
 ...rance_page-appearance_fonts_page.html.patch | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 patches/chrome-browser-resources-settings-appearance_page-appearance_fonts_page.html.patch

diff --git a/patches/chrome-browser-resources-settings-appearance_page-appearance_fonts_page.html.patch b/patches/chrome-browser-resources-settings-appearance_page-appearance_fonts_page.html.patch
deleted file mode 100644
index 5d85b7137d78..000000000000
--- a/patches/chrome-browser-resources-settings-appearance_page-appearance_fonts_page.html.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html b/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html
-index a38f7b1de9287aa3bdd1c28a65ffa66b799874cb..9b185bc8bc8688d56a622e0d6dac2d107ba2d034 100644
---- a/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html
-+++ b/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html
-@@ -137,11 +137,13 @@
-         $i18n{quickBrownFox}
-       </div>
-     </div>
-+<!--
-     <template is="dom-if" if="[[!isGuest_]]">
-       <cr-link-row id="advancedButton" class="hr"
-           on-click="openAdvancedExtension_" label="$i18n{advancedFontSettings}"
-           sub-label="[[advancedExtensionSublabel_]]" external></cr-link-row>
-     </template>
-+-->
-   </template>
-   <script src="appearance_fonts_page.js"></script>
- </dom-module>

From a7df6f08b948bd485b8ba336e043f1bf021fcd46 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 2 Apr 2020 13:37:31 -0400
Subject: [PATCH 028/161] Changes to site settings UI patches.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/f5919f942495f649b152b1aa501022f4210d5a29

commit f5919f942495f649b152b1aa501022f4210d5a29
Author: Demetrios Papadopoulos <dpapad@chromium.org>
Date:   Wed Feb 19 06:29:20 2020 +0000

    Settings: Refactor site-settings-page to use a dom-repeat.

    This CL removes a lot of redundancy from site_settings_page.js both
    in HTML and in JS. Specifically:

    1) Using dom-repeat eliminates redundant HTML code
    2) The introduction of the |categoryList| makes populating the
       |focusConfig| trivial
    3) Fetching default values for each permission category type also
       becomes simpler.

    Moreover the programmatic approach is more flexible and should make
    the upcoming "Friendly Privacy Settings" changes easier to implement,
    by allowing splitting the permissions list in two parts
    programmatically in JS (no more redundant dom-if expressions).

    Bug: 1032584
---
 ...ettings_page-site_settings_page.html.patch | 42 --------
 ..._settings_page-site_settings_page.js.patch | 97 ++++++++++++++++---
 2 files changed, 86 insertions(+), 53 deletions(-)
 delete mode 100644 patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.html.patch

diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.html.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.html.patch
deleted file mode 100644
index ddf7ffb650b3..000000000000
--- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.html.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
-index a225efb9c5ad211d257bd2816e0698510c8deb73..0cbbcb24a1f8f322e53858648ad7b838df811a41 100644
---- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
-+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
-@@ -90,7 +90,18 @@
-             '$i18nPolymer{siteSettingsAskBeforeSending}',
-             '$i18nPolymer{siteSettingsBlocked}')]]"
-         role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
--
-+    <cr-link-row
-+        class="hr two-line"
-+        data-route="SITE_SETTINGS_AUTOPLAY"
-+        icon-class="subpage-arrow"
-+        id="autoplay"
-+        label="$i18n{siteSettingsAutoplay}"
-+        on-click="onTapNavigate_"
-+        start-icon="cr:extension"
-+        sub-label="[[defaultSettingLabel_(
-+            default_.notifications,
-+            '$i18nPolymer{siteSettingsAutoplayAsk}',
-+            '$i18nPolymer{siteSettingsBlocked}')]]"></cr-link-row>
-     <cr-link-row class="hr two-line" data-route="SITE_SETTINGS_JAVASCRIPT"
-         id="javascript" label="$i18n{siteSettingsJavascript}"
-         on-click="onTapNavigate_" start-icon="settings:code"
-@@ -126,7 +137,7 @@
-             '$i18nPolymer{siteSettingsAllowed}',
-             '$i18nPolymer{siteSettingsBlocked}')]]"
-         role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
--
-+<!--
-     <template is="dom-if" if="[[enableSafeBrowsingSubresourceFilter_]]">
-       <cr-link-row class="hr two-line" data-route="SITE_SETTINGS_ADS" id="ads"
-           label="$i18n{siteSettingsAds}" on-click="onTapNavigate_"
-@@ -146,7 +157,7 @@
-             '$i18nPolymer{siteSettingsAllowRecentlyClosedSites}',
-             '$i18nPolymer{siteSettingsBackgroundSyncBlocked}')]]"
-         role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
--
-+-->
-     <cr-link-row class="hr two-line" data-route="SITE_SETTINGS_SOUND"
-         id="sound" label="$i18n{siteSettingsSound}" on-click="onTapNavigate_"
-         start-icon="settings:volume-up"
diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
index 608a102eeeba..775c98ab1857 100644
--- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
+++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
@@ -1,14 +1,89 @@
 diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
-index 37677e33b25249585eb6148b5f2c1ceb321450ca..3c7a4ed55cac206a56a4c66add4ffb9a5b42697f 100644
+index 712a0a7f73f75108bb3f326a9ecfc67252f84a6b..8fca8551cb68264b2db30bb06b9b0721a8545856 100644
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
-@@ -106,7 +106,9 @@ Polymer({
-     // elements residing in this element's Shadow DOM.
-     const R = settings.routes;
-     const pairs = [
-+      // <if expr="_google_chrome">
-       [R.SITE_SETTINGS_ADS, 'ads'],
-+      // </if>
-       [R.SITE_SETTINGS_ALL, 'all-sites'],
-       [R.SITE_SETTINGS_AUTOMATIC_DOWNLOADS, 'automatic-downloads'],
-       [R.SITE_SETTINGS_BACKGROUND_SYNC, 'background-sync'],
+@@ -41,6 +41,7 @@ cr.define('settings', function() {
+     // The following list is ordered alphabetically by |id|. The order in which
+     // these appear in the UI is determined elsewhere in this file.
+     const categoryList = [
++/*
+       {
+         route: settings.routes.SITE_SETTINGS_ADS,
+         id: Id.ADS,
+@@ -51,6 +52,7 @@ cr.define('settings', function() {
+         shouldShow: () =>
+             loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter'),
+       },
++*/
+       {
+         route: settings.routes.SITE_SETTINGS_AR,
+         id: Id.AR,
+@@ -68,6 +70,15 @@ cr.define('settings', function() {
+         enabledLabel: 'siteSettingsAutoDownloadAsk',
+         disabledLabel: 'siteSettingsAutoDownloadBlock',
+       },
++      {
++        route: settings.routes.SITE_SETTINGS_AUTOPLAY,
++        id: Id.AUTOPLAY,
++        label: 'siteSettingsAutoplay',
++        icon: 'cr:extension',
++        enabledLabel: 'siteSettingsAutoplayAsk',
++        disabledLabel: 'siteSettingsBlocked',
++      },
++/*
+       {
+         route: settings.routes.SITE_SETTINGS_BACKGROUND_SYNC,
+         id: Id.BACKGROUND_SYNC,
+@@ -76,6 +87,7 @@ cr.define('settings', function() {
+         enabledLabel: 'siteSettingsAllowRecentlyClosedSites',
+         disabledLabel: 'siteSettingsBackgroundSyncBlocked',
+       },
++*/
+       {
+         route: settings.routes.SITE_SETTINGS_BLUETOOTH_DEVICES,
+         id: Id.BLUETOOTH_DEVICES,
+@@ -353,13 +365,15 @@ cr.define('settings', function() {
+                 Id.MIC,
+                 Id.SENSORS,
+                 Id.NOTIFICATIONS,
++                Id.AUTOPLAY,
+                 Id.JAVASCRIPT,
+                 Id.PLUGINS,
+                 Id.IMAGES,
+                 Id.POPUPS,
++/*
+                 Id.ADS,
+                 Id.BACKGROUND_SYNC,
+-                Id.SOUND,
++*/
+                 Id.AUTOMATIC_DOWNLOADS,
+                 Id.UNSANDBOXED_PLUGINS,
+                 Id.PROTOCOL_HANDLERS,
+@@ -390,7 +404,9 @@ cr.define('settings', function() {
+               Id.CAMERA,
+               Id.MIC,
+               Id.NOTIFICATIONS,
++/*
+               Id.BACKGROUND_SYNC,
++*/
+             ]),
+             permissionsAdvanced: buildItemListFromIds([
+               Id.SENSORS,
+@@ -410,6 +426,7 @@ cr.define('settings', function() {
+               Id.VR,
+             ]),
+             contentBasic: buildItemListFromIds([
++              Id.AUTOPLAY,
+               Id.COOKIES,
+               Id.JAVASCRIPT,
+               Id.PLUGINS,
+@@ -418,7 +435,9 @@ cr.define('settings', function() {
+             ]),
+             contentAdvanced: buildItemListFromIds([
+               Id.SOUND,
++/*
+               Id.ADS,
++*/
+               Id.ZOOM_LEVELS,
+               'pdfDocuments',
+               // <if expr="chromeos">

From 1fa41b91eeddfe60aecf22a7b4ad04a55d41474c Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 2 Apr 2020 13:50:23 -0400
Subject: [PATCH 029/161] Updated tab_helpers.cc patch.

---
 chromium_src/chrome/browser/ui/tab_helpers.cc  |  6 +++++-
 patches/chrome-browser-ui-tab_helpers.cc.patch | 12 ++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/chromium_src/chrome/browser/ui/tab_helpers.cc b/chromium_src/chrome/browser/ui/tab_helpers.cc
index 276c3abc4949..3aaa24db30f9 100644
--- a/chromium_src/chrome/browser/ui/tab_helpers.cc
+++ b/chromium_src/chrome/browser/ui/tab_helpers.cc
@@ -5,4 +5,8 @@
 
 #include "brave/browser/brave_tab_helpers.h"
 
-#include "../../../../../chrome/browser/ui/tab_helpers.cc"  // NOLINT
+#define BRAVE_TAB_HELPERS \
+  brave::AttachTabHelpers(web_contents);
+
+#include "../../../../../chrome/browser/ui/tab_helpers.cc"
+#undef BRAVE_TAB_HELPERS
diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch
index b6587d87bed5..01ceac28d574 100644
--- a/patches/chrome-browser-ui-tab_helpers.cc.patch
+++ b/patches/chrome-browser-ui-tab_helpers.cc.patch
@@ -1,10 +1,10 @@
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
-index 02d2216a7d6ab75f5eb6663121a79f00f50788b1..eb564ffaadea9aa276038dea702c3e7baa8688ed 100644
+index e37e00ef6541afd57a78164dd0b385c05b2a3586..bed4a8d787f75316721b4033b6aafdcb73100f11 100644
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -421,4 +421,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
-   //     See https://crbug.com/910288.
-   resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
-       web_contents);
-+  brave::AttachTabHelpers(web_contents);
+@@ -445,4 +445,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+ 
+   // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and
+   // organized.
++  BRAVE_TAB_HELPERS
  }

From 902a7a3dff81b16677ba0cbe10d671048c0f9517 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 2 Apr 2020 14:53:24 -0400
Subject: [PATCH 030/161] Mac signing scripts patches changes.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/86dea68fc642a5deb1a3398afd212de76b1652a8

commit 86dea68fc642a5deb1a3398afd212de76b1652a8
Author: Joshua Pawlicki <waffles@chromium.org>
Date:   Fri Jan 31 17:55:05 2020 +0000

    Refactor chrome/installer/mac/signing in preparation for updater reuse.

    The main thing here is to move get_parts into the parts.py.

    Bug: 926234
---
 ...hrome-installer-mac-signing-parts.py.patch | 28 +++++++++++++++++++
 ...ome-installer-mac-signing-signing.py.patch | 28 ++-----------------
 2 files changed, 30 insertions(+), 26 deletions(-)
 create mode 100644 patches/chrome-installer-mac-signing-parts.py.patch

diff --git a/patches/chrome-installer-mac-signing-parts.py.patch b/patches/chrome-installer-mac-signing-parts.py.patch
new file mode 100644
index 000000000000..6bb3110ccac0
--- /dev/null
+++ b/patches/chrome-installer-mac-signing-parts.py.patch
@@ -0,0 +1,28 @@
+diff --git a/chrome/installer/mac/signing/parts.py b/chrome/installer/mac/signing/parts.py
+index 5a56368e346ebd273ec165ec20af6016d79416ad..fe152f0e290ea33aef61d4f06ff13d7f6d7279af 100644
+--- a/chrome/installer/mac/signing/parts.py
++++ b/chrome/installer/mac/signing/parts.py
+@@ -10,6 +10,7 @@ import os.path
+ 
+ from . import commands, signing
+ from .model import CodeSignOptions, CodeSignedProduct, VerifyOptions
++from signing_helper import AddBravePartsForSigning, GenerateBraveWidevineSigFile
+ 
+ _PROVISIONPROFILE_EXT = '.provisionprofile'
+ _PROVISIONPROFILE_DEST = 'embedded.provisionprofile'
+@@ -136,6 +137,7 @@ def get_parts(config):
+             library_basename.replace('.dylib', ''),
+             verify_options=verify_options)
+ 
++    parts = AddBravePartsForSigning(parts, config)
+     return parts
+ 
+ 
+@@ -199,6 +201,7 @@ def sign_chrome(paths, config, sign_framework=False):
+                 continue
+             signing.sign_part(paths, config, part)
+ 
++        GenerateBraveWidevineSigFile(paths, config, parts['framework'])
+         # Sign the framework bundle.
+         signing.sign_part(paths, config, parts['framework'])
+ 
diff --git a/patches/chrome-installer-mac-signing-signing.py.patch b/patches/chrome-installer-mac-signing-signing.py.patch
index f3d3f0a501ed..656e8c921d65 100644
--- a/patches/chrome-installer-mac-signing-signing.py.patch
+++ b/patches/chrome-installer-mac-signing-signing.py.patch
@@ -1,24 +1,8 @@
 diff --git a/chrome/installer/mac/signing/signing.py b/chrome/installer/mac/signing/signing.py
-index db8787b0ea8535cde78100166b41199f9367333f..c7c4d5dd1ea7e298fb1701825e4b036034174291 100644
+index 59ce4868f1329947e0daaaf301e8c7f822d33bd2..82b56a6caecdb6ffa02250701b83a14fa6d4cd7c 100644
 --- a/chrome/installer/mac/signing/signing.py
 +++ b/chrome/installer/mac/signing/signing.py
-@@ -11,6 +11,7 @@ import os.path
- 
- from . import commands
- from .model import CodeSignOptions, CodeSignedProduct, VerifyOptions
-+from signing_helper import AddBravePartsForSigning, GenerateBraveWidevineSigFile
- 
- _PROVISIONPROFILE_EXT = '.provisionprofile'
- _PROVISIONPROFILE_DEST = 'embedded.provisionprofile'
-@@ -136,6 +137,7 @@ def get_parts(config):
-             library_basename.replace('.dylib', ''),
-             verify_options=verify_options)
- 
-+    parts = AddBravePartsForSigning(parts, config)
-     return parts
- 
- 
-@@ -180,7 +182,7 @@ def sign_part(paths, config, part):
+@@ -20,7 +20,7 @@ def sign_part(paths, config, part):
          part: The |model.CodeSignedProduct| to sign. The product's |path| must
              be in |paths.work|.
      """
@@ -27,11 +11,3 @@ index db8787b0ea8535cde78100166b41199f9367333f..c7c4d5dd1ea7e298fb1701825e4b0360
      if config.notary_user:
          # Assume if the config has notary authentication information that the
          # products will be notarized, which requires a secure timestamp.
-@@ -262,6 +264,7 @@ def sign_chrome(paths, config, sign_framework=False):
-                 continue
-             sign_part(paths, config, part)
- 
-+        GenerateBraveWidevineSigFile(paths, config, parts['framework'])
-         # Sign the framework bundle.
-         sign_part(paths, config, parts['framework'])
- 

From bdbbdc37144bcfdb13aac94daa1c5ed143b8c50a Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 2 Apr 2020 16:54:56 -0400
Subject: [PATCH 031/161] Moved patch adding kBraveUIScheme to WebUI.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/37109f21fbbeece29c5eb75f5a3ac3f0caa7a20a

commit 37109f21fbbeece29c5eb75f5a3ac3f0caa7a20a
Author: jessing <jessing@google.com>
Date:   Mon Feb 3 01:59:20 2020 +0000

    [system-web-apps] Add ability to grant requestable schemes in a WebUI

    Currently chrome:// URLs are not allowed to embed chrome-untrusted://
    URLs because we never grant request access to chrome-untrusted:// URLs.

    To allow for this, this CL makes a couple of changes (Note that this is
    only fixes the issue on the browser side. The renderer still has some
    checks that stop us from loading chrome-untrusted:// iframes.):

    1. Make the set of requestable schemes part of content::WebUI. This way
     clients of WebUI can control which additional schemes they want their
    WebUI to be able to request. The function to add a scheme is added as a
    webUI API because it is expected to be used by chrome/ WebUIControllers
    that use chrome-untrusted://.

    2. When creating a WebUI in RenderFrameHostImpl::CreateWebUI(), grant
    request access to the schemes the WebUI specified.

    3. Decouple granting access to chrome:// and file:// from
    ChildProcessSecurityPolicy::GrantWebUIBindings(). Instead add this to
    the list of schemes in content::WebUIImpl. Long term, we should be able
     to remove these schemes from content::WebUIImpl and instead have each
    client specify the schemes they want access to, similarly to how
    clients will call EnableMojoJsBindings()[1].

    [1] https://cs.chromium.org/chromium/src/content/browser/process_internals/process_internals_ui.cc?l=53&rcl=0ab24b983b19f971f40b2f1e3f5a5b95c7a1ad9a

    Bug: 1043548
---
 chromium_src/content/browser/webui/web_ui_impl.cc  |  8 ++++++++
 ...ser-child_process_security_policy_impl.cc.patch | 14 --------------
 patches/content-browser-webui-web_ui_impl.cc.patch | 12 ++++++++++++
 3 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 chromium_src/content/browser/webui/web_ui_impl.cc
 delete mode 100644 patches/content-browser-child_process_security_policy_impl.cc.patch
 create mode 100644 patches/content-browser-webui-web_ui_impl.cc.patch

diff --git a/chromium_src/content/browser/webui/web_ui_impl.cc b/chromium_src/content/browser/webui/web_ui_impl.cc
new file mode 100644
index 000000000000..95fced563d74
--- /dev/null
+++ b/chromium_src/content/browser/webui/web_ui_impl.cc
@@ -0,0 +1,8 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#define BRAVE_WEB_UI_IMPL AddRequestableScheme(kBraveUIScheme);
+#include "../../../../../content/browser/webui/web_ui_impl.cc"
+#undef BRAVE_WEB_UI_IMPL
diff --git a/patches/content-browser-child_process_security_policy_impl.cc.patch b/patches/content-browser-child_process_security_policy_impl.cc.patch
deleted file mode 100644
index f7253b766800..000000000000
--- a/patches/content-browser-child_process_security_policy_impl.cc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
-index 2b768dc8f4be2dc465ce24d298d5175887c3c4f0..a256285ef3feed202dbb70ea393de37acfa3b921 100644
---- a/content/browser/child_process_security_policy_impl.cc
-+++ b/content/browser/child_process_security_policy_impl.cc
-@@ -939,6 +939,9 @@ void ChildProcessSecurityPolicyImpl::GrantWebUIBindings(int child_id,
- 
-   // Web UI bindings need the ability to request chrome: URLs.
-   state->second->GrantRequestScheme(kChromeUIScheme);
-+#if defined(BRAVE_CHROMIUM_BUILD)
-+  state->second->GrantRequestScheme(kBraveUIScheme);
-+#endif
- 
-   // Web UI pages can contain links to file:// URLs.
-   state->second->GrantRequestScheme(url::kFileScheme);
diff --git a/patches/content-browser-webui-web_ui_impl.cc.patch b/patches/content-browser-webui-web_ui_impl.cc.patch
new file mode 100644
index 000000000000..837abf17577d
--- /dev/null
+++ b/patches/content-browser-webui-web_ui_impl.cc.patch
@@ -0,0 +1,12 @@
+diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc
+index 432b1dd9679335509c0fc4bb536946121a6644ea..04602cc678c35f48ba2ee6ffbd37d1c986bf9fa8 100644
+--- a/content/browser/webui/web_ui_impl.cc
++++ b/content/browser/webui/web_ui_impl.cc
+@@ -87,6 +87,7 @@ WebUIImpl::WebUIImpl(WebContentsImpl* contents)
+       web_contents_(contents),
+       web_contents_observer_(new MainFrameNavigationObserver(this, contents)) {
+   DCHECK(contents);
++  BRAVE_WEB_UI_IMPL
+ }
+ 
+ WebUIImpl::~WebUIImpl() {

From e2be1763d0c89630f048df761791423048d9b791 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 2 Apr 2020 17:40:26 -0400
Subject: [PATCH 032/161] Removed previously applied upstream patches.

These were upstream patches applied in Chromium 81 to fix Linux build
issue. They are included in Chromium 83.

See https://github.com/brave/brave-core/pull/4548/commits/cd0ec9e4f6d43cbf348c83c33f6cc793e38ce638
and https://github.com/brave/brave-core/pull/4548/commits/641ec7bc6d3002034c5f5ac9c5ee8cfa17639db9
---
 ...media-gpu-vaapi-vaapi_picture_tfp.cc.patch | 13 -----------
 ...jo-services-gpu_mojo_media_client.cc.patch | 13 -----------
 ...ojo-services-gpu_mojo_media_client.h.patch | 22 -------------------
 3 files changed, 48 deletions(-)
 delete mode 100644 patches/media-gpu-vaapi-vaapi_picture_tfp.cc.patch
 delete mode 100644 patches/media-mojo-services-gpu_mojo_media_client.cc.patch
 delete mode 100644 patches/media-mojo-services-gpu_mojo_media_client.h.patch

diff --git a/patches/media-gpu-vaapi-vaapi_picture_tfp.cc.patch b/patches/media-gpu-vaapi-vaapi_picture_tfp.cc.patch
deleted file mode 100644
index ec8af2c302c2..000000000000
--- a/patches/media-gpu-vaapi-vaapi_picture_tfp.cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/media/gpu/vaapi/vaapi_picture_tfp.cc b/media/gpu/vaapi/vaapi_picture_tfp.cc
-index 227c31b18bef0c677c0f8e9e9206cab146dabc75..b42620d74553e98f18eb4b72eddbea623b596fdf 100644
---- a/media/gpu/vaapi/vaapi_picture_tfp.cc
-+++ b/media/gpu/vaapi/vaapi_picture_tfp.cc
-@@ -57,7 +57,7 @@ bool VaapiTFPPicture::Initialize() {
-   if (make_context_current_cb_ && !make_context_current_cb_.Run())
-     return false;
- 
--  glx_image_ = new gl::GLImageGLX(size_, GL_RGB);
-+  glx_image_ = new gl::GLImageGLX(size_, gfx::BufferFormat::BGRX_8888);
-   if (!glx_image_->Initialize(x_pixmap_)) {
-     // x_pixmap_ will be freed in the destructor.
-     DLOG(ERROR) << "Failed creating a GLX Pixmap for TFP";
diff --git a/patches/media-mojo-services-gpu_mojo_media_client.cc.patch b/patches/media-mojo-services-gpu_mojo_media_client.cc.patch
deleted file mode 100644
index 460198b17269..000000000000
--- a/patches/media-mojo-services-gpu_mojo_media_client.cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc
-index 6654fa8a5a89218ff6e9b828613a74110a857550..88d614e3a3ebe192b4b81d80334827ccadac5498 100644
---- a/media/mojo/services/gpu_mojo_media_client.cc
-+++ b/media/mojo/services/gpu_mojo_media_client.cc
-@@ -157,7 +157,7 @@ GpuMojoMediaClient::GetSupportedVideoDecoderConfigs() {
-   supported_config_map[VideoDecoderImplementation::kAlternate] =
-       *d3d11_supported_configs_;
- 
--#elif BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
-+#elif defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
-   if (base::FeatureList::IsEnabled(kChromeosVideoDecoder)) {
-     if (!cros_supported_configs_) {
-       cros_supported_configs_ =
diff --git a/patches/media-mojo-services-gpu_mojo_media_client.h.patch b/patches/media-mojo-services-gpu_mojo_media_client.h.patch
deleted file mode 100644
index 80a6d73f2cf9..000000000000
--- a/patches/media-mojo-services-gpu_mojo_media_client.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/media/mojo/services/gpu_mojo_media_client.h b/media/mojo/services/gpu_mojo_media_client.h
-index b3ff55f54743ea863a2a745efbc619868b2171c1..a7ec9a8811b9be157f8dd7af03f3d3e0855e4012 100644
---- a/media/mojo/services/gpu_mojo_media_client.h
-+++ b/media/mojo/services/gpu_mojo_media_client.h
-@@ -74,16 +74,13 @@ class GpuMojoMediaClient : public MojoMediaClient {
- #if defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
-   // Indirectly owned by GpuChildThread.
-   gpu::GpuMemoryBufferFactory* const gpu_memory_buffer_factory_;
-+  base::Optional<SupportedVideoDecoderConfigs> cros_supported_configs_;
- #endif  // defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
-   CdmProxyFactoryCB cdm_proxy_factory_cb_;
- #if defined(OS_WIN)
-   base::Optional<SupportedVideoDecoderConfigs> d3d11_supported_configs_;
- #endif  // defined(OS_WIN)
- 
--#if defined(OS_CHROMEOS)
--  base::Optional<SupportedVideoDecoderConfigs> cros_supported_configs_;
--#endif  // defined(OS_CHROMEOS)
--
-   DISALLOW_COPY_AND_ASSIGN(GpuMojoMediaClient);
- };
- 

From 7eb211dbd69ae08e10f11370d15307d29d953aaf Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 2 Apr 2020 18:44:34 -0400
Subject: [PATCH 033/161] Blink modules idl changes.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/25555374c31b247963cdb9e3c7f8444a6148742d

commit 25555374c31b247963cdb9e3c7f8444a6148742d
Author: Daniel Cheng <dcheng@chromium.org>
Date:   Fri Feb 7 20:46:25 2020 +0000

    Document how to add new IDL files for modules.

    Fixes: 1048907
---
 ...nderer-modules-modules_idl_files.gni.patch | 22 ++++++-------------
 third_party/blink/renderer/includes.gni       |  8 +------
 .../blink/renderer/modules/brave/idls.gni     |  8 +++++++
 3 files changed, 16 insertions(+), 22 deletions(-)
 create mode 100644 third_party/blink/renderer/modules/brave/idls.gni

diff --git a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch
index 0cdc30504e9f..fccb674aa26c 100644
--- a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch
+++ b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch
@@ -1,20 +1,12 @@
 diff --git a/third_party/blink/renderer/modules/modules_idl_files.gni b/third_party/blink/renderer/modules/modules_idl_files.gni
-index f6dae1fa5263f07051235e80d47a3c6fd0e2d30c..ec0028dc1d86074637f026b2f931a9a3e63b554b 100644
+index 130b406dad47d81bc11a96be791fdfd817b62aa5..062e55e2c3409c91d0d923ad4ca8a671edafe1f7 100644
 --- a/third_party/blink/renderer/modules/modules_idl_files.gni
 +++ b/third_party/blink/renderer/modules/modules_idl_files.gni
-@@ -556,6 +556,7 @@ modules_idl_files =
-         ],
-         "abspath")
- 
-+modules_idl_files += brave_modules_idl_files
+@@ -132,6 +132,7 @@ _idl_imports = [
  if (!is_android) {
-   modules_idl_files += get_path_info([
-                                        "serial/serial.idl",
-@@ -1051,6 +1052,7 @@ modules_dependency_idl_files =
-           "xr/navigator_xr.idl",
-         ],
-         "abspath")
-+modules_dependency_idl_files += brave_modules_dependency_idl_files
+   _idl_imports += [ "//third_party/blink/renderer/modules/serial/idls.gni" ]
+ }
++_idl_imports += brave_idl_imports
  
- if (!is_android) {
-   modules_dependency_idl_files +=
+ # Do not add IDL files directly to these lists. See _idl_imports above instead
+ # on how to add IDL files for a module.
diff --git a/third_party/blink/renderer/includes.gni b/third_party/blink/renderer/includes.gni
index 1ccaae2cd9e4..dd50633d7db9 100644
--- a/third_party/blink/renderer/includes.gni
+++ b/third_party/blink/renderer/includes.gni
@@ -20,10 +20,4 @@ brave_blink_sub_modules = [
 
 # common includes which can help minimize patches for
 # src/third_party/blink/renderer/modules/modules_idl_files.gni
-brave_modules_idl_files = get_path_info([
-  "//brave/third_party/blink/renderer/modules/brave/brave.idl",
-], "abspath")
-
-brave_modules_dependency_idl_files = get_path_info([
-  "//brave/third_party/blink/renderer/modules/brave/navigator_brave.idl",
-], "abspath")
+brave_idl_imports = [ "//brave/third_party/blink/renderer/modules/brave/idls.gni" ]
diff --git a/third_party/blink/renderer/modules/brave/idls.gni b/third_party/blink/renderer/modules/brave/idls.gni
new file mode 100644
index 000000000000..ac09dd0dbb9e
--- /dev/null
+++ b/third_party/blink/renderer/modules/brave/idls.gni
@@ -0,0 +1,8 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+modules_idl_files = [ "brave.idl" ]
+
+modules_dependency_idl_files = [ "navigator_brave.idl" ]

From 55c57152eebc2029cb748075722a7e43d7214b6c Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 2 Apr 2020 19:12:37 -0400
Subject: [PATCH 034/161] Removed no longer needed patch.

The same functionality was added upstream.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/17ea57e50eafaa4d737d97806e96466a7e4126b9

commit 17ea57e50eafaa4d737d97806e96466a7e4126b9
Author: Xing Liu <xingliu@chromium.org>
Date:   Tue Feb 4 18:52:31 2020 +0000

    Announcement notification: Add missing deps.

    This CL adds a few missing deps for announcement notification system.
    Currently there is no build failure.

    Check command:
    gn check out/Debug //chrome/browser/updates/announcement_notification

    Refactor that requires large code change needs to be merged after M81.

    Bug: 1048346
---
 ...-updates-announcement_notification-BUILD.gn.patch | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 patches/chrome-browser-updates-announcement_notification-BUILD.gn.patch

diff --git a/patches/chrome-browser-updates-announcement_notification-BUILD.gn.patch b/patches/chrome-browser-updates-announcement_notification-BUILD.gn.patch
deleted file mode 100644
index 59fe27d243c7..000000000000
--- a/patches/chrome-browser-updates-announcement_notification-BUILD.gn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/chrome/browser/updates/announcement_notification/BUILD.gn b/chrome/browser/updates/announcement_notification/BUILD.gn
-index fe6f065a756ddfc0bd651ec4387948a368d09867..3193cdf414407b508ae6991ad4159fb3d141d686 100644
---- a/chrome/browser/updates/announcement_notification/BUILD.gn
-+++ b/chrome/browser/updates/announcement_notification/BUILD.gn
-@@ -20,6 +20,7 @@ source_set("announcement_notification") {
- 
-   deps = [
-     "//base",
-+    "//chrome/app:generated_resources",
-     "//components/keyed_service/content",
-     "//skia",
-   ]

From 0336c56dd95e72655d14ed4cb6e792473b611efe Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 2 Apr 2020 19:36:54 -0400
Subject: [PATCH 035/161] Renamed patch for devtools-frontend.

Chromium change:

https://chromium.googlesource.com/devtools/devtools-frontend/+/e4a10affd8fb231dba2500aad1165304ade291df

commit e4a10affd8fb231dba2500aad1165304ade291df
Author: Tim van der Lippe <tvanderlippe@chromium.org>
Date:   Mon Mar 16 10:53:20 2020 +0000

    Extract tsconfig.base.json to obtain VSCode compatible tsconfig.json

    VS Code requires all files including .d.ts files to be included in order
    to correctly resolve their definitions. However, we can't add the
    include and exclude keywords to the tsconfig.json, as that would break
    inheriting tsconfig.json configurations.

    Therefore, extract a tsconfig.base.json with the original configuration
    and let tsconfig.json extend it. This should instruct VS Code to use the
    tsconfig, which includes all files, while all other infrastructure can
    remain working as-is.

    Fixed: 1056211
---
 .../devtools-frontend-src/tsconfig.base.json.patch   | 12 ++++++++++++
 patches/devtools-frontend-src/tsconfig.json.patch    | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 patches/devtools-frontend-src/tsconfig.base.json.patch
 delete mode 100644 patches/devtools-frontend-src/tsconfig.json.patch

diff --git a/patches/devtools-frontend-src/tsconfig.base.json.patch b/patches/devtools-frontend-src/tsconfig.base.json.patch
new file mode 100644
index 000000000000..60a324e1f7df
--- /dev/null
+++ b/patches/devtools-frontend-src/tsconfig.base.json.patch
@@ -0,0 +1,12 @@
+diff --git a/tsconfig.base.json b/tsconfig.base.json
+index a88f49eaa993afe3a7408bc2f34a1b3f7f3909d1..c0c4d7f2660a9d760dbd7dd17841df42fc7990cb 100644
+--- a/tsconfig.base.json
++++ b/tsconfig.base.json
+@@ -8,6 +8,7 @@
+     },
+     "checkJs": true,
+     "allowJs": true,
++    "moduleResolution": "node",
+ 
+     "noEmitOnError": true,
+ 
diff --git a/patches/devtools-frontend-src/tsconfig.json.patch b/patches/devtools-frontend-src/tsconfig.json.patch
deleted file mode 100644
index 26b8dacbe49a..000000000000
--- a/patches/devtools-frontend-src/tsconfig.json.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tsconfig.json b/tsconfig.json
-index 91fa83559d50f5e7749a7e72fedf597b08818b16..b621a0c3184ad69911dc3827dafd8ee821db3bb1 100644
---- a/tsconfig.json
-+++ b/tsconfig.json
-@@ -8,6 +8,7 @@
-     },
-     "checkJs": true,
-     "allowJs": true,
-+    "moduleResolution": "node",
- 
-     "lib": [
-       "esnext",

From ac3893f2eb766bf33dee82ee04d02ebefc43db6b Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 3 Apr 2020 15:47:54 -0400
Subject: [PATCH 036/161] Upgrade patches from Chromium 83.0.4093.3 to Chromium
 83.0.4100.3.

---
 patches/build-android-bytecode-BUILD.gn.patch |  4 +--
 ...mium-bytecode-ByteCodeProcessor.java.patch |  4 +--
 patches/build-config-BUILDCONFIG.gn.patch     |  2 +-
 patches/build-config-android-config.gni.patch |  2 +-
 patches/build-config-android-rules.gni.patch  |  2 +-
 patches/chrome-android-BUILD.gn.patch         | 12 ++++-----
 ...rome-android-chrome_java_sources.gni.patch |  4 +--
 ...e-android-chrome_public_apk_tmpl.gni.patch |  2 +-
 ...d-java-res-layout-toolbar_tablet.xml.patch |  2 +-
 ...hromium-chrome-browser-AppHooks.java.patch |  2 +-
 ...me-browser-ChromeTabbedActivity.java.patch | 10 +++----
 ...ut_settings-AboutChromeSettings.java.patch |  2 +-
 ...ttings-LegalInformationSettings.java.patch |  4 +--
 ...-settings-AccessibilitySettings.java.patch |  4 +--
 ...ings-AndroidPaymentAppsFragment.java.patch |  2 +-
 ...-AutofillPaymentMethodsFragment.java.patch |  4 +--
 ...ttings-AutofillProfilesFragment.java.patch |  4 +--
 ...s-AutofillServerProfileFragment.java.patch |  4 +--
 ...-bookmarks-BookmarkEditActivity.java.patch |  2 +-
 ...textualSearchPreferenceFragment.java.patch |  4 +--
 ...DataReductionPreferenceFragment.java.patch |  4 +--
 ...nload-settings-DownloadSettings.java.patch |  4 +--
 ...guage-settings-LanguageSettings.java.patch |  4 +--
 ...-settings-ThemeSettingsFragment.java.patch |  2 +-
 ...s-settings-NotificationSettings.java.patch |  2 +-
 ...me-browser-ntp-NewTabPageLayout.java.patch |  6 ++---
 ...nager-settings-PasswordSettings.java.patch |  4 +--
 ...acy-settings-DoNotTrackSettings.java.patch |  4 +--
 ...rivacy-settings-PrivacySettings.java.patch |  8 +++---
 ...e-browser-settings-MainSettings.java.patch |  4 +--
 ...tings-homepage-HomepageSettings.java.patch |  2 +-
 ...tings-AccountManagementFragment.java.patch |  4 +--
 ...ync-settings-ManageSyncSettings.java.patch |  2 +-
 ...ettings-SyncAndServicesSettings.java.patch |  4 +--
 ...-browser-toolbar-ToolbarManager.java.patch |  4 +--
 ...bottom-BottomToolbarCoordinator.java.patch | 16 ++++++------
 ...lbar-top-TabSwitcherModeTTPhone.java.patch |  4 +--
 ...rowser-toolbar-top-ToolbarPhone.java.patch |  4 +--
 ...owser-toolbar-top-ToolbarTablet.java.patch |  2 +-
 ...cing-settings-DeveloperSettings.java.patch |  2 +-
 ...tings-TracingCategoriesSettings.java.patch |  2 +-
 ...racing-settings-TracingSettings.java.patch |  2 +-
 patches/chrome-app-BUILD.gn.patch             |  2 +-
 patches/chrome-browser-BUILD.gn.patch         |  4 +--
 ...e-autocomplete_classifier_factory.cc.patch |  2 +-
 ...hrome-browser-browser_process_impl.h.patch |  2 +-
 ...er-extensions-extension_management.h.patch |  4 +--
 ...owser-extensions-extension_service.h.patch |  4 +--
 ...ser-extensions-extension_tab_util.cc.patch |  4 +--
 ...flags-android-chrome_feature_list.cc.patch |  4 +--
 ...e_metrics_services_manager_client.cc.patch |  2 +-
 ...-notification_platform_bridge_mac.mm.patch |  6 ++---
 ...hrome-browser-prefs-browser_prefs.cc.patch |  6 ++---
 ...-browser-resources-settings-BUILD.gn.patch |  2 +-
 ...ettings-people_page-people_page.html.patch |  4 +--
 ...cy_page-personalization_options.html.patch | 16 ++++++------
 ...vacy_page-personalization_options.js.patch | 10 +++----
 ...tings-privacy_page-privacy_page.html.patch | 26 +++++++++----------
 ...-settings-site_settings-constants.js.patch |  2 +-
 ...ings-site_settings-site_details.html.patch |  4 +--
 ..._settings_page-site_settings_page.js.patch | 18 ++++++-------
 ...chrome-browser-themes-theme_helper.h.patch |  2 +-
 patches/chrome-browser-ui-BUILD.gn.patch      |  6 ++---
 ...rome-browser-ui-browser_navigator.cc.patch |  2 +-
 ...tings-content_setting_image_model.cc.patch |  4 +--
 ...rtup-startup_browser_creator_impl.cc.patch |  4 +--
 ...chrome_location_bar_model_delegate.h.patch |  4 +--
 ...ws-profiles-profile_menu_view_base.h.patch |  4 +--
 ...s-translate-translate_bubble_view.cc.patch |  2 +-
 ...-chrome_web_ui_controller_factory.cc.patch |  4 +--
 ...ttings_localized_strings_provider.cc.patch |  4 +--
 patches/chrome-common-BUILD.gn.patch          |  2 +-
 ...hrome-install_static-install_util.cc.patch |  6 ++---
 ...hrome-installer-mac-signing-model.py.patch |  4 +--
 ...hrome-installer-mac-signing-parts.py.patch |  6 ++---
 ...me-installer-mac-signing-pipeline.py.patch |  4 +--
 patches/chrome-test-BUILD.gn.patch            |  4 +--
 .../chrome-test-base-testing_profile.cc.patch |  4 +--
 patches/chrome-utility-BUILD.gn.patch         |  4 +--
 ...nternal-common-download_item_impl.cc.patch |  2 +-
 .../components-omnibox-browser-BUILD.gn.patch |  4 +--
 ...ox-browser-autocomplete_controller.h.patch |  4 +--
 ...mnibox-browser-omnibox_edit_model.cc.patch |  4 +--
 ...-core-db-v4_protocol_manager_util.cc.patch |  2 +-
 ...ser-frame_host-navigation_request.cc.patch |  4 +--
 ...nt-public-test-browser_test_utils.cc.patch |  2 +-
 ...ntent-renderer-render_thread_impl.cc.patch |  2 +-
 patches/extensions-browser-BUILD.gn.patch     |  4 +--
 ...nsions-browser-sandboxed_unpacker.cc.patch |  4 +--
 ...-blink-key_system_config_selector.cc.patch |  2 +-
 ...-chromium_bindings_configuration.gni.patch |  2 +-
 patches/net-BUILD.gn.patch                    |  2 +-
 patches/net-cookies-canonical_cookie.cc.patch |  6 ++---
 ...nfigured_proxy_resolution_service.cc.patch |  2 +-
 ...-url_request-url_request_http_job.cc.patch |  4 +--
 ...e_manager-sandbox-win-sandbox_win.cc.patch |  4 +--
 ...d_party-blink-renderer-core-BUILD.gn.patch |  2 +-
 ...-canvas-canvas_async_blob_creator.cc.patch |  2 +-
 ...arty-blink-renderer-modules-BUILD.gn.patch |  4 +--
 ...nderer-modules-modules_idl_files.gni.patch |  4 +--
 ...tools-gritsettings-resource_ids.spec.patch |  4 +--
 patches/ui-base-BUILD.gn.patch                |  4 +--
 patches/ui-native_theme-native_theme.h.patch  |  4 +--
 .../ui-native_theme-native_theme_win.cc.patch |  2 +-
 ...es-cr_elements-shared_style_css.html.patch |  2 +-
 ...ces-cr_elements-shared_vars_css.html.patch |  2 +-
 106 files changed, 221 insertions(+), 221 deletions(-)

diff --git a/patches/build-android-bytecode-BUILD.gn.patch b/patches/build-android-bytecode-BUILD.gn.patch
index f1bf94db307f..6cbbf4a80c02 100644
--- a/patches/build-android-bytecode-BUILD.gn.patch
+++ b/patches/build-android-bytecode-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn
-index 5d651d29e795f8116fedcf6b7370bcdcefef0ee9..9e3546ada8e63301a91bfaf0699f50fd860bff52 100644
+index 7a9d3044259a3f7dfca7de1acaf075797bd9cc47..bf9bda47d146461d3d9fa24dd8341abc9e6cd2e7 100644
 --- a/build/android/bytecode/BUILD.gn
 +++ b/build/android/bytecode/BUILD.gn
-@@ -16,6 +16,7 @@ java_binary("java_bytecode_rewriter") {
+@@ -15,6 +15,7 @@ java_binary("java_bytecode_rewriter") {
      "java/org/chromium/bytecode/ThreadAssertionClassAdapter.java",
      "java/org/chromium/bytecode/TypeUtils.java",
    ]
diff --git a/patches/build-android-bytecode-java-org-chromium-bytecode-ByteCodeProcessor.java.patch b/patches/build-android-bytecode-java-org-chromium-bytecode-ByteCodeProcessor.java.patch
index b0a9038d742e..ab9f5421688a 100644
--- a/patches/build-android-bytecode-java-org-chromium-bytecode-ByteCodeProcessor.java.patch
+++ b/patches/build-android-bytecode-java-org-chromium-bytecode-ByteCodeProcessor.java.patch
@@ -1,8 +1,8 @@
 diff --git a/build/android/bytecode/java/org/chromium/bytecode/ByteCodeProcessor.java b/build/android/bytecode/java/org/chromium/bytecode/ByteCodeProcessor.java
-index 2a4d08a8269b678e778f8d80b408368872d3f43e..7a3c9f97274da574987b47928411927b482c49f9 100644
+index 485a42ddb1018af868612cb193023068ea10241b..941a37614078d9ac91bb6d1a616156525fdcd0e3 100644
 --- a/build/android/bytecode/java/org/chromium/bytecode/ByteCodeProcessor.java
 +++ b/build/android/bytecode/java/org/chromium/bytecode/ByteCodeProcessor.java
-@@ -136,6 +136,7 @@ class ByteCodeProcessor {
+@@ -131,6 +131,7 @@ class ByteCodeProcessor {
              chain = new CustomResourcesClassAdapter(
                      chain, reader.getClassName(), reader.getSuperName(), sFullClassPathClassLoader);
          }
diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch
index b2fe83a5847a..928afc7a471b 100644
--- a/patches/build-config-BUILDCONFIG.gn.patch
+++ b/patches/build-config-BUILDCONFIG.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index 11e0a21820f34ac99bc2e9322e0c8bd1314045c3..00551aeda7608149bfeff95587fb1cb7c8cc0b85 100644
+index 6f5d5f123f89c5ef4dd601eddb6025bd4dc3b9ab..c0acd817d30aa9ad98063b3b10c56e685e501058 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
 @@ -419,6 +419,7 @@ set_sources_assignment_filter(sources_assignment_filter)
diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch
index 574fe434b241..eb6217ebabb7 100644
--- a/patches/build-config-android-config.gni.patch
+++ b/patches/build-config-android-config.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/config.gni b/build/config/android/config.gni
-index ccec0f165678faf53471eeef4bd223146a0c5593..d527eb75806d260cb5131ad593b78eaa18d8d37d 100644
+index afa18677326c63f455b7400fffb13005dfa2c89f..8f246f144848f31faebc41b74b89ad69f3087268 100644
 --- a/build/config/android/config.gni
 +++ b/build/config/android/config.gni
 @@ -3,6 +3,7 @@
diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch
index 9730d048f55c..ec1a80c985b5 100644
--- a/patches/build-config-android-rules.gni.patch
+++ b/patches/build-config-android-rules.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
-index 899444d305628ff802bd24e647b907feefcce17a..9c587fe3e7c4a5132748187d304902b7f6f52eb1 100644
+index 13a9631c10a7f763bffdf42e9c4009700076e83c..9d101093d61b134047c803b4155260f0f03cd024 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
 @@ -513,6 +513,7 @@ if (enable_java_templates) {
diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch
index 95c3b145afc8..13300fa36515 100644
--- a/patches/chrome-android-BUILD.gn.patch
+++ b/patches/chrome-android-BUILD.gn.patch
@@ -1,16 +1,16 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 9b03adc50dce38eee225deaa1ec112388f70cabd..f04a6cf15bc4929579f73c2456d6d7a867930fd5 100644
+index 4afefa2041966ad0f881a4f857ca9f45898fe254..03527fa89f2eba7f6607b8d86755c8477448f41e 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -196,6 +196,7 @@ android_resources("chrome_app_java_resources") {
      "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-     "//third_party/android_deps:com_android_support_design_java",
+     "//third_party/android_deps:com_google_android_material_material_java",
    ]
 +  deps += brave_chrome_app_java_resources_deps resource_dirs += brave_chrome_app_java_resources_dirs
    custom_package = "org.chromium.chrome"
  }
  
-@@ -444,6 +445,7 @@ android_library("chrome_java") {
+@@ -445,6 +446,7 @@ android_library("chrome_java") {
    ]
  
    deps += feed_deps
@@ -18,7 +18,7 @@ index 9b03adc50dce38eee225deaa1ec112388f70cabd..f04a6cf15bc4929579f73c2456d6d7a8
  
    srcjar_deps = [
      ":chrome_android_java_enums_srcjar",
-@@ -489,6 +491,7 @@ android_library("chrome_java") {
+@@ -490,6 +492,7 @@ android_library("chrome_java") {
      "//content/public/browser:contacts_picker_properties_requested_javagen",
      "//net:effective_connection_type_java",
    ]
@@ -26,7 +26,7 @@ index 9b03adc50dce38eee225deaa1ec112388f70cabd..f04a6cf15bc4929579f73c2456d6d7a8
  
    android_manifest_for_lint = chrome_public_android_manifest
  
-@@ -596,6 +599,7 @@ group("jni_headers") {
+@@ -597,6 +600,7 @@ group("jni_headers") {
      "//chrome/browser/ui/android/favicon:jni_headers",
      "//chrome/browser/util:jni_headers",
    ]
@@ -34,7 +34,7 @@ index 9b03adc50dce38eee225deaa1ec112388f70cabd..f04a6cf15bc4929579f73c2456d6d7a8
  }
  
  action("chrome_android_java_google_api_keys_srcjar") {
-@@ -1506,6 +1510,7 @@ if (current_toolchain == default_toolchain) {
+@@ -1515,6 +1519,7 @@ if (current_toolchain == default_toolchain) {
          ":${_variant}_locale_pak_assets",
          ":${_variant}_paks",
        ]
diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch
index f6e97c7e2641..86913d987c05 100644
--- a/patches/chrome-android-chrome_java_sources.gni.patch
+++ b/patches/chrome-android-chrome_java_sources.gni.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
-index 35a702981dfb70eea12b112afa569cc2bbfb2c70..85d51e01dff87b6dd0cd2fae356f8bf0149b2264 100644
+index f8adec862e78f7b4cd18eb5296504c7d5468ae8e..9efd1b591880e40b69c21ee9f8f4bdbaf509ef9d 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1875,3 +1875,4 @@ chrome_java_sources = [
+@@ -1884,3 +1884,4 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/widget/bottomsheet/EmptyBottomSheetObserver.java",
    "java/src/org/chromium/chrome/browser/widget/bottomsheet/TouchRestrictingFrameLayout.java",
  ]
diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch
index 05b49efd03e8..9bc2e68c928c 100644
--- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch
+++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
-index a270ad9afc748f710582866a3c8018690d528722..467160e51d92be444d275a0bc77d7d4ceb4b4228 100644
+index e4d85aef1f6cc306092623326af82c30f209441d..8ec2a7ed54917697366a81471d6f35d66b68d7fc 100644
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
 @@ -258,6 +258,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
diff --git a/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch b/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch
index 8859e3e0fd61..691a39c600f4 100644
--- a/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch
+++ b/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/res/layout/toolbar_tablet.xml b/chrome/android/java/res/layout/toolbar_tablet.xml
-index 8367e2e163cbef9be4b6d381833ce844b334f5f3..918cff5e69c0eb86e8e6009a18f0fa011ed59251 100644
+index 5b19fd620a476472de82e3c37b0b226d10225e42..43c8507862bd05369da1ad14889c82d0e4e719fa 100644
 --- a/chrome/android/java/res/layout/toolbar_tablet.xml
 +++ b/chrome/android/java/res/layout/toolbar_tablet.xml
 @@ -58,7 +58,7 @@
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch
index 8f4f85b87b39..5974e8b7eda5 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
-index 7b4cd6251dee243fbc05166488170984f51ac52c..9e566d7aec63e6d5114443164658781df30709cf 100644
+index e5afa6ddcf94e87f82a80cffae8ba6c6f5f7b7aa..7d5d5b05886fec15e2a3e8b8e581f7c524e2fd04 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
 @@ -80,7 +80,7 @@ public abstract class AppHooks {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
index 30c290fb376c..8e10cb1e21b0 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-index ae9f5ce8953f367917748c3013e7d9cf910675e5..5c2e0b24c1d10d394a35f13808b6827e23920d22 100644
+index 8fd4f00557ac71fb86e7ce6ae3b6a00dd24d2589..6a4175eb49d16103164f636f3a602d2bc906d1c2 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -177,7 +177,7 @@ import java.util.Locale;
+@@ -178,7 +178,7 @@ import java.util.Locale;
   * are accessible via a chrome specific tab switching UI.
   */
  public class ChromeTabbedActivity
@@ -11,7 +11,7 @@ index ae9f5ce8953f367917748c3013e7d9cf910675e5..5c2e0b24c1d10d394a35f13808b6827e
      private static final String TAG = "ChromeTabbedActivity";
  
      private static final String HELP_URL_PREFIX = "https://support.google.com/chrome/";
-@@ -1571,7 +1571,7 @@ public class ChromeTabbedActivity
+@@ -1576,7 +1576,7 @@ public class ChromeTabbedActivity
  
      @Override
      public AppMenuPropertiesDelegate createAppMenuPropertiesDelegate() {
@@ -20,7 +20,7 @@ index ae9f5ce8953f367917748c3013e7d9cf910675e5..5c2e0b24c1d10d394a35f13808b6827e
                  getMultiWindowModeStateDispatcher(), getTabModelSelector(), getToolbarManager(),
                  getWindow().getDecorView(), this,
                  mOverviewModeController.mOverviewModeBehaviorSupplier,
-@@ -1595,9 +1595,9 @@ public class ChromeTabbedActivity
+@@ -1600,9 +1600,9 @@ public class ChromeTabbedActivity
                  }
              };
          }
@@ -32,7 +32,7 @@ index ae9f5ce8953f367917748c3013e7d9cf910675e5..5c2e0b24c1d10d394a35f13808b6827e
                          tabDelegateFactorySupplier, true, overviewNTPCreator));
      }
  
-@@ -1974,7 +1974,7 @@ public class ChromeTabbedActivity
+@@ -1979,7 +1979,7 @@ public class ChromeTabbedActivity
          }
      }
  
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-AboutChromeSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-AboutChromeSettings.java.patch
index aecbe6eed182..675d52cc9720 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-AboutChromeSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-AboutChromeSettings.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
-index 2ec63dba837e33bb1fa7bfb07b104b34edca15a6..47246de7cb90698b41e81e199e2e5980c9248b81 100644
+index c12b88f7bd4cf7511382f4ae002a8d5d731b02d7..629d22a792ae10388419675120f6d36d4bdb58ea 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
 @@ -25,7 +25,7 @@ import java.util.Calendar;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-LegalInformationSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-LegalInformationSettings.java.patch
index 5bb0bfe7d167..0bec510bb03b 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-LegalInformationSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-about_settings-LegalInformationSettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java
-index e1ad179731c8fa19f16e043f5c5785585c666615..a8aa05b2758ba4dad207dd0d1102f5434d8b1cff 100644
+index 311d83081767b6fe6582480a6818bc76ebecf2c0..14d0a89891c0ae13d656f6f1469172f0484250c8 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java
-@@ -14,7 +14,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+@@ -14,7 +14,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
  /**
   * Fragment to display legal information about Chrome.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-accessibility-settings-AccessibilitySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-accessibility-settings-AccessibilitySettings.java.patch
index 79dc913b65ab..9767efd5dd7e 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-accessibility-settings-AccessibilitySettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-accessibility-settings-AccessibilitySettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-index ab40f6d41f27a0e7c27d6067501a7d2428d2e272..32216156145ddbcc42bd90904534c6e2c9d03dc8 100644
+index 0c4fd9a970b67f549dd443934d5448972821a38c..4af3111b88461da07d99a0f85bd6193dfba39d26 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-@@ -26,7 +26,7 @@ import org.chromium.chrome.browser.util.AccessibilityUtil;
+@@ -26,7 +26,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
   * Fragment to keep track of all the accessibility related preferences.
   */
  public class AccessibilitySettings
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AndroidPaymentAppsFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AndroidPaymentAppsFragment.java.patch
index 938dc5a59d8b..09d8f93bb800 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AndroidPaymentAppsFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AndroidPaymentAppsFragment.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppsFragment.java
-index 178be18639bf862d6292995d4e8fb0da008c7d7d..3447e61e8d57cf018cb283e33aacfa9bc16b76b0 100644
+index b4c1ed38f0ca5381ef408a5e3930a4cb37579941..3dd400eeacffe4599968143ae66125484da8b87b 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppsFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppsFragment.java
 @@ -27,7 +27,7 @@ import java.util.Map;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillPaymentMethodsFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillPaymentMethodsFragment.java.patch
index 55a13e0722ea..366e2e1ae0c7 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillPaymentMethodsFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillPaymentMethodsFragment.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java
-index be9ceae4670c54c767810ba5c35de76592658ec2..e4af5f1ec0b2e7da878abc83e7775826f34e8cd2 100644
+index 314e7b3ea90ee9b10a94b98c973a02f6d18933a1..6acc65331dd44b5332914be4df19e4d6f10f46d9 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java
-@@ -31,7 +31,7 @@ import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
+@@ -31,7 +31,7 @@ import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
   * payment apps.
   * TODO(crbug.com/949269): Add tests for AutofillProfilesFragment.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillProfilesFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillProfilesFragment.java.patch
index 9d0765f10706..68e06f1bf0a0 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillProfilesFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillProfilesFragment.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java
-index 3ce7b2a9a1c48c6b2034de2e911fa98602597c28..bb4733eb98e0a5c170b8388870ac9f4b37c804b4 100644
+index b01096b84918d8f30153270f3f9eeda7969f0ec5..d3c412581c3c6adb10005dd684f18b78d17a72f0 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java
-@@ -30,7 +30,7 @@ import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
+@@ -30,7 +30,7 @@ import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  /**
   * Autofill profiles fragment, which allows the user to edit autofill profiles.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillServerProfileFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillServerProfileFragment.java.patch
index 26181b956fe0..aaf327bf2eb0 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillServerProfileFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-autofill-settings-AutofillServerProfileFragment.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerProfileFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerProfileFragment.java
-index a7fdf7ddabf20512299c27116f0fe883227b3618..c72054d5e1ef0a836709aa13f401f1c07c38cf4b 100644
+index 56d353f7fc8992ddd491333f412f33ee892816f2..a56ab72341907effeb82790e3863804a9f91c906 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerProfileFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerProfileFragment.java
-@@ -21,7 +21,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+@@ -21,7 +21,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
   * Fragment for settings page that allows user to view and edit a single server-provided address.
   */
  public class AutofillServerProfileFragment
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkEditActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkEditActivity.java.patch
index 2da5dde40896..5aa89cc56a6a 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkEditActivity.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-bookmarks-BookmarkEditActivity.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java
-index ddad1aaabedab67882bb5236a74c4a9f8ad1d49f..be0db3e531410b0c5158dd22e8a7dc728cd60efd 100644
+index 978407aeba7de3bd394762e4ca8964df4b0647b2..a5ac285bac31cb4f616e66292fe88e6e890b8852 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java
 @@ -141,6 +141,7 @@ public class BookmarkEditActivity extends SynchronousInitializationActivity {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-contextualsearch-ContextualSearchPreferenceFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextualsearch-ContextualSearchPreferenceFragment.java.patch
index ebb20ae5f3fc..ae132fae1179 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-contextualsearch-ContextualSearchPreferenceFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextualsearch-ContextualSearchPreferenceFragment.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
-index 01bfe957125184b797c75923bba9b700634b91bb..026553ab1ab77d5d2bf971f5af0a5332568a0e05 100644
+index 31cfa8aa6f5c65a31edafdde3bb3be4d28504807..34073507597b629bca655e523fd10b2c5e5d0a22 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
-@@ -17,7 +17,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+@@ -18,7 +18,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
  /**
   * Fragment to manage the Contextual Search preference and to explain to the user what it does.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch
index 52b4f449c54f..a758fd3a18b0 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-datareduction-settings-DataReductionPreferenceFragment.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java
-index a076bf7aa4b027d95d8c51f2881d42cd2d92340c..34b740df6fdb04c634098e14372461f1734db901 100644
+index fc53fd37f25f8a0b87891fdabb131e51da3ab294..4c2afc95223142929c4e1fbeb0af10517e026e5c 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java
-@@ -34,7 +34,7 @@ import java.util.Locale;
+@@ -35,7 +35,7 @@ import java.util.Locale;
  /**
   * Settings fragment that allows the user to configure Data Saver.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-download-settings-DownloadSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-download-settings-DownloadSettings.java.patch
index e88f485b4b6a..4c3f983ba65e 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-download-settings-DownloadSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-download-settings-DownloadSettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadSettings.java
-index faeccca2a91787e73facdbb1ad3dfd5ee9db3136..45a607aae34c49273bd1c25dc07d876636e16138 100644
+index 3b288e2021a4f26751765606871a17789ac0b0bb..6bc724d84588e0a8ad9f18efd8a9f122c96550a3 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadSettings.java
-@@ -21,7 +21,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+@@ -21,7 +21,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
   * Fragment containing Download settings.
   */
  public class DownloadSettings
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch
index 6664b3f53a8c..4512ca68e239 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
-index 22d84ffee1a4f8ce2e0bf35bab19e08fe627555b..a0f99c076d3249e166235235a662a039374415e9 100644
+index ef7577585a0f8d93f314082da8e391e929951709..edf17944d8a7dfc2940c8d5c315427006bc94690 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
-@@ -23,7 +23,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+@@ -24,7 +24,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
   * seamlessly find and manage their languages preferences across platforms.
   */
  public class LanguageSettings
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-night_mode-settings-ThemeSettingsFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-night_mode-settings-ThemeSettingsFragment.java.patch
index 3591c46d1208..2b0f272ce0f8 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-night_mode-settings-ThemeSettingsFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-night_mode-settings-ThemeSettingsFragment.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragment.java
-index 17dc8a46660b23c549a89036039648e5f2eece7a..b08bd19f311e0a70bdb8880ed445dff9e92cadba 100644
+index 02a30988975722a372af4fef4259e668a69ecf32..b181b63649d193355639ac03f0e2e3d2cba35de2 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragment.java
 @@ -23,7 +23,7 @@ import org.chromium.ui.UiUtils;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-settings-NotificationSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-settings-NotificationSettings.java.patch
index 5464be231633..3fa9177713a1 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-settings-NotificationSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-settings-NotificationSettings.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/settings/NotificationSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/settings/NotificationSettings.java
-index d1bfeebc3f07156937a9989e2098dbb13ba19349..904af8a216189481e336d857c7806c61cbbdc73f 100644
+index bdb3f61b7aca3a8f11969c2bb64b96e509f9c3ed..4b3a49b3d48de244dc3f790186710e77c6457c20 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/settings/NotificationSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/settings/NotificationSettings.java
 @@ -27,7 +27,7 @@ import org.chromium.components.content_settings.ContentSettingsType;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch
index 14f8b048e892..67ef2d7216f0 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
-index b161fde9714c8780d223dcd5316f158f1aa67834..7fb5552ebf321828422392a2cd8453af4305d76d 100644
+index 480e1d231b5e311270d529298a29145971af62cc..238eb0021d848943fd166794a9431fab9ffc3a20 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
 @@ -73,7 +73,7 @@ import org.chromium.ui.vr.VrModeObserver;
@@ -20,7 +20,7 @@ index b161fde9714c8780d223dcd5316f158f1aa67834..7fb5552ebf321828422392a2cd8453af
      private SiteSectionViewHolder mSiteSectionViewHolder;
      private ImageView mVoiceSearchButton;
      private View mTileGridPlaceholder;
-@@ -427,7 +427,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -430,7 +430,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
                  1f);
      }
  
@@ -29,7 +29,7 @@ index b161fde9714c8780d223dcd5316f158f1aa67834..7fb5552ebf321828422392a2cd8453af
          mSiteSectionView = SiteSection.inflateSiteSection(this);
          ViewGroup.LayoutParams layoutParams = mSiteSectionView.getLayoutParams();
          layoutParams.width = ViewGroup.LayoutParams.WRAP_CONTENT;
-@@ -792,7 +792,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -795,7 +795,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
          }
      }
  
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch
index e7917c330292..6f7d3e93c108 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-index 0177e1b9e136160ec32c767ad838ea1c9c02ff1e..6376fc7977b5a4064695933e6b25385a1123707c 100644
+index d80a25e4017dfc9c9d87d1fc91543ac8de601f13..99445b0d3a0c1ce6f3fbcbe4c36489d8398476e3 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-@@ -49,7 +49,7 @@ import java.util.Locale;
+@@ -50,7 +50,7 @@ import java.util.Locale;
   * to view saved passwords (just the username and URL), and to delete saved passwords.
   */
  public class PasswordSettings
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-DoNotTrackSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-DoNotTrackSettings.java.patch
index 9eec77d40d5f..99c85fe506b3 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-DoNotTrackSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-DoNotTrackSettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java
-index 05623db77d25fbe1e838ab39b0f9c5d2bd997fe5..03caf98ad19cdfcc607c59044e1e906adb5ee4b8 100644
+index ce1e70ab28a2c9d0be46f51fe1a28d7299b2390a..8f015f4f29c268244d5cc8d29f52d43a951275ab 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java
-@@ -17,7 +17,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
+@@ -17,7 +17,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
  /**
   * Fragment to manage 'Do Not Track' preference and to explain to the user what it does.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch
index bb88209e30fe..a5596963abdc 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-index 06286383530f278f71411cf84317b358fedd4727..5e6647d85442d259ed1a8c7c7994cb8db604f71d 100644
+index 6de2a5a56a313ae3e9c5fd6d106c16c6db357c8d..019b118cfded04a66a3ae026afe6f6c42607cefa 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -33,7 +33,7 @@ import org.chromium.ui.text.SpanApplier;
+@@ -34,7 +34,7 @@ import org.chromium.ui.text.SpanApplier;
   * Fragment to keep track of the all the privacy related preferences.
   */
  public class PrivacySettings
@@ -11,7 +11,7 @@ index 06286383530f278f71411cf84317b358fedd4727..5e6647d85442d259ed1a8c7c7994cb8d
      private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
      private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
      private static final String PREF_USAGE_STATS = "usage_stats_reporting";
-@@ -147,6 +147,7 @@ public class PrivacySettings
+@@ -148,6 +148,7 @@ public class PrivacySettings
      @Override
      public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
          menu.clear();
@@ -19,7 +19,7 @@ index 06286383530f278f71411cf84317b358fedd4727..5e6647d85442d259ed1a8c7c7994cb8d
          MenuItem help =
                  menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help);
          help.setIcon(VectorDrawableCompat.create(
-@@ -161,6 +162,6 @@ public class PrivacySettings
+@@ -162,6 +163,6 @@ public class PrivacySettings
                      null);
              return true;
          }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch
index 9b71dd16402e..eedde543f9a5 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
-index 2f63df74c7a7444f81945854bebffb69db5cfa00..42102b76be4015d5ca216e19fc3f64af73076c78 100644
+index 41d1d92745aaaf27f0407c025a5dd6aaba4b68fd..cb0e4bd87d43f1b85de9bbfd7a0fe8e632d9b6c8 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
-@@ -41,7 +41,7 @@ import java.util.Map;
+@@ -44,7 +44,7 @@ import java.util.Map;
  /**
   * The main settings screen, shown when the user first opens Settings.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch
index fbc21b6f9259..22382c54a9a7 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
-index 92505eebfeb70fd4d1756887688d05996c4321f7..10c860e4a0cab72b57540c925e769a1630ec2fc3 100644
+index fadfd3159018b2be5af4d039a3559f9a03e3c391..b1e43e4096cbbb9e819f7275c7547bc390e2b813 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
 @@ -28,7 +28,7 @@ import org.chromium.components.url_formatter.UrlFormatter;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch
index aa8c38e8dece..1ae2b0142f01 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-AccountManagementFragment.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java
-index c2491e3f3bc6e3208da1f1fce3e3d8aada52402f..b23547991bf20f34b8534f961debe79c201c1029 100644
+index f6f73b76cb58382fc5fe0be3d07737c0fe7a59eb..d48957c080c63aad18dc5d8a5f4a9777454a60ec 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java
-@@ -63,7 +63,7 @@ import java.util.List;
+@@ -65,7 +65,7 @@ import java.util.List;
   *
   * Note: This can be triggered from a web page, e.g. a GAIA sign-in page.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
index b3d71098f25e..8f7548f3ce53 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
-index ed809da44a2ce090b3a925484a409958206f403b..df079bd2e8582a83105e5276947368b6ec626451 100644
+index df17ffb0581f4329b34d2a79819aafb0a8a03829..bd7883b677d3eddc5cf7e89a5fd2635a77b95c27 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
 @@ -51,7 +51,7 @@ import java.util.Set;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch
index c9872147bb29..c89000a5b3df 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
-index d022999465f0e674ffc8b9c3ce821089932e5112..29da932f759716fd8bc8736f86e084dc7f2c686e 100644
+index 8657d6a07e6d64e668052f3f790e3e51bbeeebdb..027ce617146dbd16ba7f0b6916efc5ab20d39329 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
-@@ -73,7 +73,7 @@ import org.chromium.ui.widget.ButtonCompat;
+@@ -74,7 +74,7 @@ import org.chromium.ui.widget.ButtonCompat;
  /**
   * Settings fragment to enable Sync and other services that communicate with Google.
   */
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
index 2a4fb47aa0c5..b05b448628df 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-index f1b5eec21633f3c75567d12ceb54f02ce3be6906..32a5df30fa8b1f7eeee814c77492f497cea862d7 100644
+index 5049e6ee153005f5035d29895385d265d1064377..9c59ad568efc1edee123eb4caa25ffa5734fedbf 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -1649,6 +1649,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
+@@ -1674,6 +1674,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
          boolean editingAllowed = currentTab == null || mBookmarkBridge == null
                  || mBookmarkBridge.isEditBookmarksEnabled();
          mToolbar.updateBookmarkButton(isBookmarked, editingAllowed);
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
index c554c0d6e1c8..c0d40a882894 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
@@ -1,17 +1,17 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
-index c7531b702b2a2e5b966af50ce97409a62a78efef..fca795089f42b922cddbfb66b5065eafc440c404 100644
+index 949ac0ed0ac7d0c2b5ebcbc628e60d7e8d2d6e08..79e88e544c9d45a2eb2c219ffcf5ffe7d50f8df3 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
-@@ -43,7 +43,7 @@ class BottomToolbarCoordinator {
-             new CachedMetrics.ActionEvent("MobileToolbarOmniboxAcceleratorTap");
- 
+@@ -39,7 +39,7 @@ import org.chromium.components.feature_engagement.Tracker;
+  */
+ class BottomToolbarCoordinator {
      /** The browsing mode bottom toolbar component */
 -    private final BrowsingModeBottomToolbarCoordinator mBrowsingModeCoordinator;
 +    protected final BrowsingModeBottomToolbarCoordinator mBrowsingModeCoordinator;
  
      /** The tab switcher mode bottom toolbar component */
      private TabSwitcherBottomToolbarCoordinator mTabSwitcherModeCoordinator;
-@@ -55,8 +55,8 @@ class BottomToolbarCoordinator {
+@@ -51,8 +51,8 @@ class BottomToolbarCoordinator {
      private final ThemeColorProvider mThemeColorProvider;
  
      /** The overview mode manager. */
@@ -22,7 +22,7 @@ index c7531b702b2a2e5b966af50ce97409a62a78efef..fca795089f42b922cddbfb66b5065eaf
  
      /** The activity tab provider. */
      private ActivityTabProvider mTabProvider;
-@@ -103,7 +103,7 @@ class BottomToolbarCoordinator {
+@@ -99,7 +99,7 @@ class BottomToolbarCoordinator {
              setUrlBarFocusAction.onResult(LocationBar.OmniboxFocusReason.ACCELERATOR_TAP);
          };
  
@@ -31,7 +31,7 @@ index c7531b702b2a2e5b966af50ce97409a62a78efef..fca795089f42b922cddbfb66b5065eaf
                  homeButtonListener, searchAcceleratorListener, mShareButtonListenerSupplier,
                  tabsSwitcherLongClickListner);
  
-@@ -232,13 +232,16 @@ class BottomToolbarCoordinator {
+@@ -228,13 +228,16 @@ class BottomToolbarCoordinator {
  
      private void onShareDelegateAvailable(ShareDelegate shareDelegate) {
          final OnClickListener shareButtonListener = v -> {
@@ -49,7 +49,7 @@ index c7531b702b2a2e5b966af50ce97409a62a78efef..fca795089f42b922cddbfb66b5065eaf
          };
  
          mShareButtonListenerSupplier.set(shareButtonListener);
-@@ -263,4 +266,5 @@ class BottomToolbarCoordinator {
+@@ -260,4 +263,5 @@ class BottomToolbarCoordinator {
              listener.onClick(v);
          };
      }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch
index fc1bd30f9eee..b738553bdc00 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java
-index 8c96d2201c445dba9657db2ba90cb86cb7590a72..5cf8fa5d1d7fd175f92e78cce4211b36fcfff02a 100644
+index 2d5c7f94389664cdfad0e4764477043f0735bc3e..43fce29710826b322b18691dfdca43e4a5e54241 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java
-@@ -292,6 +292,7 @@ public class TabSwitcherModeTTPhone extends OptimizedFrameLayout
+@@ -291,6 +291,7 @@ public class TabSwitcherModeTTPhone extends OptimizedFrameLayout
          if (BottomToolbarVariationManager.isTabSwitcherOnBottom() && !shouldShowIncognitoToggle()) {
              mToggleTabStackButton.setVisibility(isVisible ? GONE : VISIBLE);
          }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
index 516a60a2c197..75bdf30a48e9 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
-index 7ae3dad4ca2754573c56eea9419d7347771e8fcc..4ca44c8f49452be3f4bc5a28b1e20b6beb04fd8d 100644
+index d0e312498d3e7cef40f3676d51edd22b8bc4aafe..8232e1dd1471b4c83f571aa8ad3b251fc76c1c91 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 @@ -92,7 +92,7 @@ import java.util.List;
@@ -62,7 +62,7 @@ index 7ae3dad4ca2754573c56eea9419d7347771e8fcc..4ca44c8f49452be3f4bc5a28b1e20b6b
          mUrlFocusLayoutAnimator = new AnimatorSet();
          mUrlFocusLayoutAnimator.playTogether(animators);
  
-@@ -2843,6 +2849,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -2849,6 +2855,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
  
      @Override
      public void onBottomToolbarVisibilityChanged(boolean isVisible) {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
index 54e0a53746be..d97fd811ad69 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
-index a10e0293764fcbc4fc5a981025488c241bf5be22..1ab74376505dd8e53a5ad0168874099e24dc70fe 100644
+index 1a9e11fefe426c6a4ee835bb9137d995a8ffb9f9..fd6ce1ce799db821d8b0af60a4ea9a68f566decb 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
 @@ -56,7 +56,7 @@ import java.util.Collection;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch
index 1c80d886ec97..01492cb7d53d 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
-index 6b41808d568199620aebba6afaf4ae5e24d02670..48506917906c959d41303083b902447b496725f5 100644
+index fa2221eb9f130ec4c038346c90a8ddec813e3307..55e2a594ff5c7e480f0ffd7cfe3ab62378d6b632 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
 @@ -19,7 +19,7 @@ import org.chromium.components.version_info.VersionConstants;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingCategoriesSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingCategoriesSettings.java.patch
index 2a854d6759a8..d562e30d4977 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingCategoriesSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingCategoriesSettings.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingCategoriesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingCategoriesSettings.java
-index 7df5aa0990686125a5d25dba08ed8d4ec41d2904..011045017a4777979d51a53dd7e0362feeef78d5 100644
+index 8b6b8076eac903277e05a1cb2031068efb8149d6..f6454b3ff14684883d5063cb12cc9501e13408ba 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingCategoriesSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingCategoriesSettings.java
 @@ -27,7 +27,7 @@ import java.util.Set;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingSettings.java.patch
index 3febc3fd45b2..d72eea6b12f6 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-TracingSettings.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingSettings.java
-index a8b0f537d404a2c430b9ae90c16d993d52ebb14c..56910f68bb1894f1da4c913c14005d6c3c25f310 100644
+index 3c9712ac24a74d05328b6aaafe24655b30b11c31..72356695387c55ff55dcf7c3c2d04813f4cac1f8 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingSettings.java
 @@ -30,7 +30,7 @@ import java.util.Set;
diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch
index c962a637e861..f64cf45d2ddb 100644
--- a/patches/chrome-app-BUILD.gn.patch
+++ b/patches/chrome-app-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
-index 71b39d448839289b827fc80c3dc590a06fa13da7..299dab18d9225a7ef2b5a7bf01e98b9cc66dbf90 100644
+index 1f0d35c7002e0054de4afc2b3d7036eab8935100..710c62aaadbe42db29a82773685244676f55e120 100644
 --- a/chrome/app/BUILD.gn
 +++ b/chrome/app/BUILD.gn
 @@ -73,6 +73,8 @@ grit("generated_resources") {
diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
index 01fb59873b62..9b529eed69ee 100644
--- a/patches/chrome-browser-BUILD.gn.patch
+++ b/patches/chrome-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 315b763a38e67ba9129b08060f2423d656712284..86102bd8f010d6d46dc074253b55ee616ff475dd 100644
+index c7530f3c16db14865b555a27f2c32b7f6cbd58ad..ce2aa5e970ef1b9957e3142670778fd59f9526ba 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2289,6 +2289,7 @@ jumbo_static_library("browser") {
+@@ -2296,6 +2296,7 @@ jumbo_static_library("browser") {
      "//ui/strings",
      "//ui/surface",
      "//ui/web_dialogs",
diff --git a/patches/chrome-browser-autocomplete-autocomplete_classifier_factory.cc.patch b/patches/chrome-browser-autocomplete-autocomplete_classifier_factory.cc.patch
index efb80285f29e..264507f11ce2 100644
--- a/patches/chrome-browser-autocomplete-autocomplete_classifier_factory.cc.patch
+++ b/patches/chrome-browser-autocomplete-autocomplete_classifier_factory.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
-index 7f4dd5ffd15a0ea17fb77d712897a86370da4266..52d8469ae70f38e7a3c714f4761d4172915af138 100644
+index c106fe59a239c026852617d842f2f2c1a789cb01..34b0207a815fdf71530b48a2a8664afd88ebcb00 100644
 --- a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
 +++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
 @@ -68,7 +68,12 @@ AutocompleteClassifierFactory::~AutocompleteClassifierFactory() {
diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch
index 02c9b3b8b607..96523999f7a6 100644
--- a/patches/chrome-browser-browser_process_impl.h.patch
+++ b/patches/chrome-browser-browser_process_impl.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
-index 46b91328b34cc502620fb6f5b76ed9d33bb23dfa..8703e8c71cf1701d51d260ef2de570f1961d2e0c 100644
+index 003fa2b22700ed43ccccd5bf147a2c9f2b3e01c5..e2ef3d7b40080dc11441892439338edb3295d299 100644
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
 @@ -201,6 +201,7 @@ class BrowserProcessImpl : public BrowserProcess,
diff --git a/patches/chrome-browser-extensions-extension_management.h.patch b/patches/chrome-browser-extensions-extension_management.h.patch
index a115ae66f146..8ee54910ff67 100644
--- a/patches/chrome-browser-extensions-extension_management.h.patch
+++ b/patches/chrome-browser-extensions-extension_management.h.patch
@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h
-index 49deccc26c3a0a3d051992dbf9b36623b725445a..328b2a9e9488b25de2c739d26ed3dc69e9b38990 100644
+index 7d50b4a57aa5cee47149df30ccc026dfefdc3161..def64912783c871c39aa5321b1645bd234acabdb 100644
 --- a/chrome/browser/extensions/extension_management.h
 +++ b/chrome/browser/extensions/extension_management.h
 @@ -185,6 +185,7 @@ class ExtensionManagement : public KeyedService {
-   bool is_child() const { return is_child_; }
+   bool IsChild() const { return is_child_; }
  
   private:
 +  friend class BraveExtensionManagement;
diff --git a/patches/chrome-browser-extensions-extension_service.h.patch b/patches/chrome-browser-extensions-extension_service.h.patch
index f7fb9b31d836..69fe6349617a 100644
--- a/patches/chrome-browser-extensions-extension_service.h.patch
+++ b/patches/chrome-browser-extensions-extension_service.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
-index 01fd5e3d6bfc73c60aa843ec1668111a1542124c..3488afb5b15f566a78438df0862570b8ea68bc97 100644
+index e51f6485fc17242e579809c63b104f8df42fcae6..d30d4f0232feeb76812c868c47db6fc6ceae8e9e 100644
 --- a/chrome/browser/extensions/extension_service.h
 +++ b/chrome/browser/extensions/extension_service.h
-@@ -424,6 +424,7 @@ class ExtensionService : public ExtensionServiceInterface,
+@@ -425,6 +425,7 @@ class ExtensionService : public ExtensionServiceInterface,
    }
  
   private:
diff --git a/patches/chrome-browser-extensions-extension_tab_util.cc.patch b/patches/chrome-browser-extensions-extension_tab_util.cc.patch
index b13a04eb9dda..1a347b8cb0f5 100644
--- a/patches/chrome-browser-extensions-extension_tab_util.cc.patch
+++ b/patches/chrome-browser-extensions-extension_tab_util.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
-index b9ad3a7dea2e9201535b4c6b57c21ed6fae6dc69..b5a0be1361701aa7485af8cfc42ac1542377be75 100644
+index 805b1f35c231198643f54400c75f47665f315014..68e769b2987de905c5175ed3fd1782062df156de 100644
 --- a/chrome/browser/extensions/extension_tab_util.cc
 +++ b/chrome/browser/extensions/extension_tab_util.cc
-@@ -767,6 +767,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
+@@ -795,6 +795,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
    GURL fixed_url =
        url_formatter::FixupURL(url.possibly_invalid_spec(), std::string());
    if (!fixed_url.SchemeIs(content::kChromeUIScheme))
diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
index 269826365d15..e2dbfe9bb41f 100644
--- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
+++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
-index d79112677ca4c906b9c86da87034305043852c13..dc72daf0fa5bd568cd5419334dce0f8291f3c447 100644
+index ad613737fda00315ab827c157df8b222308a8129..0e1f6403703336a7fc3189fb2f7bb6eff4289612 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -252,6 +252,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
+@@ -253,6 +253,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
  };
  
  const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
diff --git a/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch b/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch
index 9c94af4915fd..06be7db9619f 100644
--- a/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch
+++ b/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
-index c75a9c8727d566512c210297707f10262c907f01..c83aa3c92c5cbd549db8d93ba5219696fd1ebf52 100644
+index d12191e68b92ae34bfaed251e34dafc8f451c9b9..4539b046417836f8bf9c6225dc6085d8eefb4fc3 100644
 --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
 @@ -153,7 +153,7 @@ class ChromeMetricsServicesManagerClient::ChromeEnabledStateProvider
diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch
index 6df62f3868bc..c852b184a0e8 100644
--- a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch
+++ b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm
-index 51319f8111ac955c112a34e6c612ab58c3c9b473..cb01682a14784e5e62b555add6d33a0b056e99f8 100644
+index acf1849aa1b3304426fecd2ced6d547476fa8ec4..e5d6fd04af8805a48ccfd4cb7a177a9fa9103223 100644
 --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm
 +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm
-@@ -178,6 +178,7 @@ base::string16 CreateNotificationContext(
+@@ -181,6 +181,7 @@ base::string16 CreateNotificationContext(
  // an expensive call. Instead use NotificationPlatformBridgeMac::SupportsAlerts
  // which caches this value.
  bool SupportsAlertsImpl() {
@@ -10,7 +10,7 @@ index 51319f8111ac955c112a34e6c612ab58c3c9b473..cb01682a14784e5e62b555add6d33a0b
    int32_t major, minor, bugfix;
    base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
    // Allow alerts on all versions except 10.15.0, 10.15.1 & 10.15.2.
-@@ -313,6 +314,7 @@ void NotificationPlatformBridgeMac::Display(
+@@ -316,6 +317,7 @@ void NotificationPlatformBridgeMac::Display(
    } else {
      NSUserNotification* toast = [builder buildUserNotification];
      [notification_center_ deliverNotification:toast];
diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch
index a40663465f59..4f977a270d77 100644
--- a/patches/chrome-browser-prefs-browser_prefs.cc.patch
+++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 06574f36a167f7f28cfe6af007022737e17502fc..1f4ce00281e7a9d53e4bf2d22e629e1c89ac06b9 100644
+index 28441480d78191b1fd63ed9238b33b2bc6ad099a..2da182f36628c37c9cc783d801424b1cc3845005 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -819,6 +819,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -829,6 +829,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
  #if defined(TOOLKIT_VIEWS)
    RegisterBrowserViewLocalPrefs(registry);
  #endif
@@ -10,7 +10,7 @@ index 06574f36a167f7f28cfe6af007022737e17502fc..1f4ce00281e7a9d53e4bf2d22e629e1c
  
    // Obsolete. See MigrateObsoleteBrowserPrefs().
    registry->RegisterBooleanPref(kGCMChannelStatus, true);
-@@ -1083,6 +1084,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1095,6 +1096,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
  #endif
  
    RegisterProfilePrefsForMigration(registry);
diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch
index 3274d4582ae1..d2ee4abe6b01 100644
--- a/patches/chrome-browser-resources-settings-BUILD.gn.patch
+++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
-index 322c20ac2bfd315ff9c7d2dcedab385a99fda98a..0bbed59556e3642b0e0cf8ab268daaec792b771c 100644
+index e05a2589a3ee6dfaac01e41ed1f5f9df31b6cbe2..19af64fd4cf823a83f0fc0c843821d9950e0c3c2 100644
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
 @@ -34,6 +34,7 @@ if (optimize_webui) {
diff --git a/patches/chrome-browser-resources-settings-people_page-people_page.html.patch b/patches/chrome-browser-resources-settings-people_page-people_page.html.patch
index 6664889c888b..94fc29f08d77 100644
--- a/patches/chrome-browser-resources-settings-people_page-people_page.html.patch
+++ b/patches/chrome-browser-resources-settings-people_page-people_page.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
-index 7080cadeae9e73f2881060021f89085a2de0b20e..960fff03b16a2c9ff27a9530291e99ceef7d1ccf 100644
+index 96b3755acc7d81e569b41dd5c52031a4b6e14bdb..27818f38ee83f369448d6539dced20d6a0314852 100644
 --- a/chrome/browser/resources/settings/people_page/people_page.html
 +++ b/chrome/browser/resources/settings/people_page/people_page.html
 @@ -147,12 +147,14 @@
@@ -16,4 +16,4 @@ index 7080cadeae9e73f2881060021f89085a2de0b20e..960fff03b16a2c9ff27a9530291e99ce
 +-->
  
  <if expr="not chromeos">
-         <cr-link-row id="manage-google-account"
+         <template is="dom-if" if="[[signinAllowed_]]">
diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch
index 1dbc95e6c478..bd308a04f07f 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.html b/chrome/browser/resources/settings/privacy_page/personalization_options.html
-index 872970e6dcd5dc83ee4180748be4be86c6850e6d..97afb44b4316181f979a6dca88feec1d29002f9a 100644
+index dace1a9871a103be45af87a72f043c4df98cadf2..02ac6f4d338e7f7301dd5af3e38338761e0c7377 100644
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
-@@ -15,6 +15,7 @@
+@@ -16,6 +16,7 @@
  <if expr="not chromeos">
  <link rel="import" href="chrome://resources/cr_elements/cr_toast/cr_toast.html">
  </if>
@@ -10,7 +10,7 @@ index 872970e6dcd5dc83ee4180748be4be86c6850e6d..97afb44b4316181f979a6dca88feec1d
  
  <!--
   * Note: If a synced pref is added/removed from this file, the method
-@@ -35,6 +36,7 @@
+@@ -36,6 +37,7 @@
          border-top: none;
        }
      </style>
@@ -18,7 +18,7 @@ index 872970e6dcd5dc83ee4180748be4be86c6850e6d..97afb44b4316181f979a6dca88feec1d
  <if expr="not chromeos">
      <settings-toggle-button id="signinAllowedToggle"
          disabled="[[syncFirstSetupInProgress_]]"
-@@ -45,18 +47,22 @@
+@@ -46,18 +48,22 @@
          no-set-pref>
      </settings-toggle-button>
  </if><!-- not chromeos -->
@@ -41,7 +41,7 @@ index 872970e6dcd5dc83ee4180748be4be86c6850e6d..97afb44b4316181f979a6dca88feec1d
  <if expr="_google_chrome">
  <if expr="chromeos">
      <settings-toggle-button pref="{{prefs.cros.metrics.reportingEnabled}}"
-@@ -64,6 +70,8 @@
+@@ -65,6 +71,8 @@
          sub-label="$i18n{enablePersonalizationLoggingDesc}">
      </settings-toggle-button>
  </if><!-- chromeos -->
@@ -50,7 +50,7 @@ index 872970e6dcd5dc83ee4180748be4be86c6850e6d..97afb44b4316181f979a6dca88feec1d
  <if expr="not chromeos">
      <settings-toggle-button id="metricsReportingControl"
          pref="[[metricsReportingPref_]]"
-@@ -78,12 +86,14 @@
+@@ -79,12 +87,14 @@
        </template>
      </settings-toggle-button>
  </if><!-- not chromeos -->
@@ -66,7 +66,7 @@ index 872970e6dcd5dc83ee4180748be4be86c6850e6d..97afb44b4316181f979a6dca88feec1d
  <if expr="_google_chrome">
      <settings-toggle-button id="spellCheckControl"
          pref="{{prefs.spellcheck.use_spelling_service}}"
-@@ -102,6 +112,7 @@
+@@ -103,6 +113,7 @@
        </settings-toggle-button>
      </template>
  
@@ -74,7 +74,7 @@ index 872970e6dcd5dc83ee4180748be4be86c6850e6d..97afb44b4316181f979a6dca88feec1d
      <template is="dom-if" if="[[showSignoutDialog_]]" restamp>
        <settings-signout-dialog sync-status="[[syncStatus]]"
            on-close="onSignoutDialogClosed_">
-@@ -113,6 +124,7 @@
+@@ -114,6 +125,7 @@
        <div>$i18n{restartToApplyChanges}</div>
        <cr-button on-click="onRestartTap_">$i18n{restart}</cr-button>
      </cr-toast>
diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch
index d096a86f46ca..93ea7fc7289d 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.js b/chrome/browser/resources/settings/privacy_page/personalization_options.js
-index 58759f352c2558d2c2825f213c0a61d8b67ec951..1d0376d77dff2de51f351237deefabab75a60d97 100644
+index 2076807ebbf585719c5e2d25bd20c227e2ced02b..cb1aba3918609b06c25753adb162b48256478b2a 100644
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.js
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.js
-@@ -32,7 +32,7 @@ Polymer({
+@@ -34,7 +34,7 @@ Polymer({
      /** @type {settings.SyncStatus} */
      syncStatus: Object,
  
@@ -11,7 +11,7 @@ index 58759f352c2558d2c2825f213c0a61d8b67ec951..1d0376d77dff2de51f351237deefabab
      // TODO(dbeam): make a virtual.* pref namespace and set/get this normally
      // (but handled differently in C++).
      /** @private {chrome.settingsPrivate.PrefObject} */
-@@ -83,14 +83,14 @@ Polymer({
+@@ -88,14 +88,14 @@ Polymer({
    ready() {
      this.browserProxy_ = settings.PrivacyPageBrowserProxyImpl.getInstance();
  
@@ -28,7 +28,7 @@ index 58759f352c2558d2c2825f213c0a61d8b67ec951..1d0376d77dff2de51f351237deefabab
    /** @private */
    onMetricsReportingChange_() {
      const enabled = this.$.metricsReportingControl.checked;
-@@ -140,6 +140,7 @@ Polymer({
+@@ -145,6 +145,7 @@ Polymer({
    },
    // </if>
  
@@ -36,7 +36,7 @@ index 58759f352c2558d2c2825f213c0a61d8b67ec951..1d0376d77dff2de51f351237deefabab
    /**
     * @return {boolean}
     * @private
-@@ -188,6 +189,7 @@ Polymer({
+@@ -193,6 +194,7 @@ Polymer({
      }
      this.showSignoutDialog_ = false;
    },
diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
index 686fa73855c7..df0cf8e85e29 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44189388f7 100644
+index d848b6414df5999d22ec8c5cb49581b2df2d41ef..9ab0791fdc8d893a4868cfa8f248f6f79abc8d7b 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -27,6 +27,7 @@
+@@ -29,6 +29,7 @@
  <link rel="import" href="../settings_shared_css.html">
  <link rel="import" href="../site_settings/constants.html">
  
@@ -10,7 +10,7 @@ index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44
  <dom-module id="settings-privacy-page">
    <template>
      <style include="settings-shared">
-@@ -42,6 +43,7 @@
+@@ -44,6 +45,7 @@
      <settings-animated-pages id="pages" section="privacy"
          focus-config="[[focusConfig_]]">
        <div route-path="default">
@@ -18,7 +18,7 @@ index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44
          <template is="dom-if" if="[[!privacySettingsRedesignEnabled_]]" restamp>
            <cr-link-row id="clearBrowsingData"
                class="hr"
-@@ -53,6 +55,7 @@
+@@ -55,6 +57,7 @@
                label="$i18n{siteSettings}"
                sub-label="$i18n{siteSettingsDescription}"
                on-click="onSiteSettingsTap_"></cr-link-row>
@@ -26,7 +26,7 @@ index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44
            <cr-expand-button id="moreExpansion"
                alt="$i18n{privacyPageMore}"
                class="settings-box"
-@@ -61,6 +64,7 @@
+@@ -63,6 +66,7 @@
            </cr-expand-button>
            <iron-collapse id="moreCollapse" opened="[[moreOpened_]]"
                class="iron-collapse-indented">
@@ -34,7 +34,7 @@ index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44
              <settings-toggle-button id="safeBrowsingToggle"
                  class="settings-box first"
                  pref="{{prefs.safebrowsing.enabled}}"
-@@ -69,6 +73,7 @@
+@@ -71,6 +75,7 @@
                  on-settings-boolean-control-change=
                      "onSafeBrowsingToggleChange_">
              </settings-toggle-button>
@@ -42,7 +42,7 @@ index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44
              <settings-passwords-leak-detection-toggle
                  id="passwordsLeakDetectionToggle"
                  prefs="{{prefs}}"
-@@ -82,6 +87,7 @@
+@@ -84,6 +89,7 @@
                  on-settings-boolean-control-change=
                      "onSafeBrowsingReportingToggleChange_">
              </settings-toggle-button>
@@ -50,7 +50,7 @@ index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44
              <settings-do-not-track-toggle id="doNotTrack" prefs="{{prefs}}">
              </settings-do-not-track-toggle>
              <settings-toggle-button id="canMakePaymentToggle"
-@@ -118,7 +124,9 @@
+@@ -120,7 +126,9 @@
                  sub-label="$i18n{securityKeysDesc}"
                  on-click="onSecurityKeysTap_"></cr-link-row>
              </template>
@@ -60,7 +60,7 @@ index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44
          </template>
          <template is="dom-if" if="[[privacySettingsRedesignEnabled_]]" restamp>
            <cr-link-row id="clearBrowsingData"
-@@ -210,6 +218,7 @@
+@@ -212,6 +220,7 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
@@ -68,7 +68,7 @@ index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44
        <template is="dom-if" route-path="/content/backgroundSync" no-search>
          <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
-@@ -227,6 +236,7 @@
+@@ -229,6 +238,7 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
@@ -76,7 +76,7 @@ index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44
        <template is="dom-if" route-path="/content/camera" no-search>
          <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
-@@ -267,11 +277,13 @@
+@@ -270,11 +280,13 @@
                sub-option-label="$i18n{deleteDataPostSession}"
                sub-option-mode="cookies-session-only">
            </category-default-setting>
@@ -90,7 +90,7 @@ index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44
            <cr-link-row id="site-data-trigger" class="hr"
                on-click="onSiteDataTap_" label="$i18n{siteSettingsCookieLink}">
            </cr-link-row>
-@@ -361,11 +373,13 @@
+@@ -364,11 +376,13 @@
          <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
              search-term="{{searchFilter_}}">
@@ -104,7 +104,7 @@ index 8734584960efaf7e248d04ad41c1d4bd60796136..7e657c1dae7096a8a4e7785fd32bcf44
            <category-setting-exceptions
                category="{{ContentSettingsTypes.JAVASCRIPT}}"
                block-header="$i18n{siteSettingsBlock}"
-@@ -464,6 +478,19 @@
+@@ -467,6 +481,19 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.js.patch b/patches/chrome-browser-resources-settings-site_settings-constants.js.patch
index 7388cea70ad9..8d71ab54418c 100644
--- a/patches/chrome-browser-resources-settings-site_settings-constants.js.patch
+++ b/patches/chrome-browser-resources-settings-site_settings-constants.js.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/site_settings/constants.js b/chrome/browser/resources/settings/site_settings/constants.js
-index c34cdcf313c606ad69616eb67f6d572e80db947b..cdf7d1b20c1745859d5dad2b2c56038c627415e8 100644
+index 0bc63a422d1d1ca468a1222dd699d5fa9bb65d26..4cfa27279c3b54c67769a2bc9e1c0613a25ab2a7 100644
 --- a/chrome/browser/resources/settings/site_settings/constants.js
 +++ b/chrome/browser/resources/settings/site_settings/constants.js
 @@ -35,6 +35,7 @@ cr.define('settings', function() {
diff --git a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch
index 3b8252060f40..562bea9b6b78 100644
--- a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch
+++ b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html
-index b78613bc2fbb1fdf566f74bde1e7b053a52bd1ac..5bcd3af6315b9c0b617e07a8295819df5cb57ea7 100644
+index 56f45d63f5684343eb3c43d49321f0e61dcbf27b..6d93489220333fb2270b02c83a86e6aebe78bfb7 100644
 --- a/chrome/browser/resources/settings/site_settings/site_details.html
 +++ b/chrome/browser/resources/settings/site_settings/site_details.html
-@@ -237,6 +237,11 @@
+@@ -239,6 +239,11 @@
            icon="cr:extension" id="unsandboxedPlugins"
            label="$i18n{siteSettingsUnsandboxedPlugins}">
        </site-details-permission>
diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
index 775c98ab1857..1076edddb3ca 100644
--- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
+++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
-index 712a0a7f73f75108bb3f326a9ecfc67252f84a6b..8fca8551cb68264b2db30bb06b9b0721a8545856 100644
+index c02b2e5edea29fda05324be17e9b229d977f55f2..d4df50138cbbb0233ebc03a39af7918a86ca8a96 100644
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
-@@ -41,6 +41,7 @@ cr.define('settings', function() {
+@@ -27,6 +27,7 @@
      // The following list is ordered alphabetically by |id|. The order in which
      // these appear in the UI is determined elsewhere in this file.
      const categoryList = [
@@ -10,7 +10,7 @@ index 712a0a7f73f75108bb3f326a9ecfc67252f84a6b..8fca8551cb68264b2db30bb06b9b0721
        {
          route: settings.routes.SITE_SETTINGS_ADS,
          id: Id.ADS,
-@@ -51,6 +52,7 @@ cr.define('settings', function() {
+@@ -37,6 +38,7 @@
          shouldShow: () =>
              loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter'),
        },
@@ -18,7 +18,7 @@ index 712a0a7f73f75108bb3f326a9ecfc67252f84a6b..8fca8551cb68264b2db30bb06b9b0721
        {
          route: settings.routes.SITE_SETTINGS_AR,
          id: Id.AR,
-@@ -68,6 +70,15 @@ cr.define('settings', function() {
+@@ -54,6 +56,15 @@
          enabledLabel: 'siteSettingsAutoDownloadAsk',
          disabledLabel: 'siteSettingsAutoDownloadBlock',
        },
@@ -34,7 +34,7 @@ index 712a0a7f73f75108bb3f326a9ecfc67252f84a6b..8fca8551cb68264b2db30bb06b9b0721
        {
          route: settings.routes.SITE_SETTINGS_BACKGROUND_SYNC,
          id: Id.BACKGROUND_SYNC,
-@@ -76,6 +87,7 @@ cr.define('settings', function() {
+@@ -62,6 +73,7 @@
          enabledLabel: 'siteSettingsAllowRecentlyClosedSites',
          disabledLabel: 'siteSettingsBackgroundSyncBlocked',
        },
@@ -42,7 +42,7 @@ index 712a0a7f73f75108bb3f326a9ecfc67252f84a6b..8fca8551cb68264b2db30bb06b9b0721
        {
          route: settings.routes.SITE_SETTINGS_BLUETOOTH_DEVICES,
          id: Id.BLUETOOTH_DEVICES,
-@@ -353,13 +365,15 @@ cr.define('settings', function() {
+@@ -339,13 +351,15 @@
                  Id.MIC,
                  Id.SENSORS,
                  Id.NOTIFICATIONS,
@@ -59,7 +59,7 @@ index 712a0a7f73f75108bb3f326a9ecfc67252f84a6b..8fca8551cb68264b2db30bb06b9b0721
                  Id.AUTOMATIC_DOWNLOADS,
                  Id.UNSANDBOXED_PLUGINS,
                  Id.PROTOCOL_HANDLERS,
-@@ -390,7 +404,9 @@ cr.define('settings', function() {
+@@ -376,7 +390,9 @@
                Id.CAMERA,
                Id.MIC,
                Id.NOTIFICATIONS,
@@ -69,7 +69,7 @@ index 712a0a7f73f75108bb3f326a9ecfc67252f84a6b..8fca8551cb68264b2db30bb06b9b0721
              ]),
              permissionsAdvanced: buildItemListFromIds([
                Id.SENSORS,
-@@ -410,6 +426,7 @@ cr.define('settings', function() {
+@@ -396,6 +412,7 @@
                Id.VR,
              ]),
              contentBasic: buildItemListFromIds([
@@ -77,7 +77,7 @@ index 712a0a7f73f75108bb3f326a9ecfc67252f84a6b..8fca8551cb68264b2db30bb06b9b0721
                Id.COOKIES,
                Id.JAVASCRIPT,
                Id.PLUGINS,
-@@ -418,7 +435,9 @@ cr.define('settings', function() {
+@@ -404,7 +421,9 @@
              ]),
              contentAdvanced: buildItemListFromIds([
                Id.SOUND,
diff --git a/patches/chrome-browser-themes-theme_helper.h.patch b/patches/chrome-browser-themes-theme_helper.h.patch
index 785797537555..26afa0908138 100644
--- a/patches/chrome-browser-themes-theme_helper.h.patch
+++ b/patches/chrome-browser-themes-theme_helper.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/themes/theme_helper.h b/chrome/browser/themes/theme_helper.h
-index daac90c7015c7e39d32f947499a78e3960eade93..db68ca83823441f8e775bc8c5067bce92c789f6b 100644
+index 3ae127e5fe97491306ada6b97b93170b3f65ce6e..236f174c84c12b565ef3768cc7e1c2cd4acf3ed1 100644
 --- a/chrome/browser/themes/theme_helper.h
 +++ b/chrome/browser/themes/theme_helper.h
 @@ -107,6 +107,7 @@ class ThemeHelper {
diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch
index 9c1905d8a813..0f882d7b977d 100644
--- a/patches/chrome-browser-ui-BUILD.gn.patch
+++ b/patches/chrome-browser-ui-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
-index 1d04b98ce3544c8654ab321cdbef707446b584cc..33994cdbc3667172cb5491b24097fa1cdbd358fc 100644
+index 1e9de5eaa18f89b89905e1e4d567123635c20bff..4fcfb74e92e9e3514a573ab4123a603b0f5ad8cc 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -613,6 +613,9 @@ jumbo_static_library("ui") {
+@@ -607,6 +607,9 @@ jumbo_static_library("ui") {
      "//ui/webui",
      "//v8:v8_version",
    ]
@@ -12,7 +12,7 @@ index 1d04b98ce3544c8654ab321cdbef707446b584cc..33994cdbc3667172cb5491b24097fa1c
    allow_circular_includes_from +=
        [ "//chrome/browser/ui/webui/bluetooth_internals" ]
  
-@@ -2601,10 +2604,13 @@ jumbo_static_library("ui") {
+@@ -2599,10 +2602,13 @@ jumbo_static_library("ui") {
        ]
        deps += [ "//google_update" ]
      } else {
diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch
index c38962f8bf0d..0c75cc86de8a 100644
--- a/patches/chrome-browser-ui-browser_navigator.cc.patch
+++ b/patches/chrome-browser-ui-browser_navigator.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
-index 0829ab084d9e99dc4c254c993e6a63630f18d0a7..0875ef2842a252fb30dbb14c2d99a00564ba10d3 100644
+index e886606ae957c49629be262e7b06a6ed42cdf7e6..bab222f724234f9ba3cbcbe52cb1721a45e54eb5 100644
 --- a/chrome/browser/ui/browser_navigator.cc
 +++ b/chrome/browser/ui/browser_navigator.cc
 @@ -475,6 +475,7 @@ void Navigate(NavigateParams* params) {
diff --git a/patches/chrome-browser-ui-content_settings-content_setting_image_model.cc.patch b/patches/chrome-browser-ui-content_settings-content_setting_image_model.cc.patch
index 739b16b1336d..7157afdd8556 100644
--- a/patches/chrome-browser-ui-content_settings-content_setting_image_model.cc.patch
+++ b/patches/chrome-browser-ui-content_settings-content_setting_image_model.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc
-index de103df3af778629eb7b0824ea774d89163edb05..6eae12cfcb9c7c8938994f1e1579b933d17b03ba 100644
+index acd86aa0e13cde7040321aec8ff2cb72b7823655..a4260bd797c35bf6c41247dc34dda58039fc9065 100644
 --- a/chrome/browser/ui/content_settings/content_setting_image_model.cc
 +++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc
 @@ -11,6 +11,7 @@
@@ -10,7 +10,7 @@ index de103df3af778629eb7b0824ea774d89163edb05..6eae12cfcb9c7c8938994f1e1579b933
  #include "build/build_config.h"
  #include "chrome/app/vector_icons/vector_icons.h"
  #include "chrome/browser/browser_process.h"
-@@ -971,6 +972,9 @@ ContentSettingImageModel::GenerateContentSettingImageModels() {
+@@ -975,6 +976,9 @@ ContentSettingImageModel::GenerateContentSettingImageModels() {
    std::vector<std::unique_ptr<ContentSettingImageModel>> result;
    for (auto type : kContentSettingImageOrder)
      result.push_back(CreateForContentType(type));
diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
index 0b9c02a37839..f9d0c93d8fcd 100644
--- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
+++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-index d07c15d04d24b370328b72118d6c23527b39c2c3..88a95ac6f4e83479f99b409350672af554841fbf 100644
+index 729221503fabdbe9d9b4564562cb16e263433908..de8a4e4d3bef77c12709d5e26f22b762a0ed59ff 100644
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -662,6 +662,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
+@@ -665,6 +665,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
    welcome_enabled =
        welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_);
  #endif  // !defined(OS_CHROMEOS)
diff --git a/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch b/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch
index 37e862624ce9..e4112e4d6f7e 100644
--- a/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch
+++ b/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h
-index 2def55dd4b5c24de1bc8995fe1aef18c459633f1..d1078027211c19a7afa900177b9313e14d72aad5 100644
+index 285bab9e40b4d3c6899d7e5d8074cd9facf5b762..21e5a4534cd06be5cb08a2018b128bacd87c95a5 100644
 --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h
 +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h
-@@ -52,6 +52,7 @@ class ChromeLocationBarModelDelegate : public LocationBarModelDelegate {
+@@ -59,6 +59,7 @@ class ChromeLocationBarModelDelegate : public LocationBarModelDelegate {
    content::NavigationEntry* GetNavigationEntry() const;
  
   private:
diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch
index f46feaf099bd..3e754159bdbb 100644
--- a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch
+++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h
-index a3ddb11eeeaad2d28555f899b76cd1b082bc0217..a19e9bcea089ad4f9f04b4d6de69aa6aab6b6470 100644
+index 6dd0c607ebd8f34159884c188ccafb5ed35a7ecf..49aeade4a2b2b071890a80df14e6149b6102d1d5 100644
 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h
 +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h
-@@ -147,6 +147,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate,
+@@ -152,6 +152,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate,
  
    views::Button* anchor_button() const { return anchor_button_; }
  
diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
index 4618c4b77bca..7d99744a252d 100644
--- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
-index 7df689afe0660000064a98670151a0a372aba9e5..946e3c5d6bc4b9853e3fb1f142435990c5315564 100644
+index 325fac91ab832682e07d3aab6b202ea21f89ab6d..8d5acddae44d38dff3fd080487112f8f586ad550 100644
 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
 +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
 @@ -182,7 +182,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch
index 085147f071b6..fb414b51b7f8 100644
--- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch
+++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-index 2d329b13752728337a6a551efcee54b913fa0f73..af69b40cdd25f194f40d521097b9815d6911725d 100644
+index 7f7d97c607f12f262d8a1246478a31e826345fd8..cc3b2dcb649d23334aaa470ca77428c0da613223 100644
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 @@ -12,6 +12,7 @@
@@ -10,7 +10,7 @@ index 2d329b13752728337a6a551efcee54b913fa0f73..af69b40cdd25f194f40d521097b9815d
  #include "build/build_config.h"
  #include "chrome/browser/about_flags.h"
  #include "chrome/browser/accessibility/accessibility_ui.h"
-@@ -908,7 +909,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
+@@ -906,7 +907,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
  
  // static
  ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
index 117f32b3d6bc..d86efb392b0c 100644
--- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
+++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-index e991f66b595e690d12e78230b11107f6bec8b263..df7eeace7cdbb7db72c33e0ec773f3e065737c5e 100644
+index 2d1c836bf0b1fd9f5334b87367ca98a48472235f..6a6eed9ab7209d43f9fd02aa7b9f87eb627c6ce2 100644
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -2033,6 +2033,7 @@ void AddBrowserLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -2050,6 +2050,7 @@ void AddBrowserLocalizedStrings(content::WebUIDataSource* html_source,
    policy_indicator::AddLocalizedStrings(html_source);
    AddSecurityKeysStrings(html_source);
  
diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch
index 34322beb1fa2..a1878ddbf58f 100644
--- a/patches/chrome-common-BUILD.gn.patch
+++ b/patches/chrome-common-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
-index 0ee5857b7e42e866d46956f9931b2c9071fe0cc9..bc1982f595564ec03974ecde11a325de98b20773 100644
+index 03336cf469c9959307da60555819e8919738c6bf..611d2ddaf62ff04f041302e100b5e9e774513fbb 100644
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
 @@ -69,6 +69,7 @@ source_set("channel_info") {
diff --git a/patches/chrome-install_static-install_util.cc.patch b/patches/chrome-install_static-install_util.cc.patch
index bf09e8e473d2..c966a9fce799 100644
--- a/patches/chrome-install_static-install_util.cc.patch
+++ b/patches/chrome-install_static-install_util.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/install_static/install_util.cc b/chrome/install_static/install_util.cc
-index 42380349f701be98424d76f1621509e4a0050fe6..8d6163973eda8916caa7d1b27d4216911f84db7d 100644
+index 94a9782401f30a431eaa932fe069288a3c340c71..23227f6b6f9af529e6f562333d21d353fd9f8867 100644
 --- a/chrome/install_static/install_util.cc
 +++ b/chrome/install_static/install_util.cc
-@@ -675,7 +675,7 @@ void GetExecutableVersionDetails(const std::wstring& exe_path,
+@@ -680,7 +680,7 @@ void GetExecutableVersionDetails(const std::wstring& exe_path,
  }
  
  version_info::Channel GetChromeChannel() {
@@ -11,7 +11,7 @@ index 42380349f701be98424d76f1621509e4a0050fe6..8d6163973eda8916caa7d1b27d421691
    std::wstring channel_name(GetChromeChannelName());
    if (channel_name.empty()) {
      return version_info::Channel::STABLE;
-@@ -686,7 +686,7 @@ version_info::Channel GetChromeChannel() {
+@@ -691,7 +691,7 @@ version_info::Channel GetChromeChannel() {
    if (channel_name == L"dev") {
      return version_info::Channel::DEV;
    }
diff --git a/patches/chrome-installer-mac-signing-model.py.patch b/patches/chrome-installer-mac-signing-model.py.patch
index 8eb9bcdf1f85..ff78f0d71764 100644
--- a/patches/chrome-installer-mac-signing-model.py.patch
+++ b/patches/chrome-installer-mac-signing-model.py.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/mac/signing/model.py b/chrome/installer/mac/signing/model.py
-index 0f6440ba800010efc27f8aba76a75d57e43de86d..e6269bb8582f337bbd763ecb8b2fca0261aaaefc 100644
+index 364e63403f4a9f333760cf00b3d61c62668a650f..766e0d5e2cb976cb58ef043dec53c05cd5c66f31 100644
 --- a/chrome/installer/mac/signing/model.py
 +++ b/chrome/installer/mac/signing/model.py
-@@ -306,7 +306,7 @@ class Paths(object):
+@@ -312,7 +312,7 @@ class Paths(object):
          Returns:
              Path to the packaging directory.
          """
diff --git a/patches/chrome-installer-mac-signing-parts.py.patch b/patches/chrome-installer-mac-signing-parts.py.patch
index 6bb3110ccac0..644ac9c7fa3b 100644
--- a/patches/chrome-installer-mac-signing-parts.py.patch
+++ b/patches/chrome-installer-mac-signing-parts.py.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/mac/signing/parts.py b/chrome/installer/mac/signing/parts.py
-index 5a56368e346ebd273ec165ec20af6016d79416ad..fe152f0e290ea33aef61d4f06ff13d7f6d7279af 100644
+index def2456b325bb4cc25b35a44dd6069fef8293726..e637c1716a858f858d1ce83497508a92a4190ed9 100644
 --- a/chrome/installer/mac/signing/parts.py
 +++ b/chrome/installer/mac/signing/parts.py
 @@ -10,6 +10,7 @@ import os.path
@@ -10,7 +10,7 @@ index 5a56368e346ebd273ec165ec20af6016d79416ad..fe152f0e290ea33aef61d4f06ff13d7f
  
  _PROVISIONPROFILE_EXT = '.provisionprofile'
  _PROVISIONPROFILE_DEST = 'embedded.provisionprofile'
-@@ -136,6 +137,7 @@ def get_parts(config):
+@@ -132,6 +133,7 @@ def get_parts(config):
              library_basename.replace('.dylib', ''),
              verify_options=verify_options)
  
@@ -18,7 +18,7 @@ index 5a56368e346ebd273ec165ec20af6016d79416ad..fe152f0e290ea33aef61d4f06ff13d7f
      return parts
  
  
-@@ -199,6 +201,7 @@ def sign_chrome(paths, config, sign_framework=False):
+@@ -195,6 +197,7 @@ def sign_chrome(paths, config, sign_framework=False):
                  continue
              signing.sign_part(paths, config, part)
  
diff --git a/patches/chrome-installer-mac-signing-pipeline.py.patch b/patches/chrome-installer-mac-signing-pipeline.py.patch
index 150c6a84e5f2..27b897477eec 100644
--- a/patches/chrome-installer-mac-signing-pipeline.py.patch
+++ b/patches/chrome-installer-mac-signing-pipeline.py.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/mac/signing/pipeline.py b/chrome/installer/mac/signing/pipeline.py
-index 84a09df705b21f69ce69815cfa6b76921d35e96e..7d1d3b84c12bd02648d6978162c405fbf2deb8d7 100644
+index ecca8aa75bcbd7774414e777b4f573c0f3ad9a72..5d925e0daf64012da0aa29fddd6424596f4c4095 100644
 --- a/chrome/installer/mac/signing/pipeline.py
 +++ b/chrome/installer/mac/signing/pipeline.py
-@@ -535,5 +535,8 @@ def sign_all(orig_paths,
+@@ -522,5 +522,8 @@ def sign_all(orig_paths,
                          uuids_to_package_path.keys(), config):
                      package_path = uuids_to_package_path[result]
                      notarize.staple(package_path)
diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
index d44c01c28ca9..ad4ad8490a82 100644
--- a/patches/chrome-test-BUILD.gn.patch
+++ b/patches/chrome-test-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index a55dac1d2eeb7c3c5fc5a0c2cedd3a780b71635c..3dcbe38bcd17ec3b06ca923e6d21bc0d90500fb2 100644
+index 1ae616e652ba6f7cb81b5be2d07b033a80b2a7fe..dcef638e1f6e04c3e3d35fd91941c5b5707a769b 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -737,6 +737,7 @@ if (!is_android) {
+@@ -732,6 +732,7 @@ if (!is_android) {
        "//v8",
      ]
  
diff --git a/patches/chrome-test-base-testing_profile.cc.patch b/patches/chrome-test-base-testing_profile.cc.patch
index 02468884b4c1..dfc5a3ede679 100644
--- a/patches/chrome-test-base-testing_profile.cc.patch
+++ b/patches/chrome-test-base-testing_profile.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
-index 5c546cc9d766ac7c8c94a222d3ac5f1bc7d738bd..e4022ad4fa0d6132ac7deee4376118491a417872 100644
+index 9f28b4eb8954d942bb69761f137535bcf3a842e3..677abcecdd681f0fc9f56b7adcfaf37082663f1d 100644
 --- a/chrome/test/base/testing_profile.cc
 +++ b/chrome/test/base/testing_profile.cc
-@@ -414,6 +414,7 @@ void TestingProfile::Init() {
+@@ -413,6 +413,7 @@ void TestingProfile::Init() {
        EnsureBrowserContextKeyedServiceFactoriesBuilt();
  
  #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch
index 222e72375b1b..80d9a7803638 100644
--- a/patches/chrome-utility-BUILD.gn.patch
+++ b/patches/chrome-utility-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
-index a413210c2e41fb47eed96ae29c1b63bfeb68a83e..bd86bd0535f58ac13caece241d3c528ff20f4bcd 100644
+index e348f64df21bba70c0ed04211b871838ca67899a..ba5f33baf6bb7fc8e91f5cc2fd335d47ff76b2e1 100644
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -29,6 +29,7 @@ static_library("utility") {
+@@ -28,6 +28,7 @@ static_library("utility") {
  
    public_deps = []
    deps = [
diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch
index 84c9a6f5abe7..944468ac55e6 100644
--- a/patches/components-download-internal-common-download_item_impl.cc.patch
+++ b/patches/components-download-internal-common-download_item_impl.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc
-index 15d360a82f5c9f169e9196f2f221ff5bf1e6fac5..5ceb572b348a41fb7bfc03b588fbd72fbef4819f 100644
+index cde7ef8956027197923ea18aae7c9ff5e2050b9d..08a13c5e5d7465b6ad119c706548139793bde580 100644
 --- a/components/download/internal/common/download_item_impl.cc
 +++ b/components/download/internal/common/download_item_impl.cc
 @@ -1868,8 +1868,8 @@ void DownloadItemImpl::OnDownloadCompleting() {
diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch
index 8e46746496b4..bcbf63b1c4c6 100644
--- a/patches/components-omnibox-browser-BUILD.gn.patch
+++ b/patches/components-omnibox-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
-index f8028817e0a2f5cd59c6d4d54f951ea489a6e054..a9998ffd612c96b1f5aae5ab29b6a719fc922556 100644
+index 4757f16eaaae8df9a517a37112f2e0275a09d8e9..9658ad11323deff25462dfe27e0bc8a9a92aebba 100644
 --- a/components/omnibox/browser/BUILD.gn
 +++ b/components/omnibox/browser/BUILD.gn
-@@ -257,6 +257,7 @@ jumbo_static_library("browser") {
+@@ -258,6 +258,7 @@ jumbo_static_library("browser") {
    if ((!is_android || enable_vr) && !is_ios) {
      deps += [ ":vector_icons" ]
    }
diff --git a/patches/components-omnibox-browser-autocomplete_controller.h.patch b/patches/components-omnibox-browser-autocomplete_controller.h.patch
index b7bc6c0f1dbc..8233fc70f9a8 100644
--- a/patches/components-omnibox-browser-autocomplete_controller.h.patch
+++ b/patches/components-omnibox-browser-autocomplete_controller.h.patch
@@ -1,8 +1,8 @@
 diff --git a/components/omnibox/browser/autocomplete_controller.h b/components/omnibox/browser/autocomplete_controller.h
-index 80fdfe2cd2f85df3f2db29f50563e19686a1c664..199d51be7b16c861c85119353fe859ee272f0aa3 100644
+index 2f2212f8ed24eda809923c61615d79282464e3f1..0e57502584dfc1bf7c66ced61ad9228711afb399 100644
 --- a/components/omnibox/browser/autocomplete_controller.h
 +++ b/components/omnibox/browser/autocomplete_controller.h
-@@ -166,6 +166,7 @@ class AutocompleteController : public AutocompleteProviderListener,
+@@ -170,6 +170,7 @@ class AutocompleteController : public AutocompleteProviderListener,
    }
  
   private:
diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
index 0b9c89750715..b48076c3e7d2 100644
--- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
+++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
-index 509b8ceac0876fb6f03db4ff48dce452c2c61523..10ca18d5e7c1bbf9d5f59c23148078a60aa479b8 100644
+index 87768d8c7cc22fb5a909331e61ff4f80b6d28489..1ad724ba4ec84c653477fec6df16adc2b432e830 100644
 --- a/components/omnibox/browser/omnibox_edit_model.cc
 +++ b/components/omnibox/browser/omnibox_edit_model.cc
-@@ -384,6 +384,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
+@@ -386,6 +386,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
        (*text == display_text_ || *text == url_for_editing_)) {
      *url_from_text = controller()->GetLocationBarModel()->GetURL();
      *write_url = true;
diff --git a/patches/components-safe_browsing-core-db-v4_protocol_manager_util.cc.patch b/patches/components-safe_browsing-core-db-v4_protocol_manager_util.cc.patch
index e67b9536e714..d01fb0411189 100644
--- a/patches/components-safe_browsing-core-db-v4_protocol_manager_util.cc.patch
+++ b/patches/components-safe_browsing-core-db-v4_protocol_manager_util.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/safe_browsing/core/db/v4_protocol_manager_util.cc b/components/safe_browsing/core/db/v4_protocol_manager_util.cc
-index 2c17c0aeb7bc0d85491dcf6d0ba552eabf3fd97a..ef4313ce000d29569119b823f46f47bcd1ea0a94 100644
+index c7f7915a745f055a9af76d6dad48ff6339f02d02..d3da69ff70f2b8feac875ba2e3032570620afb60 100644
 --- a/components/safe_browsing/core/db/v4_protocol_manager_util.cc
 +++ b/components/safe_browsing/core/db/v4_protocol_manager_util.cc
 @@ -29,7 +29,7 @@ namespace safe_browsing {
diff --git a/patches/content-browser-frame_host-navigation_request.cc.patch b/patches/content-browser-frame_host-navigation_request.cc.patch
index b24fdf43954f..2021070a0671 100644
--- a/patches/content-browser-frame_host-navigation_request.cc.patch
+++ b/patches/content-browser-frame_host-navigation_request.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
-index dbfc24395349cfa40b5783590d60cc7e44b31205..8d4a2276a45491d390c84af6e33f4fc52c5d70af 100644
+index 797feb485fafc9d9c1d130e9052669ff93ab92ca..57c75ac1d41a760d3f3460a62dd662b18ef1dd34 100644
 --- a/content/browser/frame_host/navigation_request.cc
 +++ b/content/browser/frame_host/navigation_request.cc
-@@ -2358,6 +2358,7 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -2360,6 +2360,7 @@ void NavigationRequest::OnStartChecksComplete(
    headers.MergeFrom(TakeModifiedRequestHeaders());
    begin_params_->headers = headers.ToString();
  
diff --git a/patches/content-public-test-browser_test_utils.cc.patch b/patches/content-public-test-browser_test_utils.cc.patch
index ef7b4638b76e..bb01c3770cf0 100644
--- a/patches/content-public-test-browser_test_utils.cc.patch
+++ b/patches/content-public-test-browser_test_utils.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
-index aa20fa5f9e375e5a369f28ea2bbf296a3aa760d5..389a0a533c5425859af0204fac3995aa9a049e3f 100644
+index d7f88a819505305d690e35b3b78862c1b9fd8f5e..0754ca74f7041521aa32c33a36fd91946d612fda 100644
 --- a/content/public/test/browser_test_utils.cc
 +++ b/content/public/test/browser_test_utils.cc
 @@ -1906,6 +1906,7 @@ bool SetCookie(BrowserContext* browser_context,
diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch
index 78bd050fdb0d..c7ca431adabd 100644
--- a/patches/content-renderer-render_thread_impl.cc.patch
+++ b/patches/content-renderer-render_thread_impl.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 97bedbbbf571b34b8dcbabc308dc1dafd2ca2427..949ec0674913f2ecedb71abe7d231801812b13d4 100644
+index bb9c821d210e0ddb55c0f97f837e5d7500d17d64..3a95c718cd27f5f9c73f3731ac46e9b49c186f8f 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
 @@ -1042,6 +1042,14 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) {
diff --git a/patches/extensions-browser-BUILD.gn.patch b/patches/extensions-browser-BUILD.gn.patch
index 1002c9ad5a73..bcccfeede6bf 100644
--- a/patches/extensions-browser-BUILD.gn.patch
+++ b/patches/extensions-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn
-index c65bf1a827f31cec70d713da675348c830498be0..474fd6039b70f3b62c26d7a9a6cf812b6e9f16b9 100644
+index 33f4dd833fe9f2d2d8fb328088e5a7a79342d333..f157c69e4139653951a7d979357238efd4b6e637 100644
 --- a/extensions/browser/BUILD.gn
 +++ b/extensions/browser/BUILD.gn
-@@ -402,6 +402,7 @@ jumbo_source_set("browser_sources") {
+@@ -403,6 +403,7 @@ jumbo_source_set("browser_sources") {
      "//third_party/blink/public/mojom/frame",
      "//ui/display",
    ]
diff --git a/patches/extensions-browser-sandboxed_unpacker.cc.patch b/patches/extensions-browser-sandboxed_unpacker.cc.patch
index 376807a88a01..d0f88f5788d8 100644
--- a/patches/extensions-browser-sandboxed_unpacker.cc.patch
+++ b/patches/extensions-browser-sandboxed_unpacker.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc
-index cf3356b7ef4eeb4b8aab554deca86a3514887743..8e961c612d3fcf3c8aeb6ce06f4d59d47ce3254d 100644
+index fe5c39eb3c2f31225030eecc1ce42a7841ba487d..7d40b8ddb655385bb40e5c3bf8dfdf53cde240eb 100644
 --- a/extensions/browser/sandboxed_unpacker.cc
 +++ b/extensions/browser/sandboxed_unpacker.cc
-@@ -1008,6 +1008,7 @@ base::Optional<base::Value> SandboxedUnpacker::RewriteManifestFile(
+@@ -1020,6 +1020,7 @@ base::Optional<base::Value> SandboxedUnpacker::RewriteManifestFile(
    DCHECK(!public_key_.empty());
    base::Value final_manifest = manifest.Clone();
    final_manifest.SetStringKey(manifest_keys::kPublicKey, public_key_);
diff --git a/patches/media-blink-key_system_config_selector.cc.patch b/patches/media-blink-key_system_config_selector.cc.patch
index 184a85a95d8c..b8a484caffa2 100644
--- a/patches/media-blink-key_system_config_selector.cc.patch
+++ b/patches/media-blink-key_system_config_selector.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc
-index aee284570d43e8854e4a7e85c26f0e2f0438e6c2..e2789ea1d695a449200277e7542b9260e7eafdd2 100644
+index 096a6d98d3979bfd5c802b5f86ea0c982258b7a8..8fc413f7ec64ae469a59b94e12a34b3f58a1d2c4 100644
 --- a/media/blink/key_system_config_selector.cc
 +++ b/media/blink/key_system_config_selector.cc
 @@ -912,6 +912,7 @@ void KeySystemConfigSelector::SelectConfig(
diff --git a/patches/mojo-public-tools-bindings-chromium_bindings_configuration.gni.patch b/patches/mojo-public-tools-bindings-chromium_bindings_configuration.gni.patch
index 661f374a94d7..6d81501a1ee2 100644
--- a/patches/mojo-public-tools-bindings-chromium_bindings_configuration.gni.patch
+++ b/patches/mojo-public-tools-bindings-chromium_bindings_configuration.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
-index 98c78e56e5d4299f0705cb4910d562102e78d38c..1886b30886dbe153fcd39c2d952ead44ada5a5e1 100644
+index 2eb03f7ff4ff96594c8a2dbec53413c8a7b03797..a3e52d14e45829170aa0d1ef8ebe989757b58083 100644
 --- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni
 +++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
 @@ -4,6 +4,7 @@
diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch
index dcf9b7b32a52..e20b07323f5b 100644
--- a/patches/net-BUILD.gn.patch
+++ b/patches/net-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/net/BUILD.gn b/net/BUILD.gn
-index 8ca0ca3a13e8e7e9804aafd223ad45b5941aada8..bb200a8b551ea9119938dce9133310ee83b63430 100644
+index 5d3272d42790c1e7c34f0dce04421d072a56f62e..e237d5718304b8ee525187a2469242cc86bdba45 100644
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
 @@ -1178,6 +1178,7 @@ component("net") {
diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch
index d8f72b6e311b..47e825db5291 100644
--- a/patches/net-cookies-canonical_cookie.cc.patch
+++ b/patches/net-cookies-canonical_cookie.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
-index f8c98061eb7247e46baf798353fa320ce80e16fa..4bc53d4c041ea1f401000f90822ecb36aa42d452 100644
+index fb17243ed6ab8a5809971777d2c94954fb2ad5bd..b5d92c99f52578bde2689dd4b4640449ddf5db6d 100644
 --- a/net/cookies/canonical_cookie.cc
 +++ b/net/cookies/canonical_cookie.cc
-@@ -248,6 +248,7 @@ Time CanonicalCookie::CanonExpiration(const ParsedCookie& pc,
+@@ -273,6 +273,7 @@ Time CanonicalCookie::CanonExpiration(const ParsedCookie& pc,
  
  // static
  std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
@@ -10,7 +10,7 @@ index f8c98061eb7247e46baf798353fa320ce80e16fa..4bc53d4c041ea1f401000f90822ecb36
      const GURL& url,
      const std::string& cookie_line,
      const base::Time& creation_time,
-@@ -288,8 +289,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
+@@ -313,8 +314,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
      cookie_server_time = server_time.value();
  
    DCHECK(!creation_time.is_null());
diff --git a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
index 1f7da4facfa7..5c7d536d960b 100644
--- a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
+++ b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc
-index 33f1061d0ed1d7afb0dba0184d040c083269f19f..72a51d95479b13aecaff91a323f5f74fb8635cd9 100644
+index ae0a8be74bd8cca3999372b297859b0b9353fa6a..33641d7a0f8859dde5026967c37d9acdbabc1f30 100644
 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc
 +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc
 @@ -1048,6 +1048,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously(
diff --git a/patches/net-url_request-url_request_http_job.cc.patch b/patches/net-url_request-url_request_http_job.cc.patch
index 02856957cbe2..f4d2e9a91ec1 100644
--- a/patches/net-url_request-url_request_http_job.cc.patch
+++ b/patches/net-url_request-url_request_http_job.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
-index 2e9a51d2604e272da1b7600c7c0e9325931a7b72..e2fb1527ccf87c6390d899f3365a0e3549d82c3f 100644
+index c57348b4a12e894931f5e4aac22a3184ab0b8140..c6bd2b866aea7485c87c44007232c6cd80066fc9 100644
 --- a/net/url_request/url_request_http_job.cc
 +++ b/net/url_request/url_request_http_job.cc
-@@ -732,6 +732,7 @@ void URLRequestHttpJob::SaveCookiesAndNotifyHeadersComplete(int result) {
+@@ -711,6 +711,7 @@ void URLRequestHttpJob::SaveCookiesAndNotifyHeadersComplete(int result) {
      num_cookie_lines_left_++;
  
      std::unique_ptr<CanonicalCookie> cookie = net::CanonicalCookie::Create(
diff --git a/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch b/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch
index 0b5af3133f0c..764c5eaebb70 100644
--- a/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch
+++ b/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/services/service_manager/sandbox/win/sandbox_win.cc b/services/service_manager/sandbox/win/sandbox_win.cc
-index 5eaed19bf922fc6ea2774c93abf7453fd1464f8e..8d6c81f39cdd247aad5bec9f517b03f4f5dd2be8 100644
+index a4ac5af2494529e11e5605c8cae8166e1b92900c..b1b84409f02d1c4cee65ef64b41b853650b5be3c 100644
 --- a/services/service_manager/sandbox/win/sandbox_win.cc
 +++ b/services/service_manager/sandbox/win/sandbox_win.cc
-@@ -863,6 +863,7 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess(
+@@ -873,6 +873,7 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess(
            service_manager::switches::kNoSandbox)) {
      base::LaunchOptions options;
      options.handles_to_inherit = handles_to_inherit;
diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch
index 3eb67ac8f9d7..58ea4b196b3d 100644
--- a/patches/third_party-blink-renderer-core-BUILD.gn.patch
+++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
-index de7233174e0e97867972160a734554972c1af7db..96f8a065f3099555acd668fcdeac44e0d4b5e6be 100644
+index 857287b7788431f07c6f972dfbbec96526f8491d..e32924dc327556a15485f641e79bfaad710bf9ac 100644
 --- a/third_party/blink/renderer/core/BUILD.gn
 +++ b/third_party/blink/renderer/core/BUILD.gn
 @@ -146,6 +146,7 @@ component("core") {
diff --git a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch
index f903eab4c1c0..434194a7a84c 100644
--- a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch
+++ b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-index bec8c6160d2e7e1dcefdcb3752358c44e4763328..df6b11a1f6b4b2cd1a05ef61cd9142013a145b63 100644
+index 98297281a3b0a02c1f27ef6172f51268da5823fd..63b1c8ed09df8d72bd47eacab2d80ff4b3a78a35 100644
 --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
 +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
 @@ -182,6 +182,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(
diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch
index c0246035785a..86dc0b39a2a6 100644
--- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch
+++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn
-index 9cd07a8d81d2e00e1b8875e418379bedcfb0b3f6..5b463880d9a7de07164b3ca0a9d6c9825f15bf40 100644
+index f196baad1b8fd2b30ae05bac61f95f5d5a05bd2b..05fd1a63c8b7e63eb58ae1d38d41768397f134d2 100644
 --- a/third_party/blink/renderer/modules/BUILD.gn
 +++ b/third_party/blink/renderer/modules/BUILD.gn
 @@ -16,6 +16,7 @@ if (is_android) {
@@ -10,7 +10,7 @@ index 9cd07a8d81d2e00e1b8875e418379bedcfb0b3f6..5b463880d9a7de07164b3ca0a9d6c982
  
  config("modules_implementation") {
    defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ]
-@@ -156,6 +157,7 @@ jumbo_component("modules") {
+@@ -157,6 +158,7 @@ jumbo_component("modules") {
      "//third_party/blink/renderer/modules/xr",
    ]
  
diff --git a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch
index fccb674aa26c..3ffc7e859593 100644
--- a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch
+++ b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/modules/modules_idl_files.gni b/third_party/blink/renderer/modules/modules_idl_files.gni
-index 130b406dad47d81bc11a96be791fdfd817b62aa5..062e55e2c3409c91d0d923ad4ca8a671edafe1f7 100644
+index 4050c62353344b0b019905ecd32bd4f985369642..385d0f34f18f48193d52718e9ce0b11c8fb66328 100644
 --- a/third_party/blink/renderer/modules/modules_idl_files.gni
 +++ b/third_party/blink/renderer/modules/modules_idl_files.gni
-@@ -132,6 +132,7 @@ _idl_imports = [
+@@ -133,6 +133,7 @@ _idl_imports = [
  if (!is_android) {
    _idl_imports += [ "//third_party/blink/renderer/modules/serial/idls.gni" ]
  }
diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch
index 9a6ffc9d218c..0090d6f80aa8 100644
--- a/patches/tools-gritsettings-resource_ids.spec.patch
+++ b/patches/tools-gritsettings-resource_ids.spec.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index f8e27f6df77302a9af952493ebf946349466225e..0a7b669a33c161aaa61de30c067785a575af26cd 100644
+index 730e3209ec954e85cf56ea1edf3e63ea603fa5fc..daaa03b96e97bd5e5e4f6c7c98b2eadf52e790df 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
 @@ -47,6 +47,9 @@
@@ -12,7 +12,7 @@ index f8e27f6df77302a9af952493ebf946349466225e..0a7b669a33c161aaa61de30c067785a5
    "chrome/app/google_chrome_strings.grd": {
      "messages": [400],
    },
-@@ -325,6 +328,9 @@
+@@ -326,6 +329,9 @@
      "META": {"align": 100},
      "messages": [2700],
    },
diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch
index d6d93a7ac5d1..dbbe0f83e1c8 100644
--- a/patches/ui-base-BUILD.gn.patch
+++ b/patches/ui-base-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 33b8a3bb7fae6941f0aa7af47aa048ac4a932b8f..1c9f64a73fe8497c2e1aadb40cd02629fc8d8acf 100644
+index 144c55943f23294ae83db483206dd5afe23d4128..421200eea4664924bce95b27102ea966428f7f7c 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
-@@ -445,6 +445,7 @@ jumbo_component("base") {
+@@ -447,6 +447,7 @@ jumbo_component("base") {
      "//ui/strings",
      "//url",
    ]
diff --git a/patches/ui-native_theme-native_theme.h.patch b/patches/ui-native_theme-native_theme.h.patch
index d92c92b7c03f..b7241aaf735b 100644
--- a/patches/ui-native_theme-native_theme.h.patch
+++ b/patches/ui-native_theme-native_theme.h.patch
@@ -1,8 +1,8 @@
 diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
-index 380a8e78fdeb2ad5f40b298a3efffa82a70ed2dc..85a445de36f0b440a7362e0243d6e401374d3b56 100644
+index 8c60a3f7ba7cd3caec127028422be32024ff586b..dd562eacf64bd1e01cd7ede4f59bd20555c56aa4 100644
 --- a/ui/native_theme/native_theme.h
 +++ b/ui/native_theme/native_theme.h
-@@ -391,6 +391,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -407,6 +407,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
  
    // Returns the system's caption style.
    virtual base::Optional<CaptionStyle> GetSystemCaptionStyle() const;
diff --git a/patches/ui-native_theme-native_theme_win.cc.patch b/patches/ui-native_theme-native_theme_win.cc.patch
index 9fc5f8d5e0b1..2bee90d43e39 100644
--- a/patches/ui-native_theme-native_theme_win.cc.patch
+++ b/patches/ui-native_theme-native_theme_win.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
-index f374882c8f2fc1241608e8d9dfa6abb85ae75314..ea1f8f1e220ebcb565e662d13d74dfd19ebfe531 100644
+index 272b70d7c993c10a45f81c4fe639cf3c203e6d14..638de5c4c6f29c05b87c0a4a45d85e561877364d 100644
 --- a/ui/native_theme/native_theme_win.cc
 +++ b/ui/native_theme/native_theme_win.cc
 @@ -1637,6 +1637,7 @@ void NativeThemeWin::UpdateDarkModeStatus() {
diff --git a/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch b/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch
index 00e95d509a2c..5bb76c6f0851 100644
--- a/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch
+++ b/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch
@@ -1,5 +1,5 @@
 diff --git a/ui/webui/resources/cr_elements/shared_style_css.html b/ui/webui/resources/cr_elements/shared_style_css.html
-index 125bf9765e3a8b1d6f7c4f082c375d432cb4e81a..af0c992f0ffe45506bac57613bb4877e6db830b3 100644
+index 469c98149e4ceb6e1373824230f90799289cd485..e9fd704b80b6758eb12f7a1b0f6c97eb0e47f1b6 100644
 --- a/ui/webui/resources/cr_elements/shared_style_css.html
 +++ b/ui/webui/resources/cr_elements/shared_style_css.html
 @@ -3,12 +3,13 @@
diff --git a/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch b/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch
index 746016fa1ded..0267c1f15929 100644
--- a/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch
+++ b/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch
@@ -1,5 +1,5 @@
 diff --git a/ui/webui/resources/cr_elements/shared_vars_css.html b/ui/webui/resources/cr_elements/shared_vars_css.html
-index 1add20c9fab8d5152b14e099bee33a9bb1f86f7c..eb49d97fdb652fa0d731b069746c5c55c68f9501 100644
+index 4c9126cc34a50d54080147ccb4e639ba9f65907f..beef65f35ab221fb88e19b724d49c121ca940e8e 100644
 --- a/ui/webui/resources/cr_elements/shared_vars_css.html
 +++ b/ui/webui/resources/cr_elements/shared_vars_css.html
 @@ -1,6 +1,7 @@

From f648ee4d5661ef83853d6cccbcea88c7576637bb Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 3 Apr 2020 14:32:50 -0400
Subject: [PATCH 037/161] Conflict-resolved patches from Chromium 83.0.4093.3
 to Chromium 83.0.4100.3.

---
 patches/chrome-browser-about_flags.cc.patch   |  8 +++----
 ...autofill_page-passwords_section.html.patch |  8 +++----
 ...y_page-privacy_page_browser_proxy.js.patch | 10 ++++-----
 ...de_detector-upgrade_detector_impl.cc.patch | 18 +++++++--------
 patches/tools-licenses.py.patch               | 22 +++++++++----------
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
index ba41c8990ab4..d3fd4d6fa9b4 100644
--- a/patches/chrome-browser-about_flags.cc.patch
+++ b/patches/chrome-browser-about_flags.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 0524711d091a048fac36e6f43881a873c600bf89..bb389f2c1a648a79fc8d21a696cdec4653c802eb 100644
+index 33df2ec26606b28e0c38e94bc61ea4358e812e94..111effeff4cfd9313ca216e7b2ddd686ec39d390 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -286,14 +286,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
+@@ -287,14 +287,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
  const FeatureEntry::Choice kTraceUploadURL[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
      {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL,
@@ -21,10 +21,10 @@ index 0524711d091a048fac36e6f43881a873c600bf89..bb389f2c1a648a79fc8d21a696cdec46
  
  const FeatureEntry::Choice kPassiveListenersChoices[] = {
      {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -5140,6 +5140,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5197,6 +5197,7 @@ const FeatureEntry kFeatureEntries[] = {
+     // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
      // Histograms" in tools/metrics/histograms/README.md (run the
      // AboutFlagsHistogramTest unit test to verify this process).
- 
 +    BRAVE_FEATURE_ENTRIES
  };
  
diff --git a/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch b/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch
index dda100107ce0..516596c6c402 100644
--- a/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch
+++ b/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/autofill_page/passwords_section.html b/chrome/browser/resources/settings/autofill_page/passwords_section.html
-index 169195871379d3e82738953a11c6eafff7a16572..8d2f8fce22e78d61fa85722d284906fff8d85f98 100644
+index 59158c3b8fcb8e89713082eed9377deed10996c7..350afa707c21065ffdd6b94e0d652340ec93afb2 100644
 --- a/chrome/browser/resources/settings/autofill_page/passwords_section.html
 +++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html
 @@ -153,11 +153,15 @@
@@ -15,6 +15,6 @@ index 169195871379d3e82738953a11c6eafff7a16572..8d2f8fce22e78d61fa85722d284906ff
        <span>$i18nRaw{managePasswordsLabel}</span>
      </div>
 +    -->
-     <div class="settings-box first">
-       <h2 id="savedPasswordsHeading" class="start">
-         $i18n{savedPasswordsHeading}
+     <template is="dom-if" if="[[enableAccountStorage_]]">
+       <cr-button on-click="onOptIn_"
+           hidden$="[[isOptedInForAccountStorage_]]">
diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch
index e52b7d017c73..77a72bd941f7 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch
@@ -1,20 +1,20 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js
-index 69fc86b355720a3e3d508628cd1d068ff19a9248..e357a4018d4d1a5f1cf30fbed786d743684716bd 100644
+index 658b4d6ab99050787352154dce3d00d1b39f5eda..c334612e66e1fb3f9c9562726de2aa624c830589 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js
-@@ -44,7 +44,7 @@ cr.define('settings', function() {
+@@ -48,7 +48,7 @@ cr.define('settings', function() {
  
    /** @interface */
-   class PrivacyPageBrowserProxy {
+   /* #export */ class PrivacyPageBrowserProxy {
 -    // <if expr="_google_chrome and not chromeos">
 +    // <if expr="_chromium and not chromeos">
      /** @return {!Promise<!settings.MetricsReporting>} */
      getMetricsReporting() {}
  
-@@ -94,7 +94,7 @@ cr.define('settings', function() {
+@@ -98,7 +98,7 @@ cr.define('settings', function() {
     * @implements {settings.PrivacyPageBrowserProxy}
     */
-   class PrivacyPageBrowserProxyImpl {
+   /* #export */ class PrivacyPageBrowserProxyImpl {
 -    // <if expr="_google_chrome and not chromeos">
 +    // <if expr="_chromium and not chromeos">
      /** @override */
diff --git a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch
index aeeac38b216d..410035abdda1 100644
--- a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch
+++ b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch
@@ -1,13 +1,13 @@
 diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
-index 7c85028e1a97487adeff330a27b9eeec54d3efb8..d4549ff20eeb0b8b5d4f3c9da1a807ef35fcaa1a 100644
+index 4e396c995c439dfeaf1260fab722117f0cca90b9..07bad8b91d42ddfa6de895e3148c0401db45819d 100644
 --- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
 +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
 @@ -459,7 +459,7 @@ void UpgradeDetectorImpl::Init() {
- #if defined(OS_WIN)
-   // Only enable upgrade notifications for Google Chrome builds. Chromium does
-   // not use an auto-updater.
--  if (!BUILDFLAG(GOOGLE_CHROME_BRANDING))
-+  if (!BUILDFLAG(GOOGLE_CHROME_BRANDING)) && (!(defined(BRAVE_CHROMIUM_BUILD)) && defined(OFFICIAL_BUILD)))
-     return;
- #elif defined(OS_MACOSX)
-   // Only enable upgrade notifications if the updater (Keystone) is present.
+ 
+   // On Windows, only enable upgrade notifications for Google Chrome builds.
+   // Chromium does not use an auto-updater.
+-#if !defined(OS_WIN) || BUILDFLAG(GOOGLE_CHROME_BRANDING)
++#if !defined(OS_WIN) || BUILDFLAG(GOOGLE_CHROME_BRANDING) || (defined(BRAVE_CHROMIUM_BUILD) && defined(OFFICIAL_BUILD))
+ 
+   // On macOS, only enable upgrade notifications if the updater (Keystone) is
+   // present.
diff --git a/patches/tools-licenses.py.patch b/patches/tools-licenses.py.patch
index e0f28459bc96..aa2daffd096f 100644
--- a/patches/tools-licenses.py.patch
+++ b/patches/tools-licenses.py.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/licenses.py b/tools/licenses.py
-index 6405b31497a425c68b0486a2653071f23e515671..5402e94334b0ecb6ebcbefb9e4cd93b070eb5cbd 100755
+index feeaf77aaec383c8708da10c39186dc3758ca9e1..c45d66caa60ac7033314dac79f486a6ba15b469f 100755
 --- a/tools/licenses.py
 +++ b/tools/licenses.py
 @@ -35,6 +35,7 @@ else:
@@ -18,17 +18,17 @@ index 6405b31497a425c68b0486a2653071f23e515671..5402e94334b0ecb6ebcbefb9e4cd93b0
  
  # Special value for 'License File' field used to indicate that the license file
  # should not be used in about:credits.
-@@ -478,7 +480,8 @@ def FindThirdPartyDirs(prune_paths, root):
-             if skip in dirs:
-                 dirs.remove(skip)
+@@ -481,7 +483,8 @@ def FindThirdPartyDirs(prune_paths, root):
+       if skip in dirs:
+         dirs.remove(skip)
  
--        if os.path.basename(path) == 'third_party':
-+        if (os.path.basename(path) == 'third_party' or
-+            os.path.basename(path) in BRAVE_THIRD_PARTY_DIRS):
-             # Add all subdirectories that are not marked for skipping.
-             for dir in dirs:
-                 dirpath = os.path.join(path, dir)
-@@ -663,7 +666,8 @@ def GenerateCredits(
+-    if os.path.basename(path) == 'third_party':
++    if (os.path.basename(path) == 'third_party' or
++        os.path.basename(path) in BRAVE_THIRD_PARTY_DIRS):
+       # Add all subdirectories that are not marked for skipping.
+       for dir in dirs:
+         dirpath = os.path.join(path, dir)
+	@@ -663,7 +666,8 @@ def GenerateCredits(
      for path in third_party_dirs:
          try:
              metadata = ParseDir(path, _REPOSITORY_ROOT)

From 311bc716a70ff0330f448e7883397ff4c2433009 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 3 Apr 2020 13:07:40 -0400
Subject: [PATCH 038/161] PageInfo and PageInfoUI moved to //components.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/b6762167670454d9b44a0ad80c3a55ac4f227180

commit b6762167670454d9b44a0ad80c3a55ac4f227180
Author: Mugdha Lakhani <nator@chromium.org>
Date:   Mon Mar 30 10:23:25 2020 +0000

    [WebLayer] Move PageInfo and PageInfoUI to components.

    PageInfo and PageInfoUI have already been refactored into parts
    that can be shared among embedders, and chrome-specific parts.

    This CL simply moves the former to components.

    In addition, this moves some  vector icons to components,and creates a
    a new build target in components/resources to house all resources for
    components resources that are mapped to an Android resource.
    Permissions code is updated to depend on this new target.

    Bug: 1052375
---
 app/vector_icons/BUILD.gn                     |  1 -
 browser/ui/BUILD.gn                           |  9 +++---
 .../brave_autoplay_blocked_image_model.cc     |  7 +++--
 .../profiles/brave_incognito_menu_view.cc     |  3 +-
 browser/widevine/BUILD.gn                     |  2 +-
 .../widevine/widevine_permission_request.cc   |  4 +--
 .../ui/page_info/chrome_page_info_delegate.cc | 18 ++++++++++++
 .../ui/page_info/chrome_page_info_delegate.h  | 18 ++++++++++++
 .../chrome/browser/ui/page_info/page_info.cc  | 28 -------------------
 .../components/page_info/page_info.cc         | 14 ++++++++++
 .../components/page_info/page_info_delegate.h | 16 +++++++++++
 .../components/page_info/page_info_ui.cc      | 14 ++++++++++
 components/vector_icons/BUILD.gn              | 25 +++++++++++++++++
 .../vector_icons/autoplay_status.icon         |  0
 .../vector_icons/vector_icons.cc.template     | 17 +++++++++++
 .../vector_icons/vector_icons.h.template      | 26 +++++++++++++++++
 ...me-browser-ui-page_info-page_info.cc.patch | 12 --------
 ...browser-ui-page_info-page_info_ui.cc.patch | 22 ---------------
 patches/components-page_info-BUILD.gn.patch   | 12 ++++++++
 .../components-page_info-page_info.cc.patch   | 12 ++++++++
 ...components-page_info-page_info_ui.cc.patch | 12 ++++++++
 21 files changed, 198 insertions(+), 74 deletions(-)
 create mode 100644 chromium_src/chrome/browser/ui/page_info/chrome_page_info_delegate.cc
 create mode 100644 chromium_src/chrome/browser/ui/page_info/chrome_page_info_delegate.h
 delete mode 100644 chromium_src/chrome/browser/ui/page_info/page_info.cc
 create mode 100644 chromium_src/components/page_info/page_info.cc
 create mode 100644 chromium_src/components/page_info/page_info_delegate.h
 create mode 100644 chromium_src/components/page_info/page_info_ui.cc
 create mode 100644 components/vector_icons/BUILD.gn
 rename {app => components}/vector_icons/autoplay_status.icon (100%)
 create mode 100644 components/vector_icons/vector_icons.cc.template
 create mode 100644 components/vector_icons/vector_icons.h.template
 delete mode 100644 patches/chrome-browser-ui-page_info-page_info.cc.patch
 delete mode 100644 patches/chrome-browser-ui-page_info-page_info_ui.cc.patch
 create mode 100644 patches/components-page_info-BUILD.gn.patch
 create mode 100644 patches/components-page_info-page_info.cc.patch
 create mode 100644 patches/components-page_info-page_info_ui.cc.patch

diff --git a/app/vector_icons/BUILD.gn b/app/vector_icons/BUILD.gn
index 8f8832b083a6..384e65d3c3de 100644
--- a/app/vector_icons/BUILD.gn
+++ b/app/vector_icons/BUILD.gn
@@ -8,7 +8,6 @@ aggregate_vector_icons("brave_vector_icons") {
   icon_directory = "."
 
   icons = [
-    "autoplay_status.icon",
     "download_unlock.icon",
     "sad_folder.icon",
     "speedreader.icon",
diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn
index 63e3ab852a77..bcc9fe37e9e9 100644
--- a/browser/ui/BUILD.gn
+++ b/browser/ui/BUILD.gn
@@ -192,10 +192,6 @@ source_set("ui") {
     "//brave/browser/profiles",
     "//brave/browser/resources/settings:resources",
     "//brave/browser/tor",
-    "//brave/components/brave_wayback_machine:buildflags",
-    "//brave/components/ntp_background_images/browser",
-    "//brave/components/ntp_background_images/common",
-    "//brave/components/webcompat_reporter/browser",
     "//brave/common",
     "//brave/common:pref_names",
     "//brave/common/tor",
@@ -208,8 +204,13 @@ source_set("ui") {
     "//brave/components/brave_shields/browser",
     "//brave/components/brave_sync/buildflags:buildflags",
     "//brave/components/brave_wallet/browser/buildflags:buildflags",
+    "//brave/components/brave_wayback_machine:buildflags",
     "//brave/components/brave_welcome_ui:generated_resources",
+    "//brave/components/ntp_background_images/browser",
+    "//brave/components/ntp_background_images/common",
     "//brave/components/p3a:buildflags",
+    "//brave/components/vector_icons",
+    "//brave/components/webcompat_reporter/browser",
     "//brave/components/weekly_storage",
     "//chrome/app:command_ids",
     "//chrome/app/vector_icons:vector_icons",
diff --git a/browser/ui/content_settings/brave_autoplay_blocked_image_model.cc b/browser/ui/content_settings/brave_autoplay_blocked_image_model.cc
index 41d04cbc2045..081c522a3d5d 100644
--- a/browser/ui/content_settings/brave_autoplay_blocked_image_model.cc
+++ b/browser/ui/content_settings/brave_autoplay_blocked_image_model.cc
@@ -9,12 +9,13 @@
 
 #include "brave/browser/ui/content_settings/brave_autoplay_content_setting_bubble_model.h"
 #include "brave/grit/brave_generated_resources.h"
-#include "brave/app/vector_icons/vector_icons.h"
-#include "chrome/app/vector_icons/vector_icons.h"
+#include "brave/components/vector_icons/vector_icons.h"
 #include "components/content_settings/core/common/content_settings_types.h"
+#include "components/vector_icons/vector_icons.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icon_types.h"
 
 using content::WebContents;
 
@@ -34,7 +35,7 @@ bool BraveAutoplayBlockedImageModel::UpdateAndGetVisibility(
   if (!content_settings->IsContentBlocked(content_type()))
     return false;
 
-  const gfx::VectorIcon* badge_id = &kBlockedBadgeIcon;
+  const gfx::VectorIcon* badge_id = &vector_icons::kBlockedBadgeIcon;
   const gfx::VectorIcon* icon = &kAutoplayStatusIcon;
   set_icon(*icon, *badge_id);
   set_explanatory_string_id(IDS_BLOCKED_AUTOPLAY_TITLE);
diff --git a/browser/ui/views/profiles/brave_incognito_menu_view.cc b/browser/ui/views/profiles/brave_incognito_menu_view.cc
index e8f1d95e8c8e..2ad15a98c486 100644
--- a/browser/ui/views/profiles/brave_incognito_menu_view.cc
+++ b/browser/ui/views/profiles/brave_incognito_menu_view.cc
@@ -20,6 +20,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/vector_icons/vector_icons.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if BUILDFLAG(ENABLE_TOR)
@@ -88,7 +89,7 @@ void BraveIncognitoMenuView::BuildMenu() {
 void BraveIncognitoMenuView::AddTorButton() {
   if (ShouldShowTorProfileButton(browser()->profile())) {
     AddFeatureButton(
-        ImageForMenu(kLaunchIcon),
+        ImageForMenu(vector_icons::kLaunchIcon),
         l10n_util::GetStringUTF16(IDS_PROFILES_OPEN_TOR_PROFILE_BUTTON),
         base::BindRepeating(&BraveIncognitoMenuView::OnTorProfileButtonClicked,
                             base::Unretained(this)));
diff --git a/browser/widevine/BUILD.gn b/browser/widevine/BUILD.gn
index a002315b1788..2529bac973d4 100644
--- a/browser/widevine/BUILD.gn
+++ b/browser/widevine/BUILD.gn
@@ -7,12 +7,12 @@ source_set("widevine") {
     "//base",
     "//brave/app:brave_generated_resources_grit",
     "//brave/common:pref_names",
-    "//chrome/app/vector_icons",
     "//chrome/browser/ui",
     "//chrome/common",
     "//components/content_settings/core/common",
     "//components/permissions",
     "//components/subresource_filter/content/browser",
+    "//components/vector_icons",
     "//content/public/browser",
     "//content/public/common",
     "//third_party/widevine/cdm:buildflags",
diff --git a/browser/widevine/widevine_permission_request.cc b/browser/widevine/widevine_permission_request.cc
index b536247f2902..f0bea1c57199 100644
--- a/browser/widevine/widevine_permission_request.cc
+++ b/browser/widevine/widevine_permission_request.cc
@@ -7,7 +7,7 @@
 
 #include "brave/browser/widevine/widevine_utils.h"
 #include "brave/grit/brave_generated_resources.h"
-#include "chrome/app/vector_icons/vector_icons.h"
+#include "components/vector_icons/vector_icons.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "third_party/widevine/cdm/buildflags.h"
@@ -27,7 +27,7 @@ WidevinePermissionRequest::~WidevinePermissionRequest() {
 
 permissions::PermissionRequest::IconId WidevinePermissionRequest::GetIconId()
     const {
-  return kExtensionIcon;
+  return vector_icons::kExtensionIcon;
 }
 
 base::string16 WidevinePermissionRequest::GetMessageTextFragment() const {
diff --git a/chromium_src/chrome/browser/ui/page_info/chrome_page_info_delegate.cc b/chromium_src/chrome/browser/ui/page_info/chrome_page_info_delegate.cc
new file mode 100644
index 000000000000..6e92080f189e
--- /dev/null
+++ b/chromium_src/chrome/browser/ui/page_info/chrome_page_info_delegate.cc
@@ -0,0 +1,18 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/profiles/profile_util.h"
+
+#include "../../../../../../chrome/browser/ui/page_info/chrome_page_info_delegate.cc"
+
+bool ChromePageInfoDelegate::BraveShouldShowPermission(
+    ContentSettingsType type) {
+  if ((type == ContentSettingsType::PLUGINS ||
+       type == ContentSettingsType::GEOLOCATION) &&
+      brave::IsTorProfile(GetProfile())) {
+    return false;
+  }
+  return true;
+}
diff --git a/chromium_src/chrome/browser/ui/page_info/chrome_page_info_delegate.h b/chromium_src/chrome/browser/ui/page_info/chrome_page_info_delegate.h
new file mode 100644
index 000000000000..b3019c52c85f
--- /dev/null
+++ b/chromium_src/chrome/browser/ui/page_info/chrome_page_info_delegate.h
@@ -0,0 +1,18 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_PAGE_INFO_CHROME_PAGE_INFO_DELEGATE_H_
+#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_PAGE_INFO_CHROME_PAGE_INFO_DELEGATE_H_
+
+#include "components/page_info/page_info_delegate.h"
+
+#define IsContentDisplayedInVrHeadset                           \
+  BraveShouldShowPermission(ContentSettingsType type) override; \
+  virtual bool IsContentDisplayedInVrHeadset
+
+#include "../../../../../../chrome/browser/ui/page_info/chrome_page_info_delegate.h"
+#undef IsContentDisplayedInVrHeadset
+
+#endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_PAGE_INFO_CHROME_PAGE_INFO_DELEGATE_H_
diff --git a/chromium_src/chrome/browser/ui/page_info/page_info.cc b/chromium_src/chrome/browser/ui/page_info/page_info.cc
deleted file mode 100644
index 9e27249e394e..000000000000
--- a/chromium_src/chrome/browser/ui/page_info/page_info.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/browser/profiles/profile_util.h"
-#include "content/public/browser/web_contents.h"
-#include "chrome/browser/ui/page_info/page_info_ui.h"
-#include "chrome/browser/profiles/profile.h"
-
-namespace {
-
-bool BraveShouldShowPermission(
-    const PageInfoUI::PermissionInfo& info,
-    content::WebContents* web_contents) {
-  if ((info.type == ContentSettingsType::PLUGINS ||
-       info.type == ContentSettingsType::GEOLOCATION) &&
-      brave::IsTorProfile(
-          Profile::FromBrowserContext(web_contents->GetBrowserContext()))) {
-    return false;
-  }
-
-  return true;
-}
-
-}  // namespace
-
-#include "../../../../../../chrome/browser/ui/page_info/page_info.cc"
diff --git a/chromium_src/components/page_info/page_info.cc b/chromium_src/components/page_info/page_info.cc
new file mode 100644
index 000000000000..0dcf45b6b479
--- /dev/null
+++ b/chromium_src/components/page_info/page_info.cc
@@ -0,0 +1,14 @@
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#define BRAVE_PAGE_INFO_SHOULD_SHOW_PERMISSION                      \
+  if (delegate_->BraveShouldShowPermission(permission_info.type)) { \
+    permission_info_list.push_back(permission_info);                \
+  } else {                                                          \
+    continue;                                                       \
+  }
+
+#include "../../../../components/page_info/page_info.cc"
+#undef BRAVE_PAGE_INFO_SHOULD_SHOW_PERMISSION
diff --git a/chromium_src/components/page_info/page_info_delegate.h b/chromium_src/components/page_info/page_info_delegate.h
new file mode 100644
index 000000000000..2e30b14339de
--- /dev/null
+++ b/chromium_src/components/page_info/page_info_delegate.h
@@ -0,0 +1,16 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_PAGE_INFO_PAGE_INFO_DELEGATE_H_
+#define BRAVE_CHROMIUM_SRC_COMPONENTS_PAGE_INFO_PAGE_INFO_DELEGATE_H_
+
+#define IsContentDisplayedInVrHeadset                      \
+  BraveShouldShowPermission(ContentSettingsType type) = 0; \
+  virtual bool IsContentDisplayedInVrHeadset
+
+#include "../../../../components/page_info/page_info_delegate.h"
+#undef IsContentDisplayedInVrHeadset
+
+#endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_PAGE_INFO_PAGE_INFO_DELEGATE_H_
diff --git a/chromium_src/components/page_info/page_info_ui.cc b/chromium_src/components/page_info/page_info_ui.cc
new file mode 100644
index 000000000000..c72805e81ed3
--- /dev/null
+++ b/chromium_src/components/page_info/page_info_ui.cc
@@ -0,0 +1,14 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/components/vector_icons/vector_icons.h"
+
+#define BRAVE_PAGE_INFO_UI_GET_PERMISSION_ICON \
+  case ContentSettingsType::AUTOPLAY:          \
+    icon = &kAutoplayStatusIcon;               \
+    break;
+
+#include "../../../../components/page_info/page_info_ui.cc"
+#undef BRAVE_PAGE_INFO_UI_GET_PERMISSION_ICON
diff --git a/components/vector_icons/BUILD.gn b/components/vector_icons/BUILD.gn
new file mode 100644
index 000000000000..5a54aaba340c
--- /dev/null
+++ b/components/vector_icons/BUILD.gn
@@ -0,0 +1,25 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import("//components/vector_icons/vector_icons.gni")
+
+aggregate_vector_icons("brave_components_vector_icons") {
+  icon_directory = "."
+
+  icons = [ "autoplay_status.icon" ]
+}
+
+static_library("vector_icons") {
+  sources = get_target_outputs(":brave_components_vector_icons")
+
+  defines = [ "BRAVE_COMPONENTS_VECTOR_ICONS_IMPL" ]
+
+  deps = [
+    ":brave_components_vector_icons",
+    "//base",
+    "//skia",
+    "//ui/gfx",
+  ]
+}
diff --git a/app/vector_icons/autoplay_status.icon b/components/vector_icons/autoplay_status.icon
similarity index 100%
rename from app/vector_icons/autoplay_status.icon
rename to components/vector_icons/autoplay_status.icon
diff --git a/components/vector_icons/vector_icons.cc.template b/components/vector_icons/vector_icons.cc.template
new file mode 100644
index 000000000000..38a99c9d590e
--- /dev/null
+++ b/components/vector_icons/vector_icons.cc.template
@@ -0,0 +1,17 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// vector_icons.cc.template is used to generate vector_icons.cc. Edit the former
+// rather than the latter.
+
+#include "brave/components/vector_icons/vector_icons.h"
+
+#include "base/logging.h"
+#include "components/vector_icons/cc_macros.h"
+#include "ui/gfx/vector_icon_types.h"
+
+#define DECLARE_VECTOR_COMMAND(x) using gfx::x;
+DECLARE_VECTOR_COMMANDS
+
+TEMPLATE_PLACEHOLDER
diff --git a/components/vector_icons/vector_icons.h.template b/components/vector_icons/vector_icons.h.template
new file mode 100644
index 000000000000..df8afea7fb79
--- /dev/null
+++ b/components/vector_icons/vector_icons.h.template
@@ -0,0 +1,26 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// vector_icons.h.template is used to generate vector_icons.h. Edit the former
+// rather than the latter.
+
+#ifndef BRAVE_COMPONENTS_VECTOR_ICONS_VECTOR_ICONS_H_
+#define BRAVE_COMPONENTS_VECTOR_ICONS_VECTOR_ICONS_H_
+
+namespace gfx {
+struct VectorIcon;
+}
+
+#define VECTOR_ICON_TEMPLATE_H(icon_name) \
+extern const gfx::VectorIcon icon_name;
+
+#if defined(FEATURE_MODULES) && defined(BRAVE_COMPONENTS_VECTOR_ICONS_IMPL)
+#define VECTOR_ICON_EXPORT __attribute__((visibility("default")))
+#endif
+
+TEMPLATE_PLACEHOLDER
+
+#undef VECTOR_ICON_TEMPLATE_H
+
+#endif  // BRAVE_COMPONENTS_VECTOR_ICONS_VECTOR_ICONS_H_
diff --git a/patches/chrome-browser-ui-page_info-page_info.cc.patch b/patches/chrome-browser-ui-page_info-page_info.cc.patch
deleted file mode 100644
index 7099214491d8..000000000000
--- a/patches/chrome-browser-ui-page_info-page_info.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/chrome/browser/ui/page_info/page_info.cc b/chrome/browser/ui/page_info/page_info.cc
-index 918adb7c9628e68ba367e5dff25910536976d03b..0f1f87c99100aea01c964d726c663be0cbac1a3c 100644
---- a/chrome/browser/ui/page_info/page_info.cc
-+++ b/chrome/browser/ui/page_info/page_info.cc
-@@ -172,6 +172,7 @@ bool ShouldShowPermission(const PageInfoUI::PermissionInfo& info,
-                           HostContentSettingsMap* content_settings,
-                           content::WebContents* web_contents,
-                           bool changed_since_last_page_load) {
-+  if (!BraveShouldShowPermission(info, web_contents)) return false;
-   // Note |ContentSettingsType::ADS| will show up regardless of its default
-   // value when it has been activated on the current origin.
-   if (info.type == ContentSettingsType::ADS) {
diff --git a/patches/chrome-browser-ui-page_info-page_info_ui.cc.patch b/patches/chrome-browser-ui-page_info-page_info_ui.cc.patch
deleted file mode 100644
index 29bb40418577..000000000000
--- a/patches/chrome-browser-ui-page_info-page_info_ui.cc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/chrome/browser/ui/page_info/page_info_ui.cc b/chrome/browser/ui/page_info/page_info_ui.cc
-index 38f48905784266a85ccb0f2decfadbd9b6d089ea..73323f92e97b8fc39615b94938ad65dcab9fa01d 100644
---- a/chrome/browser/ui/page_info/page_info_ui.cc
-+++ b/chrome/browser/ui/page_info/page_info_ui.cc
-@@ -30,6 +30,7 @@
- #if defined(OS_ANDROID)
- #include "chrome/browser/android/android_theme_resources.h"
- #else
-+#include "brave/app/vector_icons/vector_icons.h"
- #include "chrome/app/vector_icons/vector_icons.h"
- #include "components/prefs/pref_service.h"
- #include "media/base/media_switches.h"
-@@ -616,6 +617,9 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon(const PermissionInfo& info,
-     case ContentSettingsType::USB_GUARD:
-       icon = &vector_icons::kUsbIcon;
-       break;
-+    case ContentSettingsType::AUTOPLAY:
-+      icon = &kAutoplayStatusIcon;
-+      break;
-     case ContentSettingsType::SERIAL_GUARD:
-       icon = &vector_icons::kSerialPortIcon;
-       break;
diff --git a/patches/components-page_info-BUILD.gn.patch b/patches/components-page_info-BUILD.gn.patch
new file mode 100644
index 000000000000..7478548ff573
--- /dev/null
+++ b/patches/components-page_info-BUILD.gn.patch
@@ -0,0 +1,12 @@
+diff --git a/components/page_info/BUILD.gn b/components/page_info/BUILD.gn
+index 8fecfec436e938370d5a52baa54fe1b312bbf832..2ecc7b8e8356d76b1f08ee5e1d37ce9b929b5100 100644
+--- a/components/page_info/BUILD.gn
++++ b/components/page_info/BUILD.gn
+@@ -37,6 +37,7 @@ static_library("page_info") {
+     "//services/device/public/cpp:device_features",
+     "//services/metrics/public/cpp:ukm_builders",
+   ]
++  deps += [ "//brave/components/vector_icons" ]
+ 
+   if (is_android) {
+     deps += [
diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch
new file mode 100644
index 000000000000..8b7c18e2682b
--- /dev/null
+++ b/patches/components-page_info-page_info.cc.patch
@@ -0,0 +1,12 @@
+diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
+index 8c34cb80e20be2926d16dd1522c62ed48c3840ce..29637cef4a19b68a80a0548a7de0a0b813629404 100644
+--- a/components/page_info/page_info.cc
++++ b/components/page_info/page_info.cc
+@@ -948,6 +948,7 @@ void PageInfo::PresentSitePermissions() {
+ 
+     // TODO(crbug.com/1058597): Remove the call to |delegate_| once
+     // TabSpecificContentSettings has been componentized.
++    BRAVE_PAGE_INFO_SHOULD_SHOW_PERMISSION
+     if (ShouldShowPermission(permission_info, site_url_, content_settings,
+                              web_contents(),
+                              delegate_->HasContentSettingChangedViaPageInfo(
diff --git a/patches/components-page_info-page_info_ui.cc.patch b/patches/components-page_info-page_info_ui.cc.patch
new file mode 100644
index 000000000000..49338e0fd461
--- /dev/null
+++ b/patches/components-page_info-page_info_ui.cc.patch
@@ -0,0 +1,12 @@
+diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_info_ui.cc
+index 7cf58fb855df796ad18f6496a953a3e788052259..7b58404aa81c67a5ec07c4d525100bd38cf29940 100644
+--- a/components/page_info/page_info_ui.cc
++++ b/components/page_info/page_info_ui.cc
+@@ -547,6 +547,7 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon(const PermissionInfo& info,
+                                                    SkColor related_text_color) {
+   const gfx::VectorIcon* icon = &gfx::kNoneIcon;
+   switch (info.type) {
++    BRAVE_PAGE_INFO_UI_GET_PERMISSION_ICON
+     case ContentSettingsType::COOKIES:
+       icon = &vector_icons::kCookieIcon;
+       break;

From ae08147a3e85a2036d76a80c4c13ca1179d13a20 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 3 Apr 2020 13:52:55 -0400
Subject: [PATCH 039/161] //components/crash/content/app moved to
 //components/crash/core/app.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/92f84b6ac7af44269fa377f4ecc1eaf05e83c1e5

commit 92f84b6ac7af44269fa377f4ecc1eaf05e83c1e5
Author: Rohit Rao <rohitrao@chromium.org>
Date:   Wed Mar 25 14:57:50 2020 +0000

    Moves //components/crash/content/app to //components/crash/core/app.

    Most of the files in this directory had no //content dependencies.
    Those that did were left in place.

    BUG=1061431
---
 .../crash/{content => core}/app/crashpad_android.cc       | 3 ++-
 .../crash/{content => core}/app/crashpad_win.cc           | 3 ++-
 ... => components-crash-core-app-breakpad_linux.cc.patch} | 8 ++++----
 ...ch => components-crash-core-app-crashpad_mac.mm.patch} | 8 ++++----
 4 files changed, 12 insertions(+), 10 deletions(-)
 rename chromium_src/components/crash/{content => core}/app/crashpad_android.cc (98%)
 rename chromium_src/components/crash/{content => core}/app/crashpad_win.cc (94%)
 rename patches/{components-crash-content-app-breakpad_linux.cc.patch => components-crash-core-app-breakpad_linux.cc.patch} (55%)
 rename patches/{components-crash-content-app-crashpad_mac.mm.patch => components-crash-core-app-crashpad_mac.mm.patch} (57%)

diff --git a/chromium_src/components/crash/content/app/crashpad_android.cc b/chromium_src/components/crash/core/app/crashpad_android.cc
similarity index 98%
rename from chromium_src/components/crash/content/app/crashpad_android.cc
rename to chromium_src/components/crash/core/app/crashpad_android.cc
index 79be0e1f95cb..a1c497cc9b7d 100644
--- a/chromium_src/components/crash/content/app/crashpad_android.cc
+++ b/chromium_src/components/crash/core/app/crashpad_android.cc
@@ -6,6 +6,7 @@
 #include <map>
 
 #include "base/files/file_path.h"
+#include "components/crash/core/app/crashpad.h"
 
 namespace crashpad {
 
@@ -92,7 +93,7 @@ crashpad::BraveCrashpadClient& GetBraveCrashpadClient() {
 
 #define COMPONENTS_CRASH_CONTENT_APP_CRASHPAD_H_
 #define GetCrashpadClient GetBraveCrashpadClient
-#include "../../../../../../components/crash/content/app/crashpad_android.cc"
+#include "../../../../../../components/crash/core/app/crashpad_android.cc"
 #undef GetCrashpadClient
 
 namespace crash_reporter {
diff --git a/chromium_src/components/crash/content/app/crashpad_win.cc b/chromium_src/components/crash/core/app/crashpad_win.cc
similarity index 94%
rename from chromium_src/components/crash/content/app/crashpad_win.cc
rename to chromium_src/components/crash/core/app/crashpad_win.cc
index 0090919fdc00..c7546da732f8 100644
--- a/chromium_src/components/crash/content/app/crashpad_win.cc
+++ b/chromium_src/components/crash/core/app/crashpad_win.cc
@@ -6,6 +6,7 @@
 #include <map>
 
 #include "base/files/file_path.h"
+#include "components/crash/core/app/crashpad.h"
 
 namespace crashpad {
 
@@ -38,7 +39,7 @@ crashpad::BraveCrashpadClient& GetBraveCrashpadClient() {
 
 #define COMPONENTS_CRASH_CONTENT_APP_CRASHPAD_H_
 #define GetCrashpadClient GetBraveCrashpadClient
-#include "../../../../../../components/crash/content/app/crashpad_win.cc"
+#include "../../../../../../components/crash/core/app/crashpad_win.cc"
 #undef GetCrashpadClient
 
 namespace crash_reporter {
diff --git a/patches/components-crash-content-app-breakpad_linux.cc.patch b/patches/components-crash-core-app-breakpad_linux.cc.patch
similarity index 55%
rename from patches/components-crash-content-app-breakpad_linux.cc.patch
rename to patches/components-crash-core-app-breakpad_linux.cc.patch
index 0bef9e4b4f7a..18b050929066 100644
--- a/patches/components-crash-content-app-breakpad_linux.cc.patch
+++ b/patches/components-crash-core-app-breakpad_linux.cc.patch
@@ -1,7 +1,7 @@
-diff --git a/components/crash/content/app/breakpad_linux.cc b/components/crash/content/app/breakpad_linux.cc
-index c1edb2b014ec1edb730ce107b45235e11c42482a..d99a4a84843511672938cd0c686834503978ea16 100644
---- a/components/crash/content/app/breakpad_linux.cc
-+++ b/components/crash/content/app/breakpad_linux.cc
+diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
+index 192b0a7f137f311abb6a991f997e11f5eba52256..f4016ce900a3cb858472f2c872b682594c460d54 100644
+--- a/components/crash/core/app/breakpad_linux.cc
++++ b/components/crash/core/app/breakpad_linux.cc
 @@ -103,8 +103,12 @@ namespace {
  // while we do have functions to deal with uint64_t's.
  uint64_t g_crash_loop_before_time = 0;
diff --git a/patches/components-crash-content-app-crashpad_mac.mm.patch b/patches/components-crash-core-app-crashpad_mac.mm.patch
similarity index 57%
rename from patches/components-crash-content-app-crashpad_mac.mm.patch
rename to patches/components-crash-core-app-crashpad_mac.mm.patch
index b100b9df9180..ac8eaebf2598 100644
--- a/patches/components-crash-content-app-crashpad_mac.mm.patch
+++ b/patches/components-crash-core-app-crashpad_mac.mm.patch
@@ -1,7 +1,7 @@
-diff --git a/components/crash/content/app/crashpad_mac.mm b/components/crash/content/app/crashpad_mac.mm
-index c2de9fe867c5e9fc2cf75f12ee136ad529474243..ecbe76677e68be1fa1ec29e9ad5877b5b2d140f1 100644
---- a/components/crash/content/app/crashpad_mac.mm
-+++ b/components/crash/content/app/crashpad_mac.mm
+diff --git a/components/crash/core/app/crashpad_mac.mm b/components/crash/core/app/crashpad_mac.mm
+index b579521d55860823722df2ee849f6b1628b3c950..4ed7ba3c9f10be8a955f1efa70e8395d4f2826f2 100644
+--- a/components/crash/core/app/crashpad_mac.mm
++++ b/components/crash/core/app/crashpad_mac.mm
 @@ -137,6 +137,8 @@ base::FilePath PlatformCrashpadInitialization(
        // Only allow the possibility of report upload in official builds. This
        // crash server won't have symbols for any other build types.

From 4070adec5cbd5646773f8005379b5ec5968feea4 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 3 Apr 2020 14:08:15 -0400
Subject: [PATCH 040/161] [Android] ChosenObjectSettings base class changed.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/754e9e09910ebe1ec39c262d1fb22119d30d955e

commit 754e9e09910ebe1ec39c262d1fb22119d30d955e
Author: Robbie McElrath <rmcelrath@chromium.org>
Date:   Mon Mar 30 19:00:18 2020 +0000

    [WebLayer] Create a SiteSettingsClient interface.

    This interface is used by the Site Settings UI to get embedder-specific
    logic, and will be used to abstract Chrome-specific logic so the rest
    of the Site Settings UI can be componentized. The Client is set in the
    Fragment by SettingsActivity.

    As of this CL, only the ManagedPreferenceDelegate is accessible through
    this new interface, but other embedder-specific logic will be moved
    behind it as well in future CLs.

    See go/weblayer-site-settings for more information.

    Bug: 1058597
---
 .../BraveSiteSettingsPreferencesBase.java           |  2 +-
 ...er-site_settings-ChosenObjectSettings.java.patch | 13 ++-----------
 ...-site_settings-SingleCategorySettings.java.patch | 13 ++-----------
 ...r-site_settings-SingleWebsiteSettings.java.patch | 13 -------------
 ...me-browser-site_settings-SiteSettings.java.patch |  6 +++---
 ...ttings-SiteSettingsPreferenceFragment.java.patch | 13 +++++++++++++
 6 files changed, 21 insertions(+), 39 deletions(-)
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleWebsiteSettings.java.patch
 create mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettingsPreferenceFragment.java.patch

diff --git a/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java
index 2f99913c8b93..0db6da5285cf 100644
--- a/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java
+++ b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java
@@ -15,7 +15,7 @@
 
 import java.util.HashMap;
 
-public class BraveSiteSettingsPreferencesBase extends BravePreferenceFragment {
+public class BraveSiteSettingsPreferencesBase extends SiteSettingsPreferenceFragment {
     private static final String DESKTOP_MODE_CATEGORY_KEY = "desktop_mode_category";
     private static final String PLAY_YT_VIDEO_IN_BROWSER_CATEGORY_KEY = "play_yt_video_in_browser_category";
     private static final String ADS_KEY = "ads";
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch
index bf334ce5b474..e23ad1cad8dd 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch
@@ -1,17 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
-index 46a8f69a21ef6ce6b914e48d32d917a0846eb5bb..d91bca6fa33ce8132d32737385a4db5a1b8fb6ec 100644
+index e3ad44adfd849b0d390cb8e797e2049aab40decf..aa03e6403e64ce52b7d5aa8a7f2d7a935c0da9cf 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
-@@ -37,7 +37,7 @@ import java.util.Locale;
-  * Shows a particular chosen object (e.g. a USB device) and the list of sites that have been
-  * granted access to it by the user.
-  */
--public class ChosenObjectSettings extends PreferenceFragmentCompat {
-+public class ChosenObjectSettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
-     public static final String EXTRA_OBJECT_INFOS = "org.chromium.chrome.preferences.object_infos";
-     public static final String EXTRA_SITES = "org.chromium.chrome.preferences.site_set";
-     public static final String EXTRA_CATEGORY =
-@@ -136,7 +136,7 @@ public class ChosenObjectSettings extends PreferenceFragmentCompat {
+@@ -134,7 +134,7 @@ public class ChosenObjectSettings extends SiteSettingsPreferenceFragment {
                      null);
              return true;
          }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch
index c686b1619cca..270eb6a34903 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch
@@ -1,17 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
-index 6a25cd6017790bf153781ca1be210e41824649c2..407acb17dfecb23d403e074cb63c6f1da04ecb1b 100644
+index 55dbf87b53bc281ec760f4442dad68e52f8c849e..f9dd0b11d158bf88e2ec71575175d52c63f140b1 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
-@@ -75,7 +75,7 @@ import java.util.Set;
-  * the websites with microphone permissions. When the user selects a site, SingleWebsiteSettings
-  * is launched to allow the user to see or modify the settings for that particular website.
-  */
--public class SingleCategorySettings extends PreferenceFragmentCompat
-+public class SingleCategorySettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment
-         implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
-                    AddExceptionPreference.SiteAddedCallback, View.OnClickListener,
-                    PreferenceManager.OnPreferenceTreeClickListener {
-@@ -408,7 +408,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
+@@ -427,7 +427,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              if (queryHasChanged) getInfoForOrigins();
              return true;
          }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleWebsiteSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleWebsiteSettings.java.patch
deleted file mode 100644
index 483b4b7aa375..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleWebsiteSettings.java.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleWebsiteSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleWebsiteSettings.java
-index a02b573ff6c24e48e6e949367b79380355876f92..77cd997bd4d82d1d82eb2d2bfdcdbc666e20ade3 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleWebsiteSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleWebsiteSettings.java
-@@ -46,7 +46,7 @@ import java.util.Set;
- /**
-  * Shows the permissions and other settings for a particular website.
-  */
--public class SingleWebsiteSettings extends PreferenceFragmentCompat
-+public class SingleWebsiteSettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment
-         implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
-     // SingleWebsiteSettings expects either EXTRA_SITE (a Website) or
-     // EXTRA_SITE_ADDRESS (a WebsiteAddress) to be present (but not both). If
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettings.java.patch
index b0e875eb181e..95923d2da3eb 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettings.java.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java
-index c5b727493d132dac5102d10b14fa92940fb9e43c..a6475c8669456eab83a77474bef2ec1717bf8978 100644
+index 92717e721dc19c4d1f53610e50a912bdc7ad2409..89ef2f8db0bbaed95feeee61c3adf2d198fcb6b4 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java
-@@ -28,7 +28,7 @@ import java.util.List;
+@@ -27,7 +27,7 @@ import java.util.List;
   * browser-wide.
   */
  public class SiteSettings
--        extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener {
+-        extends SiteSettingsPreferenceFragment implements Preference.OnPreferenceClickListener {
 +        extends BraveSiteSettingsPreferencesBase implements Preference.OnPreferenceClickListener {
      // The keys for each category shown on the Site Settings page
      // are defined in the SiteSettingsCategory.
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettingsPreferenceFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettingsPreferenceFragment.java.patch
new file mode 100644
index 000000000000..6d23cc2d2220
--- /dev/null
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SiteSettingsPreferenceFragment.java.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettingsPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettingsPreferenceFragment.java
+index 8f2a87d527c43ae611c5ad53c43901c0ab87c493..8d71e467e24eb0c9ae227eb6fca53b2b4b2269e0 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettingsPreferenceFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettingsPreferenceFragment.java
+@@ -9,7 +9,7 @@ import androidx.preference.PreferenceFragmentCompat;
+ /**
+  * Preference fragment for showing the Site Settings UI.
+  */
+-public abstract class SiteSettingsPreferenceFragment extends PreferenceFragmentCompat {
++public abstract class SiteSettingsPreferenceFragment extends org.chromium.chrome.browser.settings.BravePreferenceFragment {
+     private SiteSettingsClient mSiteSettingsClient;
+ 
+     /**

From e96d4d4a6e7240a4ea2131c166fbb15994f93c4e Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 3 Apr 2020 15:40:20 -0400
Subject: [PATCH 041/161] More Mac signing script changes.

Moved call to create Brave config into config_factory.py.
Added a static method to our config creation to prevent an exception
when Chrome's config loading is attempted.

Maybe need to add code to throw an exception when provisioning profile
is not found from the env when not a development config, but development
var isn't passed into the config_factory which means we'd need to add
another patch.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/f21027ab4d74ea035d98bbf6ba77e8fa148f08b5

commit f21027ab4d74ea035d98bbf6ba77e8fa148f08b5
Author: Joshua Pawlicki <waffles@chromium.org>
Date:   Mon Mar 23 17:45:15 2020 +0000

    Create an updater-specific signing pipeline.

    Bug: 926234
---
 .../chrome-installer-mac-sign_chrome.py.patch | 29 -------------------
 ...taller-mac-signing-config_factory.py.patch | 13 +++++++++
 script/signing_helper.py                      | 22 ++++++++------
 3 files changed, 26 insertions(+), 38 deletions(-)
 delete mode 100644 patches/chrome-installer-mac-sign_chrome.py.patch
 create mode 100644 patches/chrome-installer-mac-signing-config_factory.py.patch

diff --git a/patches/chrome-installer-mac-sign_chrome.py.patch b/patches/chrome-installer-mac-sign_chrome.py.patch
deleted file mode 100644
index 419780cbe45c..000000000000
--- a/patches/chrome-installer-mac-sign_chrome.py.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/chrome/installer/mac/sign_chrome.py b/chrome/installer/mac/sign_chrome.py
-index b1cb1f4beaca0f61cb4a1dff0039dcc02c2614f2..321a7c4802ed60bbb91fc918f4f33fce746a79b0 100755
---- a/chrome/installer/mac/sign_chrome.py
-+++ b/chrome/installer/mac/sign_chrome.py
-@@ -44,6 +44,7 @@ def create_config(config_args, development):
-     from signing.chromium_config import ChromiumCodeSignConfig
-     config_class = ChromiumCodeSignConfig
- 
-+    """
-     # Then search for the internal config for Google Chrome.
-     try:
-         from signing.internal_config import InternalCodeSignConfig
-@@ -53,6 +54,7 @@ def create_config(config_args, development):
-         # internal config has to be available.
-         if config_class.is_chrome_branded():
-             raise e
-+    """
- 
-     if development:
- 
-@@ -74,6 +76,8 @@ def create_config(config_args, development):
- 
-         config_class = DevelopmentCodeSignConfig
- 
-+    from signing_helper import GetBraveSigningConfig
-+    config_class = GetBraveSigningConfig(config_class, development)
-     return config_class(*config_args)
- 
- 
diff --git a/patches/chrome-installer-mac-signing-config_factory.py.patch b/patches/chrome-installer-mac-signing-config_factory.py.patch
new file mode 100644
index 000000000000..868a962f9627
--- /dev/null
+++ b/patches/chrome-installer-mac-signing-config_factory.py.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/installer/mac/signing/config_factory.py b/chrome/installer/mac/signing/config_factory.py
+index 0689fb6476e741b711454aeaf4ac7c20d5e4f989..c303bb474dcf4036fc1e8d8b6985af20ae2e4f62 100644
+--- a/chrome/installer/mac/signing/config_factory.py
++++ b/chrome/installer/mac/signing/config_factory.py
+@@ -8,6 +8,8 @@ def get_class():
+     # First look up the processed Chromium config.
+     from chromium_config import ChromiumCodeSignConfig
+     config_class = ChromiumCodeSignConfig
++    from signing_helper import GetBraveSigningConfig
++    config_class = GetBraveSigningConfig(config_class)
+ 
+     # Then search for the internal config for Google Chrome.
+     try:
diff --git a/script/signing_helper.py b/script/signing_helper.py
index 60a81d8a2691..2e47c4987bb2 100644
--- a/script/signing_helper.py
+++ b/script/signing_helper.py
@@ -120,16 +120,20 @@ def AddBravePartsForSigning(parts, config):
     return parts
 
 
-def GetBraveSigningConfig(config_class, development, mac_provisioning_profile=None):
-    if development:
-        return config_class
+def GetBraveSigningConfig(config_class):
+    class ConfigNonChromeBranded(config_class):
+
+        @staticmethod
+        def is_chrome_branded():
+            return False
 
-    if mac_provisioning_profile is not None:
-        provisioning_profile = mac_provisioning_profile
-    else:
-        # Retrieve provisioning profile exported by build/mac/sign_app.sh
-        provisioning_profile = os.environ['MAC_PROVISIONING_PROFILE']
-        assert len(provisioning_profile), 'MAC_PROVISIONING_PROFILE is not set'
+    config_class = ConfigNonChromeBranded
+
+    # Retrieve provisioning profile exported by build/mac/sign_app.sh
+    # If not set, then it's development config.
+    provisioning_profile = os.environ['MAC_PROVISIONING_PROFILE']
+    if not len(provisioning_profile):
+        return config_class
 
     class ProvisioningProfileCodeSignConfig(config_class):
 

From 900e91b91b1f3454a8858349bfc0873c13b137e3 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 3 Apr 2020 16:25:24 -0400
Subject: [PATCH 042/161] source_is_generated ->
 enable_input_discovery_for_gn_analyze.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/6ade5dc4cb183b0f58cf9c1795fdfc6cba5e14bf

commit 6ade5dc4cb183b0f58cf9c1795fdfc6cba5e14bf
Author: Andrew Grieve <agrieve@chromium.org>
Date:   Tue Mar 17 20:52:02 2020 +0000

    Rename source_is_generated -> enable_input_discovery_for_gn_analyze

    And update docs for the setting.

    Bug: 1054892
---
 browser/resources/extensions/BUILD.gn | 2 +-
 browser/resources/settings/BUILD.gn   | 2 +-
 components/common/typescript.gni      | 2 +-
 ui/webui/resources/BUILD.gn           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/resources/extensions/BUILD.gn b/browser/resources/extensions/BUILD.gn
index 45605475d8f3..8693d25ef5c5 100644
--- a/browser/resources/extensions/BUILD.gn
+++ b/browser/resources/extensions/BUILD.gn
@@ -7,7 +7,7 @@ grit("resources") {
   source = "extensions_resources.grd"
 
   # The .grd contains references to generated files.
-  source_is_generated = true
+  enable_input_discovery_for_gn_analyze = true
   grit_flags = [
     "-E",
     "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
diff --git a/browser/resources/settings/BUILD.gn b/browser/resources/settings/BUILD.gn
index 3cda4e79901b..6963c91b82bb 100644
--- a/browser/resources/settings/BUILD.gn
+++ b/browser/resources/settings/BUILD.gn
@@ -14,7 +14,7 @@ grit("resources") {
     "enable_brave_wayback_machine=$enable_brave_wayback_machine",
   ]
 
-  source_is_generated = optimize_webui
+  enable_input_discovery_for_gn_analyze = optimize_webui
 
   outputs = [
     "grit/brave_settings_resources.h",
diff --git a/components/common/typescript.gni b/components/common/typescript.gni
index adaa0243285c..d17db63d3022 100644
--- a/components/common/typescript.gni
+++ b/components/common/typescript.gni
@@ -177,7 +177,7 @@ template("pack_web_resources") {
       generated_dir = "$root_gen_dir/brave/web-ui-$resource_name"
     }
     source = "$generated_dir/$resource_name.grd"
-    source_is_generated = true
+    enable_input_discovery_for_gn_analyze = true
 
     outputs = [
       "grit/$resource_name" + "_generated.h",
diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn
index e99bb37bc1b7..88be18ce3cf9 100644
--- a/ui/webui/resources/BUILD.gn
+++ b/ui/webui/resources/BUILD.gn
@@ -9,7 +9,7 @@ grit("resources") {
   deps = [ ":modulize" ]
 
   # The .grd contains references to generated files.
-  source_is_generated = true
+  enable_input_discovery_for_gn_analyze = true
 
   outputs = [
     "grit/brave_webui_resources.h",

From 33265c9d02508b4ce84ce2906e7652122af48d58 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 3 Apr 2020 19:58:55 -0400
Subject: [PATCH 043/161] Disable unreachable-code build errors.

We patch code in places by immediately returning from functions/methods,
which causes ureachable-code errors.

Chromium changes:

3afe3d815b02 Enable -Wunreachable-code for internal iOS builds.
16249b38f48a Reland "Enable -Wunreachable-code in iOS builds (except for internal builds)."
18926aac4b17 Revert "Enable -Wunreachable-code in iOS builds (except for internal builds)."
a7b569e6be6a Enable -Wunreachable-code in iOS builds (except for internal builds).
1add1c909d19 Enable -Wunreachable-code in Mac builds.
eb5502886733 Wunreachable-code: List target_os that do not use the flag, instead of the ones that do.
e44258cbf461 Enable -Wunreachable-code for win/asan.
fa18fef1b31a Reland "Enable -Wunreachable-code on Windows."
6d6956573c0e Revert "Enable -Wunreachable-code on Windows."
e334b16ecf68 Enable -Wunreachable-code on Windows.
8a3cdc59b72d Reland "Enable -Wunreachable-code on Android."
eea1e99dfa7e Revert "Enable -Wunreachable-code on Android."
4a5118005a89 Enable -Wunreachable-code on Android.
72f3015c3b88 Reland "Enable -Wunreachable-code in Chrome OS builds."
451c0a00e417 Revert "Enable -Wunreachable-code in (non-arm) Chrome OS builds."
2ff5fdbc7071 Enable -Wunreachable-code in (non-arm) Chrome OS builds.
057808f1be13 Reland "Enable -Wunreachable-code in Fuchsia builds."
66d981c07546 Revert "Enable -Wunreachable-code in Fuchsia builds."
ec7d2855c15a Enable -Wunreachable-code in Fuchsia builds.
d9d917c05c2a Enable Wunreachable-code for chromium_code on Linux.
---
 patches/build-config-compiler-BUILD.gn.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 patches/build-config-compiler-BUILD.gn.patch

diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch
new file mode 100644
index 000000000000..1c8813a65227
--- /dev/null
+++ b/patches/build-config-compiler-BUILD.gn.patch
@@ -0,0 +1,12 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 3d5e4dede0ba6f01b5d002e46e835a16b6eb3a45..27fb13271336fb1e245321513b5041743c936e80 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1593,6 +1593,7 @@ config("chromium_code") {
+     # use_libfuzzer: https://crbug.com/1063180
+     if (!is_nacl && !use_libfuzzer) {
+       cflags += [ "-Wunreachable-code" ]
++      cflags -= [ "-Wunreachable-code" ]
+     }
+ 
+     # Thread safety analysis is broken under nacl: https://crbug.com/982423.

From fab345da3493b4046b24225a9dcd1806d587bb48 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 6 Apr 2020 10:36:24 -0400
Subject: [PATCH 044/161] views::FlexSpecification::ForXXX methods removed.

Use constructors instead.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/b0065070fe6ae7e9a1730b7552c8ea6a952bcdc0

commit b0065070fe6ae7e9a1730b7552c8ea6a952bcdc0
Author: Peter Kasting <pkasting@chromium.org>
Date:   Tue Feb 4 20:19:40 2020 +0000

    Eliminate FlexSpecification private constructor.

    Having the various WithXXX() methods depending on this was fragile
    against future changes that add members to the class, unless the
    constructor takes them as args.  This bit me while fixing bug 1012136.
    They now do a copy-and-set (preserving all existing state).

    Having the ForXXX() methods depend on this failed to take advantage of
    member default values, and delegating constructors, which is also a bit
    of a maintenance hazard.  These are now constructors directly.

    Finally, having factory functions is unusual when construction cannot
    fail, needs no extra initialization, and doesn't return a pointer to a
    polymorphic base; plus, the factory methods are more verbose, but (IMO)
    do not really add significant/necessary clarity.

    Bug: none
---
 .../brave_wayback_machine_infobar_contents_view.cc    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc b/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc
index c9e39bc42af4..c64b703beff3 100644
--- a/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc
+++ b/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc
@@ -121,9 +121,8 @@ void BraveWaybackMachineInfoBarContentsView::InitializeChildren() {
   AddChildView(separator_);
 
   const views::FlexSpecification label_flex_rule =
-      views::FlexSpecification::ForSizeRule(
-          views::MinimumFlexSizeRule::kScaleToMinimum,
-          views::MaximumFlexSizeRule::kPreferred);
+      views::FlexSpecification(views::MinimumFlexSizeRule::kScaleToMinimum,
+                               views::MaximumFlexSizeRule::kPreferred);
   auto* label = CreateLabel(
       l10n_util::GetStringUTF16(
           IDS_BRAVE_WAYBACK_MACHINE_INFOBAR_PAGE_MISSING_TEXT));
@@ -156,9 +155,9 @@ void BraveWaybackMachineInfoBarContentsView::InitializeChildren() {
   place_holder_view->SetProperty(views::kMarginsKey, gfx::Insets(12, 0));
   place_holder_view->SetProperty(
       views::kFlexBehaviorKey,
-      views::FlexSpecification::ForSizeRule(
-          views::MinimumFlexSizeRule::kScaleToZero,
-          views::MaximumFlexSizeRule::kUnbounded).WithOrder(3));
+      views::FlexSpecification(views::MinimumFlexSizeRule::kScaleToZero,
+                               views::MaximumFlexSizeRule::kUnbounded)
+          .WithOrder(3));
   AddChildView(place_holder_view);
 
   label = CreateLabel(

From 5fc8d38fb24e1cbb56c0732e55073c5d9d3a346f Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 6 Apr 2020 12:02:17 -0400
Subject: [PATCH 045/161] content::ResourceType moved to blink.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/ee5af39bb4f01da6c7c0b803af74a9361e6fd8c6

commit ee5af39bb4f01da6c7c0b803af74a9361e6fd8c6
Author: Minggang Wang <minggang.wang@intel.com>
Date:   Wed Feb 5 02:55:28 2020 +0000

    [OnionSoup] Move resource_load_info.mojom into Blink

    The current mojom struct ResourceLoadInfo defined in //content is used
    to notify the status of a resource loading, which is unavailable
    inside Blink.

    Along with the implementation of OnionSoup of loaders, we are going to
    notify the loading status from Blink directly. So we have to move this
    mojom struct into Blink in order to leverage it there.

    This CL makes the changes below:
    - Remove the ResourceType in //content and its typemap and replace with
      the mojom one.
    - Move the resource_load_info.mojom into Blink.

    Bug: 860403
---
 browser/BUILD.gn                              |  1 +
 browser/brave_content_browser_client.cc       |  4 +-
 browser/brave_rewards/rewards_tab_helper.cc   | 15 +++---
 browser/brave_rewards/rewards_tab_helper.h    |  2 +-
 browser/net/BUILD.gn                          |  1 +
 ...ave_ad_block_tp_network_delegate_helper.cc |  2 -
 browser/net/url_context.cc                    |  2 +-
 browser/net/url_context.h                     |  8 +--
 .../brave_perf_predictor/browser/BUILD.gn     |  2 +-
 .../browser/bandwidth_savings_predictor.cc    | 19 ++++---
 .../browser/bandwidth_savings_predictor.h     |  6 +--
 .../bandwidth_savings_predictor_unittest.cc   | 16 +++---
 .../browser/perf_predictor_tab_helper.cc      |  2 +-
 .../browser/perf_predictor_tab_helper.h       |  6 ++-
 components/brave_shields/browser/BUILD.gn     |  1 +
 .../browser/ad_block_base_service.cc          | 51 ++++++++++---------
 .../browser/ad_block_base_service.h           | 11 ++--
 .../browser/ad_block_regional_service.h       |  1 -
 .../ad_block_regional_service_manager.cc      |  2 +-
 .../ad_block_regional_service_manager.h       |  4 +-
 .../browser/base_brave_shields_service.cc     |  5 +-
 .../browser/base_brave_shields_service.h      | 12 ++---
 .../browser/tracking_protection_service.cc    |  2 +-
 .../browser/tracking_protection_service.h     |  4 +-
 ...orrent_redirect_network_delegate_helper.cc |  4 +-
 ...direct_network_delegate_helper_unittest.cc | 22 ++++----
 26 files changed, 105 insertions(+), 100 deletions(-)

diff --git a/browser/BUILD.gn b/browser/BUILD.gn
index e86f294eceac..b7bef01fee86 100644
--- a/browser/BUILD.gn
+++ b/browser/BUILD.gn
@@ -180,6 +180,7 @@ source_set("browser_process") {
     "ntp_background_images",
     "//services/network/public/cpp",
     "//services/service_manager/embedder",
+    "//third_party/blink/public/mojom:mojom_platform_headers",
     "//third_party/widevine/cdm:buildflags",
     "//ui/base",
   ]
diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc
index 3869fe7935a4..e33e4c348236 100644
--- a/browser/brave_content_browser_client.cc
+++ b/browser/brave_content_browser_client.cc
@@ -96,7 +96,7 @@ using extensions::ChromeContentBrowserClientExtensionsPart;
 #if BUILDFLAG(ENABLE_SPEEDREADER)
 #include "brave/browser/speedreader/speedreader_tab_helper.h"
 #include "brave/components/speedreader/speedreader_throttle.h"
-#include "content/public/common/resource_type.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
 #endif
 
 #if BUILDFLAG(BINANCE_ENABLED)
@@ -293,7 +293,7 @@ BraveContentBrowserClient::CreateURLLoaderThrottles(
       speedreader::SpeedreaderTabHelper::FromWebContents(contents);
   if (tab_helper && tab_helper->IsActiveForMainFrame()
       && request.resource_type
-          == static_cast<int>(content::ResourceType::kMainFrame)) {
+          == static_cast<int>(blink::mojom::ResourceType::kMainFrame)) {
     result.push_back(std::make_unique<speedreader::SpeedReaderThrottle>(
         g_brave_browser_process->speedreader_whitelist(),
         base::ThreadTaskRunnerHandle::Get()));
diff --git a/browser/brave_rewards/rewards_tab_helper.cc b/browser/brave_rewards/rewards_tab_helper.cc
index 9f367e31f283..1d345748e43c 100644
--- a/browser/brave_rewards/rewards_tab_helper.cc
+++ b/browser/brave_rewards/rewards_tab_helper.cc
@@ -19,10 +19,9 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_user_data.h"
-#include "content/public/common/resource_load_info.mojom.h"
-#include "content/public/common/resource_type.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom.h"
 
-using content::ResourceType;
+using blink::mojom::ResourceType;
 
 // DEFINE_WEB_CONTENTS_USER_DATA_KEY(brave_rewards::RewardsTabHelper);
 
@@ -72,15 +71,15 @@ void RewardsTabHelper::DidFinishNavigation(content::NavigationHandle* handle) {
 void RewardsTabHelper::ResourceLoadComplete(
     content::RenderFrameHost* render_frame_host,
     const content::GlobalRequestID& request_id,
-    const content::mojom::ResourceLoadInfo& resource_load_info) {
+    const blink::mojom::ResourceLoadInfo& resource_load_info) {
   if (!rewards_service_ || !render_frame_host)
     return;
 
   // TODO(nejczdovc): do we need to get anyother type then XHR??
-  if (resource_load_info.resource_type == content::ResourceType::kMedia ||
-      resource_load_info.resource_type == content::ResourceType::kXhr ||
-      resource_load_info.resource_type == content::ResourceType::kImage ||
-      resource_load_info.resource_type == content::ResourceType::kScript) {
+  if (resource_load_info.resource_type == ResourceType::kMedia ||
+      resource_load_info.resource_type == ResourceType::kXhr ||
+      resource_load_info.resource_type == ResourceType::kImage ||
+      resource_load_info.resource_type == ResourceType::kScript) {
     rewards_service_->OnXHRLoad(tab_id_, GURL(resource_load_info.final_url),
                                 web_contents()->GetURL(),
                                 resource_load_info.referrer);
diff --git a/browser/brave_rewards/rewards_tab_helper.h b/browser/brave_rewards/rewards_tab_helper.h
index 7f178f50c712..1e8ff7cf242e 100644
--- a/browser/brave_rewards/rewards_tab_helper.h
+++ b/browser/brave_rewards/rewards_tab_helper.h
@@ -41,7 +41,7 @@ class RewardsTabHelper : public RewardsServiceObserver,
   void ResourceLoadComplete(
       content::RenderFrameHost* render_frame_host,
       const content::GlobalRequestID& request_id,
-      const content::mojom::ResourceLoadInfo& resource_load_info) override;
+      const blink::mojom::ResourceLoadInfo& resource_load_info) override;
   void DidAttachInterstitialPage() override;
   void OnVisibilityChanged(content::Visibility visibility) override;
   void WebContentsDestroyed() override;
diff --git a/browser/net/BUILD.gn b/browser/net/BUILD.gn
index fb316fcbdfec..6ffc9be77e35 100644
--- a/browser/net/BUILD.gn
+++ b/browser/net/BUILD.gn
@@ -64,6 +64,7 @@ source_set("net") {
     "//net",
     "//services/network/public/cpp",
     "//services/network/public/mojom",
+    "//third_party/blink/public/mojom:mojom_platform_headers",
     "//third_party/re2",
     "//url",
   ]
diff --git a/browser/net/brave_ad_block_tp_network_delegate_helper.cc b/browser/net/brave_ad_block_tp_network_delegate_helper.cc
index 9ea0d2295c62..d12d67cb92d1 100644
--- a/browser/net/brave_ad_block_tp_network_delegate_helper.cc
+++ b/browser/net/brave_ad_block_tp_network_delegate_helper.cc
@@ -25,8 +25,6 @@
 #include "extensions/common/url_pattern.h"
 #include "ui/base/resource/resource_bundle.h"
 
-using content::ResourceType;
-
 namespace brave {
 
 void ShouldBlockAdOnTaskRunner(std::shared_ptr<BraveRequestInfo> ctx) {
diff --git a/browser/net/url_context.cc b/browser/net/url_context.cc
index d298ec698b01..a1f012bd4692 100644
--- a/browser/net/url_context.cc
+++ b/browser/net/url_context.cc
@@ -60,7 +60,7 @@ void BraveRequestInfo::FillCTX(const network::ResourceRequest& request,
   ctx->referrer_policy = request.referrer_policy;
 
   ctx->resource_type =
-      static_cast<content::ResourceType>(request.resource_type);
+      static_cast<blink::mojom::ResourceType>(request.resource_type);
 
   ctx->is_webtorrent_disabled =
 #if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT)
diff --git a/browser/net/url_context.h b/browser/net/url_context.h
index f5c7cf622745..217ec9acaf55 100644
--- a/browser/net/url_context.h
+++ b/browser/net/url_context.h
@@ -10,8 +10,8 @@
 #include <set>
 #include <string>
 
-#include "content/public/common/resource_type.h"
 #include "net/url_request/url_request.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
 #include "url/gurl.h"
 
 class BraveRequestHandler;
@@ -96,9 +96,9 @@ struct BraveRequestInfo {
   // can properly detect that the info couldn't be obtained.
   // TODO(iefremov): Replace with something like |WebRequestResourceType| to
   // distinguish WebSockets.
-  static constexpr content::ResourceType kInvalidResourceType =
-      static_cast<content::ResourceType>(-1);
-  content::ResourceType resource_type = kInvalidResourceType;
+  static constexpr blink::mojom::ResourceType kInvalidResourceType =
+      static_cast<blink::mojom::ResourceType>(-1);
+  blink::mojom::ResourceType resource_type = kInvalidResourceType;
 
   std::string upload_data;
 
diff --git a/components/brave_perf_predictor/browser/BUILD.gn b/components/brave_perf_predictor/browser/BUILD.gn
index b0912e8f9af9..995e9d298da6 100644
--- a/components/brave_perf_predictor/browser/BUILD.gn
+++ b/components/brave_perf_predictor/browser/BUILD.gn
@@ -43,9 +43,9 @@ source_set("browser") {
     "//components/sessions",
     "//components/user_prefs",
     "//content/public/browser",
-    "//content/public/common",
     "//net/base/registry_controlled_domains",
     "//services/metrics/public/cpp:metrics_cpp",
+    "//third_party/blink/public/mojom:mojom_platform_headers",
     "//ui/base",
     "//url",
   ]
diff --git a/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc b/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc
index 38208de63811..e04af7db130c 100644
--- a/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc
+++ b/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc
@@ -10,9 +10,8 @@
 #include "base/logging.h"
 #include "brave/components/brave_perf_predictor/browser/bandwidth_linreg.h"
 #include "components/page_load_metrics/common/page_load_metrics.mojom.h"
-#include "content/public/common/resource_load_info.mojom.h"
-#include "content/public/common/resource_type.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom.h"
 
 namespace brave_perf_predictor {
 
@@ -64,7 +63,7 @@ void BandwidthSavingsPredictor::OnSubresourceBlocked(
 
 void BandwidthSavingsPredictor::OnResourceLoadComplete(
     const GURL& main_frame_url,
-    const content::mojom::ResourceLoadInfo& resource_load_info) {
+    const blink::mojom::ResourceLoadInfo& resource_load_info) {
   // If the resource load info comes without a valid corresponding
   // main frame URL, ignore it
   if (main_frame_url.is_empty() || !main_frame_url.has_host() ||
@@ -90,25 +89,25 @@ void BandwidthSavingsPredictor::OnResourceLoadComplete(
       resource_load_info.total_received_bytes;
   std::string resource_type;
   switch (resource_load_info.resource_type) {
-    case content::ResourceType::kMainFrame:
+    case blink::mojom::ResourceType::kMainFrame:
       resource_type = "document";
       break;
-    case content::ResourceType::kSubFrame:
+    case blink::mojom::ResourceType::kSubFrame:
       resource_type = "document";
       break;
-    case content::ResourceType::kStylesheet:
+    case blink::mojom::ResourceType::kStylesheet:
       resource_type = "stylesheet";
       break;
-    case content::ResourceType::kScript:
+    case blink::mojom::ResourceType::kScript:
       resource_type = "script";
       break;
-    case content::ResourceType::kImage:
+    case blink::mojom::ResourceType::kImage:
       resource_type = "image";
       break;
-    case content::ResourceType::kFontResource:
+    case blink::mojom::ResourceType::kFontResource:
       resource_type = "font";
       break;
-    case content::ResourceType::kMedia:
+    case blink::mojom::ResourceType::kMedia:
       resource_type = "media";
       break;
     default:
diff --git a/components/brave_perf_predictor/browser/bandwidth_savings_predictor.h b/components/brave_perf_predictor/browser/bandwidth_savings_predictor.h
index 26966d1ced2b..91f5bad51f08 100644
--- a/components/brave_perf_predictor/browser/bandwidth_savings_predictor.h
+++ b/components/brave_perf_predictor/browser/bandwidth_savings_predictor.h
@@ -21,13 +21,13 @@ class PageLoadTiming;
 }  // namespace mojom
 }  // namespace page_load_metrics
 
-namespace content {
+namespace blink {
 namespace mojom {
 
 class ResourceLoadInfo;
 
 }  // namespace mojom
-}  // namespace content
+}  // namespace blink
 
 namespace brave_perf_predictor {
 
@@ -52,7 +52,7 @@ class BandwidthSavingsPredictor {
   void OnSubresourceBlocked(const std::string& resource_url);
   void OnResourceLoadComplete(
       const GURL& main_frame_url,
-      const content::mojom::ResourceLoadInfo& resource_load_info);
+      const blink::mojom::ResourceLoadInfo& resource_load_info);
   double PredictSavingsBytes() const;
   void Reset();
 
diff --git a/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc b/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
index 975664bf829e..f8bb88528549 100644
--- a/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
+++ b/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
@@ -14,8 +14,8 @@
 #include "chrome/browser/predictors/loading_test_util.h"
 #include "components/page_load_metrics/common/page_load_metrics.mojom.h"
 #include "components/page_load_metrics/common/page_load_timing.h"
-#include "content/public/common/resource_load_info.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom.h"
 #include "url/gurl.h"
 
 namespace brave_perf_predictor {
@@ -88,7 +88,7 @@ TEST_F(BandwidthSavingsPredictorTest, FeaturiseResourceLoading) {
   const GURL main_frame("https://brave.com/");
 
   auto fp_style = predictors::CreateResourceLoadInfo(
-      "https://brave.com/style.css", content::ResourceType::kStylesheet);
+      "https://brave.com/style.css", blink::mojom::ResourceType::kStylesheet);
   fp_style->raw_body_bytes = 1000;
   predictor_->OnResourceLoadComplete(main_frame, *fp_style);
   EXPECT_EQ(predictor_->feature_map_["resources.third-party.requestCount"], 0);
@@ -97,7 +97,7 @@ TEST_F(BandwidthSavingsPredictorTest, FeaturiseResourceLoading) {
 
   auto tp_style = predictors::CreateResourceLoadInfo(
       "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.js",
-      content::ResourceType::kScript);
+      blink::mojom::ResourceType::kScript);
   tp_style->raw_body_bytes = 1001;
   predictor_->OnResourceLoadComplete(main_frame, *tp_style);
 
@@ -126,7 +126,7 @@ TEST_F(BandwidthSavingsPredictorTest, PredictZeroInternalUrl) {
 TEST_F(BandwidthSavingsPredictorTest, PredictZeroBadFrame) {
   const GURL main_frame("");
   auto res = predictors::CreateResourceLoadInfo(
-      "https://brave.com/style.css", content::ResourceType::kStylesheet);
+      "https://brave.com/style.css", blink::mojom::ResourceType::kStylesheet);
   res->raw_body_bytes = 1000;
   predictor_->OnResourceLoadComplete(main_frame, *res);
 
@@ -136,7 +136,7 @@ TEST_F(BandwidthSavingsPredictorTest, PredictZeroBadFrame) {
 TEST_F(BandwidthSavingsPredictorTest, PredictZeroNoBlocks) {
   const GURL main_frame("https://brave.com");
   auto res = predictors::CreateResourceLoadInfo(
-      "https://brave.com/style.css", content::ResourceType::kStylesheet);
+      "https://brave.com/style.css", blink::mojom::ResourceType::kStylesheet);
   res->raw_body_bytes = 1000;
   predictor_->OnResourceLoadComplete(main_frame, *res);
 
@@ -146,15 +146,15 @@ TEST_F(BandwidthSavingsPredictorTest, PredictZeroNoBlocks) {
 TEST_F(BandwidthSavingsPredictorTest, PredictNonZero) {
   const GURL main_frame("https://brave.com");
   auto res = predictors::CreateResourceLoadInfo(
-      "https://brave.com/style.css", content::ResourceType::kStylesheet);
+      "https://brave.com/style.css", blink::mojom::ResourceType::kStylesheet);
   res->raw_body_bytes = 200000;
   res->total_received_bytes = 200000;
   predictor_->OnResourceLoadComplete(main_frame, *res);
 
   predictor_->OnSubresourceBlocked("https://google-analytics.com/ga.js");
   // resource still seen as complete, but with 0 bytes
-  auto blocked = predictors::CreateResourceLoadInfo(
-      "https://google-analytics.com/ga.js", content::ResourceType::kScript);
+  auto blocked = predictors::CreateResourceLoadInfo("https://google-analytics.com/ga.js",
+                                         blink::mojom::ResourceType::kScript);
   blocked->raw_body_bytes = 0;
   predictor_->OnResourceLoadComplete(main_frame, *blocked);
 
diff --git a/components/brave_perf_predictor/browser/perf_predictor_tab_helper.cc b/components/brave_perf_predictor/browser/perf_predictor_tab_helper.cc
index 5ac11030f622..867c2bed95a0 100644
--- a/components/brave_perf_predictor/browser/perf_predictor_tab_helper.cc
+++ b/components/brave_perf_predictor/browser/perf_predictor_tab_helper.cc
@@ -136,7 +136,7 @@ void PerfPredictorTabHelper::DidFinishNavigation(
 void PerfPredictorTabHelper::ResourceLoadComplete(
     content::RenderFrameHost* render_frame_host,
     const content::GlobalRequestID& request_id,
-    const content::mojom::ResourceLoadInfo& resource_load_info) {
+    const blink::mojom::ResourceLoadInfo& resource_load_info) {
   if (render_frame_host)
     bandwidth_predictor_->OnResourceLoadComplete(web_contents()->GetURL(),
                                                  resource_load_info);
diff --git a/components/brave_perf_predictor/browser/perf_predictor_tab_helper.h b/components/brave_perf_predictor/browser/perf_predictor_tab_helper.h
index 892d5957a3e0..aad1cc4edac0 100644
--- a/components/brave_perf_predictor/browser/perf_predictor_tab_helper.h
+++ b/components/brave_perf_predictor/browser/perf_predictor_tab_helper.h
@@ -21,11 +21,13 @@ namespace content {
 class NavigationHandle;
 class RenderFrameHost;
 class WebContents;
+}  // namespace content
 
+namespace blink {
 namespace mojom {
 class ResourceLoadInfo;
 }  // namespace mojom
-}  // namespace content
+}  // namespace blink
 
 namespace page_load_metrics {
 namespace mojom {
@@ -81,7 +83,7 @@ class PerfPredictorTabHelper
   void ResourceLoadComplete(
       content::RenderFrameHost* render_frame_host,
       const content::GlobalRequestID& request_id,
-      const content::mojom::ResourceLoadInfo& resource_load_info) override;
+      const blink::mojom::ResourceLoadInfo& resource_load_info) override;
 
   // If an interstitial page got attached during loading, we ignore the load as
   // adblocking does not have effect on interstitials
diff --git a/components/brave_shields/browser/BUILD.gn b/components/brave_shields/browser/BUILD.gn
index dcfab4e60672..fd683ef02716 100644
--- a/components/brave_shields/browser/BUILD.gn
+++ b/components/brave_shields/browser/BUILD.gn
@@ -66,6 +66,7 @@ source_set("browser") {
     "//components/sessions",
     "//content/public/browser",
     "//net",
+    "//third_party/blink/public/mojom:mojom_platform_headers",
     "//third_party/leveldatabase",
     "//url",
   ]
diff --git a/components/brave_shields/browser/ad_block_base_service.cc b/components/brave_shields/browser/ad_block_base_service.cc
index 51336b1fdcd1..2b2a86a8ed63 100644
--- a/components/brave_shields/browser/ad_block_base_service.cc
+++ b/components/brave_shields/browser/ad_block_base_service.cc
@@ -34,66 +34,66 @@ using namespace net::registry_controlled_domains;  // NOLINT
 
 namespace {
 
-std::string ResourceTypeToString(content::ResourceType resource_type) {
+std::string ResourceTypeToString(blink::mojom::ResourceType resource_type) {
   std::string filter_option = "";
   switch (resource_type) {
     // top level page
-    case content::ResourceType::kMainFrame:
+    case blink::mojom::ResourceType::kMainFrame:
       filter_option = "main_frame";
       break;
     // frame or iframe
-    case content::ResourceType::kSubFrame:
+    case blink::mojom::ResourceType::kSubFrame:
       filter_option = "sub_frame";
       break;
     // a CSS stylesheet
-    case content::ResourceType::kStylesheet:
+    case blink::mojom::ResourceType::kStylesheet:
       filter_option = "stylesheet";
       break;
     // an external script
-    case content::ResourceType::kScript:
+    case blink::mojom::ResourceType::kScript:
       filter_option = "script";
       break;
     // an image (jpg/gif/png/etc)
-    case content::ResourceType::kFavicon:
-    case content::ResourceType::kImage:
+    case blink::mojom::ResourceType::kFavicon:
+    case blink::mojom::ResourceType::kImage:
       filter_option = "image";
       break;
     // a font
-    case content::ResourceType::kFontResource:
+    case blink::mojom::ResourceType::kFontResource:
       filter_option = "font";
       break;
     // an "other" subresource.
-    case content::ResourceType::kSubResource:
+    case blink::mojom::ResourceType::kSubResource:
       filter_option = "other";
       break;
     // an object (or embed) tag for a plugin.
-    case content::ResourceType::kObject:
+    case blink::mojom::ResourceType::kObject:
       filter_option = "object";
       break;
     // a media resource.
-    case content::ResourceType::kMedia:
+    case blink::mojom::ResourceType::kMedia:
       filter_option = "media";
       break;
     // a XMLHttpRequest
-    case content::ResourceType::kXhr:
+    case blink::mojom::ResourceType::kXhr:
       filter_option = "xhr";
       break;
     // a ping request for <a ping>/sendBeacon.
-    case content::ResourceType::kPing:
+    case blink::mojom::ResourceType::kPing:
       filter_option = "ping";
       break;
     // the main resource of a dedicated worker.
-    case content::ResourceType::kWorker:
+    case blink::mojom::ResourceType::kWorker:
     // the main resource of a shared worker.
-    case content::ResourceType::kSharedWorker:
+    case blink::mojom::ResourceType::kSharedWorker:
     // an explicitly requested prefetch
-    case content::ResourceType::kPrefetch:
+    case blink::mojom::ResourceType::kPrefetch:
     // the main resource of a service worker.
-    case content::ResourceType::kServiceWorker:
+    case blink::mojom::ResourceType::kServiceWorker:
     // a report of Content Security Policy violations.
-    case content::ResourceType::kCspReport:
+    case blink::mojom::ResourceType::kCspReport:
     // a resource that a plugin requested.
-    case content::ResourceType::kPluginResource:
+    case blink::mojom::ResourceType::kPluginResource:
     default:
       break;
   }
@@ -117,12 +117,13 @@ void AdBlockBaseService::Cleanup() {
   GetTaskRunner()->DeleteSoon(FROM_HERE, ad_block_client_.release());
 }
 
-bool AdBlockBaseService::ShouldStartRequest(const GURL& url,
-                                            content::ResourceType resource_type,
-                                            const std::string& tab_host,
-                                            bool* did_match_exception,
-                                            bool* cancel_request_explicitly,
-                                            std::string* mock_data_url) {
+bool AdBlockBaseService::ShouldStartRequest(
+    const GURL& url,
+    blink::mojom::ResourceType resource_type,
+    const std::string& tab_host,
+    bool* did_match_exception,
+    bool* cancel_request_explicitly,
+    std::string* mock_data_url) {
   DCHECK(GetTaskRunner()->RunsTasksInCurrentSequence());
 
   // Determine third-party here so the library doesn't need to figure it out.
diff --git a/components/brave_shields/browser/ad_block_base_service.h b/components/brave_shields/browser/ad_block_base_service.h
index 7b93e2c474c1..262f75d8bdf6 100644
--- a/components/brave_shields/browser/ad_block_base_service.h
+++ b/components/brave_shields/browser/ad_block_base_service.h
@@ -19,7 +19,7 @@
 #include "base/values.h"
 #include "brave/components/brave_shields/browser/base_brave_shields_service.h"
 #include "brave/components/brave_component_updater/browser/dat_file_util.h"
-#include "content/public/common/resource_type.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
 
 class AdBlockServiceTest;
 
@@ -40,9 +40,12 @@ class AdBlockBaseService : public BaseBraveShieldsService {
   explicit AdBlockBaseService(BraveComponent::Delegate* delegate);
   ~AdBlockBaseService() override;
 
-  bool ShouldStartRequest(const GURL &url, content::ResourceType resource_type,
-    const std::string& tab_host, bool* did_match_exception,
-    bool* cancel_request_explicitly, std::string* mock_data_url) override;
+  bool ShouldStartRequest(const GURL& url,
+                          blink::mojom::ResourceType resource_type,
+                          const std::string& tab_host,
+                          bool* did_match_exception,
+                          bool* cancel_request_explicitly,
+                          std::string* mock_data_url) override;
   void AddResources(const std::string& resources);
   void EnableTag(const std::string& tag, bool enabled);
   bool TagExists(const std::string& tag);
diff --git a/components/brave_shields/browser/ad_block_regional_service.h b/components/brave_shields/browser/ad_block_regional_service.h
index 844ccb46c284..42051aa6cd12 100644
--- a/components/brave_shields/browser/ad_block_regional_service.h
+++ b/components/brave_shields/browser/ad_block_regional_service.h
@@ -14,7 +14,6 @@
 
 #include "base/files/file_path.h"
 #include "brave/components/brave_shields/browser/ad_block_base_service.h"
-#include "content/public/common/resource_type.h"
 
 class AdBlockServiceTest;
 
diff --git a/components/brave_shields/browser/ad_block_regional_service_manager.cc b/components/brave_shields/browser/ad_block_regional_service_manager.cc
index 859abea27ca1..2742620b0120 100644
--- a/components/brave_shields/browser/ad_block_regional_service_manager.cc
+++ b/components/brave_shields/browser/ad_block_regional_service_manager.cc
@@ -125,7 +125,7 @@ void AdBlockRegionalServiceManager::Stop() {
 
 bool AdBlockRegionalServiceManager::ShouldStartRequest(
     const GURL& url,
-    content::ResourceType resource_type,
+    blink::mojom::ResourceType resource_type,
     const std::string& tab_host,
     bool* matching_exception_filter,
     bool* cancel_request_explicitly,
diff --git a/components/brave_shields/browser/ad_block_regional_service_manager.h b/components/brave_shields/browser/ad_block_regional_service_manager.h
index d4b188017cde..ecbcdda358aa 100644
--- a/components/brave_shields/browser/ad_block_regional_service_manager.h
+++ b/components/brave_shields/browser/ad_block_regional_service_manager.h
@@ -17,7 +17,7 @@
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "brave/components/brave_component_updater/browser/brave_component.h"
-#include "content/public/common/resource_type.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
 #include "url/gurl.h"
 
 namespace base {
@@ -46,7 +46,7 @@ class AdBlockRegionalServiceManager {
   bool Start();
   void Stop();
   bool ShouldStartRequest(const GURL& url,
-                          content::ResourceType resource_type,
+                          blink::mojom::ResourceType resource_type,
                           const std::string& tab_host,
                           bool* matching_exception_filter,
                           bool* cancel_request_explicitly,
diff --git a/components/brave_shields/browser/base_brave_shields_service.cc b/components/brave_shields/browser/base_brave_shields_service.cc
index 909112c8a312..80a81510aad6 100644
--- a/components/brave_shields/browser/base_brave_shields_service.cc
+++ b/components/brave_shields/browser/base_brave_shields_service.cc
@@ -55,8 +55,9 @@ void BaseBraveShieldsService::Stop() {
   initialized_ = false;
 }
 
-bool BaseBraveShieldsService::ShouldStartRequest(const GURL& url,
-    content::ResourceType resource_type,
+bool BaseBraveShieldsService::ShouldStartRequest(
+    const GURL& url,
+    blink::mojom::ResourceType resource_type,
     const std::string& tab_host,
     bool* did_match_exception,
     bool* cancel_request_explicitly,
diff --git a/components/brave_shields/browser/base_brave_shields_service.h b/components/brave_shields/browser/base_brave_shields_service.h
index c8045b274199..790b7f871442 100644
--- a/components/brave_shields/browser/base_brave_shields_service.h
+++ b/components/brave_shields/browser/base_brave_shields_service.h
@@ -16,7 +16,7 @@
 #include "base/files/file_path.h"
 #include "base/sequenced_task_runner.h"
 #include "brave/components/brave_component_updater/browser/brave_component.h"
-#include "content/public/common/resource_type.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
 #include "url/gurl.h"
 
 using brave_component_updater::BraveComponent;
@@ -33,11 +33,11 @@ class BaseBraveShieldsService : public BraveComponent {
   void Stop();
   bool IsInitialized() const;
   virtual bool ShouldStartRequest(const GURL& url,
-      content::ResourceType resource_type,
-      const std::string& tab_host,
-      bool* did_match_exception,
-      bool* cancel_request_explicitly,
-      std::string* mock_data_url);
+                                  blink::mojom::ResourceType resource_type,
+                                  const std::string& tab_host,
+                                  bool* did_match_exception,
+                                  bool* cancel_request_explicitly,
+                                  std::string* mock_data_url);
 
  protected:
   virtual bool Init() = 0;
diff --git a/components/brave_shields/browser/tracking_protection_service.cc b/components/brave_shields/browser/tracking_protection_service.cc
index 0be590ded1ea..fbc85c43e3af 100644
--- a/components/brave_shields/browser/tracking_protection_service.cc
+++ b/components/brave_shields/browser/tracking_protection_service.cc
@@ -197,7 +197,7 @@ bool TrackingProtectionService::ShouldStoreState(HostContentSettingsMap* map,
 
 bool TrackingProtectionService::ShouldStartRequest(
     const GURL& url,
-    content::ResourceType resource_type,
+    blink::mojom::ResourceType resource_type,
     const std::string& tab_host,
     bool* matching_exception_filter,
     bool* cancel_request_explicitly) {
diff --git a/components/brave_shields/browser/tracking_protection_service.h b/components/brave_shields/browser/tracking_protection_service.h
index 272299eddd5a..748c73033863 100644
--- a/components/brave_shields/browser/tracking_protection_service.h
+++ b/components/brave_shields/browser/tracking_protection_service.h
@@ -20,7 +20,7 @@
 #include "brave/components/brave_component_updater/browser/dat_file_util.h"
 #include "brave/components/brave_component_updater/browser/local_data_files_observer.h"
 #include "brave/components/brave_shields/browser/buildflags/buildflags.h"  // For STP
-#include "content/public/common/resource_type.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
 #include "url/gurl.h"
 
 class HostContentSettingsMap;
@@ -41,7 +41,7 @@ class TrackingProtectionService : public LocalDataFilesObserver {
   static bool IsSmartTrackingProtectionEnabled();
 
   bool ShouldStartRequest(const GURL& spec,
-                          content::ResourceType resource_type,
+                          blink::mojom::ResourceType resource_type,
                           const std::string& tab_host,
                           bool* matching_exception_filter,
                           bool* cancel_request_explicitly);
diff --git a/components/brave_webtorrent/browser/net/brave_torrent_redirect_network_delegate_helper.cc b/components/brave_webtorrent/browser/net/brave_torrent_redirect_network_delegate_helper.cc
index 62b3f0762ac3..dc5250822bcc 100644
--- a/components/brave_webtorrent/browser/net/brave_torrent_redirect_network_delegate_helper.cc
+++ b/components/brave_webtorrent/browser/net/brave_torrent_redirect_network_delegate_helper.cc
@@ -13,11 +13,11 @@
 #include "brave/common/extensions/extension_constants.h"
 #include "brave/common/network_constants.h"
 #include "brave/components/brave_webtorrent/browser/webtorrent_util.h"
-#include "content/public/common/resource_type.h"
 #include "extensions/common/constants.h"
 #include "net/http/http_content_disposition.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
 
 namespace {
 
@@ -38,7 +38,7 @@ bool IsWebtorrentInitiated(std::shared_ptr<brave::BraveRequestInfo> ctx) {
 // subframe (i.e. a frame or iframe). For all other resource types (stylesheet,
 // script, XHR request, etc.), returns false.
 bool IsMainFrameResource(std::shared_ptr<brave::BraveRequestInfo> ctx) {
-  return ctx->resource_type == content::ResourceType::kMainFrame;
+  return ctx->resource_type == blink::mojom::ResourceType::kMainFrame;
 }
 
 }  // namespace
diff --git a/components/brave_webtorrent/browser/net/brave_torrent_redirect_network_delegate_helper_unittest.cc b/components/brave_webtorrent/browser/net/brave_torrent_redirect_network_delegate_helper_unittest.cc
index 5bd2f309532c..5b1a7879f9d2 100644
--- a/components/brave_webtorrent/browser/net/brave_torrent_redirect_network_delegate_helper_unittest.cc
+++ b/components/brave_webtorrent/browser/net/brave_torrent_redirect_network_delegate_helper_unittest.cc
@@ -11,8 +11,8 @@
 #include "base/strings/strcat.h"
 #include "brave/browser/net/url_context.h"
 #include "brave/common/network_constants.h"
-#include "content/public/common/resource_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
 
 using brave::ResponseCallback;
 
@@ -68,7 +68,7 @@ TEST_F(BraveTorrentRedirectNetworkDelegateHelperTest,
       new net::HttpResponseHeaders(std::string());
   GURL allowed_unsafe_redirect_url;
   auto request_info = std::make_shared<brave::BraveRequestInfo>(torrent_url());
-  request_info->resource_type = content::ResourceType::kMainFrame;
+  request_info->resource_type = blink::mojom::ResourceType::kMainFrame;
 
   int rc = webtorrent::OnHeadersReceived_TorrentRedirectWork(
       orig_response_headers.get(), &overwrite_response_headers,
@@ -96,7 +96,7 @@ TEST_F(BraveTorrentRedirectNetworkDelegateHelperTest,
       new net::HttpResponseHeaders(std::string());
   GURL allowed_unsafe_redirect_url;
   auto request_info = std::make_shared<brave::BraveRequestInfo>(torrent_url());
-  request_info->resource_type = content::ResourceType::kMainFrame;
+  request_info->resource_type = blink::mojom::ResourceType::kMainFrame;
 
   int rc = webtorrent::OnHeadersReceived_TorrentRedirectWork(
       orig_response_headers.get(), &overwrite_response_headers,
@@ -126,7 +126,7 @@ TEST_F(BraveTorrentRedirectNetworkDelegateHelperTest,
       new net::HttpResponseHeaders(std::string());
   GURL allowed_unsafe_redirect_url;
   auto request_info = std::make_shared<brave::BraveRequestInfo>(torrent_url());
-  request_info->resource_type = content::ResourceType::kMainFrame;
+  request_info->resource_type = blink::mojom::ResourceType::kMainFrame;
 
   int rc = webtorrent::OnHeadersReceived_TorrentRedirectWork(
       orig_response_headers.get(), &overwrite_response_headers,
@@ -162,7 +162,7 @@ TEST_F(BraveTorrentRedirectNetworkDelegateHelperTest,
   GURL allowed_unsafe_redirect_url;
   auto request_info =
       std::make_shared<brave::BraveRequestInfo>(non_torrent_url());
-  request_info->resource_type = content::ResourceType::kMainFrame;
+  request_info->resource_type = blink::mojom::ResourceType::kMainFrame;
 
   int rc = webtorrent::OnHeadersReceived_TorrentRedirectWork(
       orig_response_headers.get(), &overwrite_response_headers,
@@ -194,7 +194,7 @@ TEST_F(BraveTorrentRedirectNetworkDelegateHelperTest,
   GURL allowed_unsafe_redirect_url;
   auto request_info =
       std::make_shared<brave::BraveRequestInfo>(non_torrent_url());
-  request_info->resource_type = content::ResourceType::kMainFrame;
+  request_info->resource_type = blink::mojom::ResourceType::kMainFrame;
 
   int rc = webtorrent::OnHeadersReceived_TorrentRedirectWork(
       orig_response_headers.get(), &overwrite_response_headers,
@@ -220,7 +220,7 @@ TEST_F(BraveTorrentRedirectNetworkDelegateHelperTest, MimeTypeNoRedirect) {
       new net::HttpResponseHeaders(std::string());
   GURL allowed_unsafe_redirect_url;
   auto request_info = std::make_shared<brave::BraveRequestInfo>(torrent_url());
-  request_info->resource_type = content::ResourceType::kMainFrame;
+  request_info->resource_type = blink::mojom::ResourceType::kMainFrame;
 
   int rc = webtorrent::OnHeadersReceived_TorrentRedirectWork(
       orig_response_headers.get(), &overwrite_response_headers,
@@ -249,7 +249,7 @@ TEST_F(BraveTorrentRedirectNetworkDelegateHelperTest,
   GURL allowed_unsafe_redirect_url;
   auto request_info = std::make_shared<brave::BraveRequestInfo>(torrent_url());
   request_info->initiator_url = torrent_extension_url();
-  request_info->resource_type = content::ResourceType::kMainFrame;
+  request_info->resource_type = blink::mojom::ResourceType::kMainFrame;
 
   int rc = webtorrent::OnHeadersReceived_TorrentRedirectWork(
       orig_response_headers.get(), &overwrite_response_headers,
@@ -279,7 +279,7 @@ TEST_F(BraveTorrentRedirectNetworkDelegateHelperTest,
   auto request_info =
       std::make_shared<brave::BraveRequestInfo>(torrent_viewer_url());
   request_info->initiator_url = torrent_extension_url();
-  request_info->resource_type = content::ResourceType::kMainFrame;
+  request_info->resource_type = blink::mojom::ResourceType::kMainFrame;
 
   int rc = webtorrent::OnHeadersReceived_TorrentRedirectWork(
       orig_response_headers.get(), &overwrite_response_headers,
@@ -310,7 +310,7 @@ TEST_F(BraveTorrentRedirectNetworkDelegateHelperTest,
       new net::HttpResponseHeaders(std::string());
   GURL allowed_unsafe_redirect_url;
   auto request_info = std::make_shared<brave::BraveRequestInfo>(torrent_url());
-  request_info->resource_type = content::ResourceType::kXhr;
+  request_info->resource_type = blink::mojom::ResourceType::kXhr;
 
   int rc = webtorrent::OnHeadersReceived_TorrentRedirectWork(
       orig_response_headers.get(), &overwrite_response_headers,
@@ -323,7 +323,7 @@ TEST_F(BraveTorrentRedirectNetworkDelegateHelperTest,
   EXPECT_EQ(allowed_unsafe_redirect_url, GURL());
   EXPECT_EQ(rc, net::OK);
 
-  request_info->resource_type = content::ResourceType::kSubFrame;
+  request_info->resource_type = blink::mojom::ResourceType::kSubFrame;
 
   rc = webtorrent::OnHeadersReceived_TorrentRedirectWork(
       orig_response_headers.get(), &overwrite_response_headers,

From 7022cee968a421aa546ca2fa37ac7097b3671b83 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 6 Apr 2020 13:35:44 -0400
Subject: [PATCH 046/161] Title field for bookmarks was renamed.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/09192197b406ef2f33b6b425a1355c64c25b34a4

commit 09192197b406ef2f33b6b425a1355c64c25b34a4
Author: Rushan Suleymanov <rushans@google.com>
Date:   Thu Mar 12 23:00:59 2020 +0000

    [Sync] Rename title field for bookmarks

    This patch is first in a series of changes. Legacy title field in
    BookmarkSpecifics renamed without any changes in behaviour.

    Bug: 1058376
---
 chromium_src/components/sync/engine_impl/commit.cc           | 4 ++--
 .../components/sync/engine_impl/get_updates_processor.cc     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/chromium_src/components/sync/engine_impl/commit.cc b/chromium_src/components/sync/engine_impl/commit.cc
index 7ad502615d30..19ed5eb726d5 100644
--- a/chromium_src/components/sync/engine_impl/commit.cc
+++ b/chromium_src/components/sync/engine_impl/commit.cc
@@ -98,8 +98,8 @@ brave_sync::RecordsListPtr ConvertCommitsToBraveRecords(
 
       auto bookmark = std::make_unique<brave_sync::jslib::Bookmark>();
       bookmark->site.location = bm_specifics.url();
-      bookmark->site.title = bm_specifics.title();
-      bookmark->site.customTitle = bm_specifics.title();
+      bookmark->site.title = bm_specifics.legacy_canonicalized_title();
+      bookmark->site.customTitle = bm_specifics.legacy_canonicalized_title();
       // bookmark->site.lastAccessedTime - ignored
       bookmark->site.creationTime =
           ProtoTimeToTime(bm_specifics.creation_time_us());
diff --git a/chromium_src/components/sync/engine_impl/get_updates_processor.cc b/chromium_src/components/sync/engine_impl/get_updates_processor.cc
index ff0113e7e8e5..7a2849c757f9 100644
--- a/chromium_src/components/sync/engine_impl/get_updates_processor.cc
+++ b/chromium_src/components/sync/engine_impl/get_updates_processor.cc
@@ -56,7 +56,8 @@ void AddBookmarkSpecifics(sync_pb::EntitySpecifics* specifics,
   sync_pb::BookmarkSpecifics* bm_specifics = specifics->mutable_bookmark();
   bm_specifics->set_url(bookmark.site.location);
 
-  bm_specifics->set_title(bookmark.site.TryGetNonEmptyTitle());
+  bm_specifics->set_legacy_canonicalized_title(
+      bookmark.site.TryGetNonEmptyTitle());
   bm_specifics->set_creation_time_us(
       TimeToProtoTime(bookmark.site.creationTime));
   // base::Time::Now().ToDeltaSinceWindowsEpoch().InMicroseconds());
@@ -79,7 +80,7 @@ void ExtractBookmarkMeta(sync_pb::SyncEntity* entity,
                          sync_pb::EntitySpecifics* specifics,
                          const Bookmark& bookmark) {
   sync_pb::BookmarkSpecifics* bm_specifics = specifics->mutable_bookmark();
-  for (const auto metaInfo : bookmark.metaInfo) {
+  for (const auto& metaInfo : bookmark.metaInfo) {
     // version need to be incremented
     if (metaInfo.key != "version") {
       sync_pb::MetaInfo* meta_info = bm_specifics->add_meta_info();

From 1197512d0d704e45e7d76ba1c259e97f32cb0082 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 6 Apr 2020 14:54:52 -0400
Subject: [PATCH 047/161] color_utils::IsInvertedColorScheme was removed.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/2e98db0e52f3f55056783031ab9f7377d4a12ad5

commit 2e98db0e52f3f55056783031ab9f7377d4a12ad5
Author: Alison Maher <almaher@microsoft.com>
Date:   Fri Mar 27 03:12:12 2020 +0000

    Add histograms for all Windows high contrast themes

    An existing histogram, Accessibility.InvertedColors, tracks whether
    the dark-on-light Windows high contrast theme is enabled. This change
    adds an enumerated histogram for all Windows high contrast themes and
    deprecates Accessibility.InvertedColors.

    Bug: 970285
---
 chromium_src/ui/views/controls/button/md_text_button.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/chromium_src/ui/views/controls/button/md_text_button.cc b/chromium_src/ui/views/controls/button/md_text_button.cc
index 54a675f098e5..665c21b1395c 100644
--- a/chromium_src/ui/views/controls/button/md_text_button.cc
+++ b/chromium_src/ui/views/controls/button/md_text_button.cc
@@ -153,8 +153,10 @@ void BraveTextButton::UpdateColors() {
   if (GetProminent()) {
     return;
   }
+  const ui::NativeTheme* theme = GetNativeTheme();
   // Override different text hover color
-  if (!color_utils::IsInvertedColorScheme()) {
+  if (theme->GetHighContrastColorScheme() !=
+      ui::NativeTheme::HighContrastColorScheme::kDark) {
     SetTextColor(ButtonState::STATE_HOVERED, kBraveBrandColor);
     SetTextColor(ButtonState::STATE_PRESSED, kBraveBrandColor);
   }
@@ -164,7 +166,6 @@ void BraveTextButton::UpdateColors() {
     // First, get the same background fill color that MdTextButton does.
     // It is undfortunate to copy these lines almost as-is. Consider otherwise
     // patching it in via a #define.
-    const ui::NativeTheme* theme = GetNativeTheme();
     SkColor bg_color =
         theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
     if (GetBgColorOverride()) {

From 3f2e170aad76fd58602e882de7d7db4ad01c7f32 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 6 Apr 2020 15:17:58 -0400
Subject: [PATCH 048/161] Override install_modes.cc.

Chromium changes make is easier to override the whole file rather than
patch each BUILDFLAG(USE_GOOGLE_UPDATE_INTEGRATION) location.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/f2c32196752a7e8a7b32c358c8529784b3f33c53

commit f2c32196752a7e8a7b32c358c8529784b3f33c53
Author: Nico Weber <thakis@chromium.org>
Date:   Thu Mar 26 15:06:15 2020 +0000

    win: Convert kUseGoogleUpdateIntegration to a buildflag.

    - Suppresses several -Wunreachable-code warnings
    - Makes it clearer this is a build-time constant
    - Removes half a use of GOOGLE_CHROME_BUILD in a .h file

    No intended behavior change.

    Bug: 346399,961769
---
 .../chrome/browser/active_use_util.cc         | 17 ++++++
 .../brave_install_details_unittest.cc         | 18 +++---
 .../brave_install_modes_unittest.cc           | 55 ++++++++++---------
 .../brave_install_util_unittest.cc            | 17 ++----
 .../brave_product_install_details_unittest.cc | 14 +++--
 .../install_static/chromium_install_modes.h   |  8 ---
 .../chrome/install_static/install_modes.cc    | 35 ++++++++++++
 .../chrome/install_static/install_util.cc     | 17 ++++++
 .../chrome/installer/setup/install_worker.cc  | 17 ++++++
 .../chrome/installer/setup/user_experiment.cc | 17 ++++++
 ...rome-install_static-install_modes.cc.patch | 30 +++-------
 11 files changed, 164 insertions(+), 81 deletions(-)
 create mode 100644 chromium_src/chrome/browser/active_use_util.cc
 create mode 100644 chromium_src/chrome/install_static/install_modes.cc
 create mode 100644 chromium_src/chrome/install_static/install_util.cc
 create mode 100644 chromium_src/chrome/installer/setup/install_worker.cc
 create mode 100644 chromium_src/chrome/installer/setup/user_experiment.cc

diff --git a/chromium_src/chrome/browser/active_use_util.cc b/chromium_src/chrome/browser/active_use_util.cc
new file mode 100644
index 000000000000..5f9d8d76748f
--- /dev/null
+++ b/chromium_src/chrome/browser/active_use_util.cc
@@ -0,0 +1,17 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "chrome/install_static/buildflags.h"
+
+#if defined(OS_WIN) && defined(OFFICIAL_BUILD)
+#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
+#define BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION() (1)
+#endif
+
+#include "../../../../chrome/browser/active_use_util.cc"
+
+#if defined(OS_WIN) && defined(OFFICIAL_BUILD)
+#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
+#endif
diff --git a/chromium_src/chrome/install_static/brave_install_details_unittest.cc b/chromium_src/chrome/install_static/brave_install_details_unittest.cc
index bffaf2228312..ce540c75a638 100644
--- a/chromium_src/chrome/install_static/brave_install_details_unittest.cc
+++ b/chromium_src/chrome/install_static/brave_install_details_unittest.cc
@@ -23,13 +23,13 @@ class FakeInstallDetails : public InstallDetails {
     constants.install_suffix = L"";
     constants.default_channel_name = L"";
     constants.supported_multi_install = true;
-    if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
       constants.app_guid = L"testguid";
       constants.channel_strategy = ChannelStrategy::FIXED;
-    } else {
+#else
       constants.app_guid = L"";
       constants.channel_strategy = ChannelStrategy::UNSUPPORTED;
-    }
+#endif
     payload.size = sizeof(payload);
     payload.product_version = product_version.c_str();
     payload.mode = &constants;
@@ -56,25 +56,25 @@ class FakeInstallDetails : public InstallDetails {
 
 TEST(InstallDetailsTest, GetClientStateKeyPath) {
   FakeInstallDetails details;
-  if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
     EXPECT_THAT(details.GetClientStateKeyPath(),
                 StrEq(L"Software\\BraveSoftware\\Update\\ClientState\\testguid"));
-  } else {
+#else
     EXPECT_THAT(details.GetClientStateKeyPath(),
                 StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-  }
+#endif
 }
 
 TEST(InstallDetailsTest, GetClientStateMediumKeyPath) {
   FakeInstallDetails details;
-  if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
     EXPECT_THAT(
         details.GetClientStateMediumKeyPath(),
         StrEq(L"Software\\BraveSoftware\\Update\\ClientStateMedium\\testguid"));
-  } else {
+#else
     EXPECT_THAT(details.GetClientStateKeyPath(),
                 StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-  }
+#endif
 }
 
 TEST(InstallDetailsTest, VersionMismatch) {
diff --git a/chromium_src/chrome/install_static/brave_install_modes_unittest.cc b/chromium_src/chrome/install_static/brave_install_modes_unittest.cc
index 104ad10ae5cd..b04351a5348a 100644
--- a/chromium_src/chrome/install_static/brave_install_modes_unittest.cc
+++ b/chromium_src/chrome/install_static/brave_install_modes_unittest.cc
@@ -66,10 +66,11 @@ TEST(InstallModes, VerifyModes) {
       ASSERT_THAT(mode.logo_suffix, StrNe(L""));
 
     // The modes must have an appguid if Google Update integration is supported.
-    if (kUseGoogleUpdateIntegration)
+#if defined(OFFICIAL_BUILD)
       ASSERT_THAT(mode.app_guid, StrNe(L""));
-    else
+#else
       ASSERT_THAT(mode.app_guid, StrEq(L""));
+#endif
 
     // Every mode must have a base app name.
     ASSERT_THAT(mode.base_app_name, StrNe(L""));
@@ -94,98 +95,100 @@ TEST(InstallModes, VerifyModes) {
     // Every mode must have a toast activator CLSID.
     ASSERT_THAT(mode.toast_activator_clsid, Ne(CLSID_NULL));
 
-    // UNSUPPORTED and kUseGoogleUpdateIntegration are mutually exclusive.
-    if (kUseGoogleUpdateIntegration)
+    // UNSUPPORTED and BUILDFLAG(USE_GOOGLE_UPDATE_INTEGRATION) which we set for
+    // OFFICIAL_BUILD are mutually exclusive.
+#if defined(OFFICIAL_BUILD)
       ASSERT_THAT(mode.channel_strategy, Ne(ChannelStrategy::UNSUPPORTED));
-    else
+#else
       ASSERT_THAT(mode.channel_strategy, Eq(ChannelStrategy::UNSUPPORTED));
+#endif
   }
 }
 
 TEST(InstallModes, VerifyBrand) {
-  if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
     // Binaries were registered via an app guid with Google Update integration.
     ASSERT_THAT(kBinariesAppGuid, StrNe(L""));
     ASSERT_THAT(kBinariesPathName, StrEq(L""));
-  } else {
+#else
     // Binaries were registered via a different path name without.
     ASSERT_THAT(kBinariesAppGuid, StrEq(L""));
     ASSERT_THAT(kBinariesPathName, StrNe(L""));
-  }
+#endif
 }
 
 TEST(InstallModes, GetClientsKeyPath) {
   constexpr wchar_t kAppGuid[] = L"test";
 
-  if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
     ASSERT_THAT(GetClientsKeyPath(kAppGuid),
                 StrEq(L"Software\\BraveSoftware\\Update\\Clients\\test"));
-  } else {
+#else
     ASSERT_THAT(GetClientsKeyPath(kAppGuid),
                 StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-  }
+#endif
 }
 
 TEST(InstallModes, GetClientStateKeyPath) {
   constexpr wchar_t kAppGuid[] = L"test";
 
-  if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
     ASSERT_THAT(GetClientStateKeyPath(kAppGuid),
                 StrEq(L"Software\\BraveSoftware\\Update\\ClientState\\test"));
-  } else {
+#else
     ASSERT_THAT(GetClientStateKeyPath(kAppGuid),
                 StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-  }
+#endif
 }
 
 TEST(InstallModes, GetBinariesClientsKeyPath) {
-  if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
     ASSERT_THAT(
         GetBinariesClientsKeyPath(),
         StrEq(std::wstring(L"Software\\BraveSoftware\\Update\\Clients\\")
                   .append(kBinariesAppGuid)));
-  } else {
+#else
     ASSERT_THAT(
         GetBinariesClientsKeyPath(),
         StrEq(std::wstring(L"Software\\").append(kBinariesPathName)));
-  }
+#endif
 }
 
 TEST(InstallModes, GetBinariesClientStateKeyPath) {
-  if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
     ASSERT_THAT(
         GetBinariesClientStateKeyPath(),
         StrEq(std::wstring(L"Software\\BraveSoftware\\Update\\ClientState\\")
                   .append(kBinariesAppGuid)));
-  } else {
+#else
     ASSERT_THAT(GetBinariesClientStateKeyPath(),
                 StrEq(std::wstring(L"Software\\").append(kBinariesPathName)));
-  }
+#endif
 }
 
 TEST(InstallModes, GetClientStateMediumKeyPath) {
   constexpr wchar_t kAppGuid[] = L"test";
 
-  if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
     ASSERT_THAT(
         GetClientStateMediumKeyPath(kAppGuid),
         StrEq(L"Software\\BraveSoftware\\Update\\ClientStateMedium\\test"));
-  } else {
+#else
     ASSERT_THAT(GetClientStateMediumKeyPath(kAppGuid),
                 StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-  }
+#endif
 }
 
 TEST(InstallModes, GetBinariesClientStateMediumKeyPath) {
-  if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
     ASSERT_THAT(
         GetBinariesClientStateMediumKeyPath(),
         StrEq(std::wstring(L"Software\\BraveSoftware\\Update\\"
                             "ClientStateMedium\\").append(kBinariesAppGuid)));
-  } else {
+#else
     ASSERT_THAT(GetBinariesClientStateMediumKeyPath(),
                 StrEq(std::wstring(L"Software\\").append(kBinariesPathName)));
-  }
+#endif
 }
 
 #if defined(OFFICIAL_BUILD)
diff --git a/chromium_src/chrome/install_static/brave_install_util_unittest.cc b/chromium_src/chrome/install_static/brave_install_util_unittest.cc
index 5b06102f9e14..5ca7c902620a 100644
--- a/chromium_src/chrome/install_static/brave_install_util_unittest.cc
+++ b/chromium_src/chrome/install_static/brave_install_util_unittest.cc
@@ -325,15 +325,15 @@ class InstallStaticUtilTest
     EXPECT_TRUE(!medium || system_level_);
 
     std::wstring result(L"Software\\");
-    if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
       result.append(L"BraveSoftware\\Update\\ClientState");
       if (medium)
         result.append(L"Medium");
       result.push_back(L'\\');
       result.append(mode_->app_guid);
-    } else {
+#else
       result.append(kProductPathName);
-    }
+#endif
     return result;
   }
 
@@ -422,13 +422,6 @@ TEST_P(InstallStaticUtilTest, GetUninstallRegistryPath) {
 }
 
 TEST_P(InstallStaticUtilTest, GetAppGuid) {
-  // For brands that do not integrate with Omaha/Google Update, the app guid is
-  // an empty string.
-  if (!kUseGoogleUpdateIntegration) {
-    EXPECT_STREQ(L"", GetAppGuid());
-    return;
-  }
-
 #if defined(OFFICIAL_BUILD)
   // The app guids for the brand's install modes; parallel to kInstallModes.
   static constexpr const wchar_t* kAppGuids[] = {
@@ -441,7 +434,9 @@ TEST_P(InstallStaticUtilTest, GetAppGuid) {
                 "kAppGuids out of date.");
   EXPECT_THAT(GetAppGuid(), StrCaseEq(kAppGuids[std::get<0>(GetParam())]));
 #else
-  FAIL() << "Not implemented.";
+  // For brands that do not integrate with Omaha/Google Update, the app guid is
+  // an empty string.
+  EXPECT_STREQ(L"", GetAppGuid());
 #endif
 }
 
diff --git a/chromium_src/chrome/install_static/brave_product_install_details_unittest.cc b/chromium_src/chrome/install_static/brave_product_install_details_unittest.cc
index 8d799d216737..15602b63bbef 100644
--- a/chromium_src/chrome/install_static/brave_product_install_details_unittest.cc
+++ b/chromium_src/chrome/install_static/brave_product_install_details_unittest.cc
@@ -161,12 +161,12 @@ class MakeProductDetailsTest : public testing::TestWithParam<TestData> {
   // Returns the registry path for the product's ClientState key.
   std::wstring GetClientStateKeyPath() {
     std::wstring result(L"Software\\");
-    if (kUseGoogleUpdateIntegration) {
+#if defined(OFFICIAL_BUILD)
       result.append(L"BraveSoftware\\Update\\ClientState\\");
       result.append(kInstallModes[test_data().index].app_guid);
-    } else {
+#else
       result.append(kProductPathName);
-    }
+#endif
     return result;
   }
 
@@ -255,8 +255,9 @@ TEST_P(MakeProductDetailsTest, AdditionalParametersChannels) {
 // Test that the "ap" value is cached during initialization.
 TEST_P(MakeProductDetailsTest, UpdateAp) {
   // This test is only valid for brands that integrate with Google Update.
-  if (!kUseGoogleUpdateIntegration)
+#if !defined(OFFICIAL_BUILD)
     return;
+#endif
 
   // With no value in the registry, the ap value should be empty.
   {
@@ -278,8 +279,9 @@ TEST_P(MakeProductDetailsTest, UpdateAp) {
 // Test that the cohort name is cached during initialization.
 TEST_P(MakeProductDetailsTest, UpdateCohortName) {
   // This test is only valid for brands that integrate with Google Update.
-  if (!kUseGoogleUpdateIntegration)
-    return;
+#if !defined(OFFICIAL_BUILD)
+  return;
+#endif
 
   // With no value in the registry, the cohort name should be empty.
   {
diff --git a/chromium_src/chrome/install_static/chromium_install_modes.h b/chromium_src/chrome/install_static/chromium_install_modes.h
index 579237e5d7b8..8c717f9560c3 100644
--- a/chromium_src/chrome/install_static/chromium_install_modes.h
+++ b/chromium_src/chrome/install_static/chromium_install_modes.h
@@ -9,14 +9,6 @@
 
 namespace install_static {
 
-enum : bool {
-#if defined(OFFICIAL_BUILD)
-  kUseGoogleUpdateIntegration = true,
-#else
-  kUseGoogleUpdateIntegration = false,
-#endif
-};
-
 // Note: This list of indices must be kept in sync with the brand-specific
 // resource strings in chrome/installer/util/prebuild/create_string_rc.
 enum InstallConstantIndex {
diff --git a/chromium_src/chrome/install_static/install_modes.cc b/chromium_src/chrome/install_static/install_modes.cc
new file mode 100644
index 000000000000..cf4d8ff8d381
--- /dev/null
+++ b/chromium_src/chrome/install_static/install_modes.cc
@@ -0,0 +1,35 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "chrome/install_static/buildflags.h"
+
+#if defined(OFFICIAL_BUILD)
+#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
+#define BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION() (1)
+#endif
+
+#define BRAVE_INSTALL_MODES                                                 \
+  std::wstring GetClientsKeyPathForApp(const wchar_t* app_guid) {           \
+    return std::wstring(L"Software\\BraveSoftware\\Update\\Clients\\")      \
+        .append(app_guid);                                                  \
+  }                                                                         \
+                                                                            \
+  std::wstring GetClientStateKeyPathForApp(const wchar_t* app_guid) {       \
+    return std::wstring(L"Software\\BraveSoftware\\Update\\ClientState\\")  \
+        .append(app_guid);                                                  \
+  }                                                                         \
+                                                                            \
+  std::wstring GetClientStateMediumKeyPathForApp(const wchar_t* app_guid) { \
+    return std::wstring(                                                    \
+               L"Software\\BraveSoftware\\Update\\ClientStateMedium\\")     \
+        .append(app_guid);                                                  \
+  }
+
+#include "../../../../chrome/install_static/install_modes.cc"
+#undef BRAVE_INSTALL_MODES
+
+#if defined(OFFICIAL_BUILD)
+#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
+#endif
diff --git a/chromium_src/chrome/install_static/install_util.cc b/chromium_src/chrome/install_static/install_util.cc
new file mode 100644
index 000000000000..b8452588b794
--- /dev/null
+++ b/chromium_src/chrome/install_static/install_util.cc
@@ -0,0 +1,17 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "chrome/install_static/buildflags.h"
+
+#if defined(OFFICIAL_BUILD)
+#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
+#define BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION() (1)
+#endif
+
+#include "../../../../chrome/install_static/install_util.cc"
+
+#if defined(OFFICIAL_BUILD)
+#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
+#endif
diff --git a/chromium_src/chrome/installer/setup/install_worker.cc b/chromium_src/chrome/installer/setup/install_worker.cc
new file mode 100644
index 000000000000..219be55c6ddd
--- /dev/null
+++ b/chromium_src/chrome/installer/setup/install_worker.cc
@@ -0,0 +1,17 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "chrome/install_static/buildflags.h"
+
+#if defined(OFFICIAL_BUILD)
+#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
+#define BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION() (1)
+#endif
+
+#include "../../../../../chrome/installer/setup/install_worker.cc"
+
+#if defined(OFFICIAL_BUILD)
+#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
+#endif
\ No newline at end of file
diff --git a/chromium_src/chrome/installer/setup/user_experiment.cc b/chromium_src/chrome/installer/setup/user_experiment.cc
new file mode 100644
index 000000000000..b4b92b2928e8
--- /dev/null
+++ b/chromium_src/chrome/installer/setup/user_experiment.cc
@@ -0,0 +1,17 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "chrome/install_static/buildflags.h"
+
+#if defined(OFFICIAL_BUILD)
+#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
+#define BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION() (1)
+#endif
+
+#include "../../../../../chrome/installer/setup/user_experiment.cc"
+
+#if defined(OFFICIAL_BUILD)
+#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
+#endif
diff --git a/patches/chrome-install_static-install_modes.cc.patch b/patches/chrome-install_static-install_modes.cc.patch
index 012f7771da4e..d115467b2b8b 100644
--- a/patches/chrome-install_static-install_modes.cc.patch
+++ b/patches/chrome-install_static-install_modes.cc.patch
@@ -1,34 +1,22 @@
 diff --git a/chrome/install_static/install_modes.cc b/chrome/install_static/install_modes.cc
-index 42d9966254758305e0dc999b186aa7abe1ff762a..7b53849803ff00ac824e1d6c7fb378ffcc63ba10 100644
+index 8454b2ab6871c950ed976aafdbec8cfacb506e95..a2d56d3b6fcfcf23f781bcf680797a7122e4fcd9 100644
 --- a/chrome/install_static/install_modes.cc
 +++ b/chrome/install_static/install_modes.cc
-@@ -12,6 +12,21 @@ std::wstring GetUnregisteredKeyPathForProduct(const wchar_t* product) {
-   return std::wstring(L"Software\\").append(product);
- }
+@@ -11,6 +11,9 @@ namespace install_static {
+ namespace {
  
+ #if BUILDFLAG(USE_GOOGLE_UPDATE_INTEGRATION)
 +#if defined(BRAVE_CHROMIUM_BUILD)
-+std::wstring GetClientsKeyPathForApp(const wchar_t* app_guid) {
-+  return std::wstring(L"Software\\BraveSoftware\\Update\\Clients\\").append(app_guid);
-+}
-+
-+std::wstring GetClientStateKeyPathForApp(const wchar_t* app_guid) {
-+  return std::wstring(L"Software\\BraveSoftware\\Update\\ClientState\\")
-+      .append(app_guid);
-+}
-+
-+std::wstring GetClientStateMediumKeyPathForApp(const wchar_t* app_guid) {
-+  return std::wstring(L"Software\\BraveSoftware\\Update\\ClientStateMedium\\")
-+      .append(app_guid);
-+}
++  BRAVE_INSTALL_MODES
 +#else
  std::wstring GetClientsKeyPathForApp(const wchar_t* app_guid) {
    return std::wstring(L"Software\\Google\\Update\\Clients\\").append(app_guid);
  }
-@@ -25,6 +40,7 @@ std::wstring GetClientStateMediumKeyPathForApp(const wchar_t* app_guid) {
+@@ -24,6 +27,7 @@ std::wstring GetClientStateMediumKeyPathForApp(const wchar_t* app_guid) {
    return std::wstring(L"Software\\Google\\Update\\ClientStateMedium\\")
        .append(app_guid);
  }
 +#endif
- 
- }  // namespace
- 
+ #else
+ std::wstring GetUnregisteredKeyPathForProduct(const wchar_t* product) {
+   return std::wstring(L"Software\\").append(product);

From 7d43880dcfe76154c6e5c90f9d856c0247d33afd Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 6 Apr 2020 15:51:04 -0400
Subject: [PATCH 049/161] ContextLifecycleObserver was renamed.

Renamed to ExecutionContextLifecycleObserver.

Also, reorganized the ovrride file to match the order of methods in the
original Chromium source.

Chromium changes:

https://chromium.googlesource.com/chromium/src/+/539e6b94b4f95c1710718085c0e526a69611b2bd

commit 539e6b94b4f95c1710718085c0e526a69611b2bd
Author: Keishi Hattori <keishi@chromium.org>
Date:   Mon Feb 17 08:44:48 2020 +0000

    Rename ContextLifecycleObserver to ExecutionContextLifecycleObserver

    Rename ContextLifecycleObserver to ExecutionContextLifecycleObserver in anticipation of introducing a base class to platform/ in crrev.com/c/2046626

    Bug: 1052738

ContextDestroyed method signature change:

https://chromium.googlesource.com/chromium/src/+/b0a2875270b3a5ff644378e9a26f12cbdabae0e8

commit b0a2875270b3a5ff644378e9a26f12cbdabae0e8
Author: Keishi Hattori <keishi@chromium.org>
Date:   Sun Feb 16 19:42:37 2020 +0000

    Use HeapObserverList for ContextLifecycleObserver

    Use the HeapObserverList that was added in crrev.com/c/2054687 for
    ContextLifecycleObserver.

    Bug: 1052319

C'tor signature change:

https://chromium.googlesource.com/chromium/src/+/0177ea4ac533757e1d530458bf69fb5daf5557c0

commit 0177ea4ac533757e1d530458bf69fb5daf5557c0
Author: Nate Chapin <japhet@chromium.org>
Date:   Fri Feb 7 16:58:14 2020 +0000

    Make ExecutionContext a private parent class of Document

    This is a step in preparation for moving the ExecutionContext from
    Document to LocalDOMWindow. Using virtual inheritance, this CL leaves
    several ExecutionContext subclasses (UseCounter, ConsoleLogger, and
    FeaturePolicyParserDelegate) as public parent classes of Document,
    while making ExecutionContext private. This exposes all of the places
    that depend directly on Document being an ExecutionContext, while
    leaving the long tail of indirect dependencies in place temporarily.

    Downcasts (most using To<Document>, a few using static_cast) have been
    converted to use a set of new, temporary static Document::From and
    Document::DynamicFrom methods. These behave very similarly to To<> and
    DynamicTo<>, respectively. This is necessary because To<> and
    DynamicTo<> no longer have the needed visibility of the inheritance
    relationship between Document and ExecutionContext to be allowed to
    perform the cast.

    Added a new Document::ToExecutionContext() helper, and changed
    implicit upcasts to use that explicitly. This intentionally does not
    use the existing GetExecutionContext() that Document inherits from
    Node. ToExecutionContext() should be temporary, and and all
    ToExecutionContext() will be audited to determine whether they should
    use GetExecutionContext() or follow a different path to the
    LocalDOMWindow.

    Callers of functions that Document inherited from ExecutionContext
    were handled case by case. For cases where many callers were using
    the inherited function, I've added a helper on Document. For other
    cases, the call now requires a Document::ToExecutionContext().

    Bug: 1029822
---
 .../modules/battery/battery_manager.cc        | 120 +++++++++---------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/chromium_src/third_party/blink/renderer/modules/battery/battery_manager.cc b/chromium_src/third_party/blink/renderer/modules/battery/battery_manager.cc
index 748156f97670..d1b67e0c0c0b 100644
--- a/chromium_src/third_party/blink/renderer/modules/battery/battery_manager.cc
+++ b/chromium_src/third_party/blink/renderer/modules/battery/battery_manager.cc
@@ -14,78 +14,78 @@
 
 namespace blink {
 
-  BatteryManager::~BatteryManager() = default;
-
-  BatteryManager::BatteryManager(ExecutionContext* context)
-      : ContextLifecycleStateObserver(context),
-        PlatformEventController(To<Document>(context)) {}
-
-  BatteryManager* BatteryManager::Create(ExecutionContext* context) {
-    BatteryManager* battery_manager =
-    MakeGarbageCollected<BatteryManager>(context);
-    battery_manager->UpdateStateIfNeeded();
-    return battery_manager;
-  }
-
-  ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
-    if (!battery_property_) {
-      battery_property_ = MakeGarbageCollected<BatteryProperty>(
+BatteryManager* BatteryManager::Create(ExecutionContext* context) {
+  BatteryManager* battery_manager =
+      MakeGarbageCollected<BatteryManager>(context);
+  battery_manager->UpdateStateIfNeeded();
+  return battery_manager;
+}
+
+BatteryManager::~BatteryManager() = default;
+
+BatteryManager::BatteryManager(ExecutionContext* context)
+    : ExecutionContextLifecycleStateObserver(context),
+      PlatformEventController(Document::From(context)) {}
+
+ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
+  if (!battery_property_) {
+    battery_property_ = MakeGarbageCollected<BatteryProperty>(
         ExecutionContext::From(script_state));
-      battery_property_->Resolve(this);
-    }
-    return battery_property_->Promise(script_state->World());
+    battery_property_->Resolve(this);
   }
+  return battery_property_->Promise(script_state->World());
+}
 
-  bool BatteryManager::charging() {
-    return true;
-  }
+bool BatteryManager::charging() {
+  return true;
+}
 
-  double BatteryManager::chargingTime() {
-    return 0;
-  }
+double BatteryManager::chargingTime() {
+  return 0;
+}
 
-  double BatteryManager::dischargingTime() {
-    return std::numeric_limits<double>::infinity();
-  }
+double BatteryManager::dischargingTime() {
+  return std::numeric_limits<double>::infinity();
+}
 
-  double BatteryManager::level() {
-    return 1.0;
-  }
+double BatteryManager::level() {
+  return 1.0;
+}
 
-  void BatteryManager::Trace(blink::Visitor* visitor) {
-    visitor->Trace(battery_property_);
-    PlatformEventController::Trace(visitor);
-    EventTargetWithInlineData::Trace(visitor);
-    ContextLifecycleStateObserver::Trace(visitor);
-  }
+void BatteryManager::DidUpdateData() {
+  return;
+}
 
-  bool BatteryManager::HasPendingActivity() const {
-    return false;
-  }
+void BatteryManager::RegisterWithDispatcher() {
+  return;
+}
 
-  void BatteryManager::ContextLifecycleStateChanged(
-      mojom::FrameLifecycleState) {
-    return;
-  }
+void BatteryManager::UnregisterWithDispatcher() {
+  return;
+}
 
-  void BatteryManager::UnregisterWithDispatcher() {
-    return;
-  }
+bool BatteryManager::HasLastData() {
+  return false;
+}
 
-  void BatteryManager::RegisterWithDispatcher() {
-    return;
-  }
+void BatteryManager::ContextLifecycleStateChanged(mojom::FrameLifecycleState) {
+  return;
+}
 
-  void BatteryManager::ContextDestroyed(ExecutionContext*) {
-    battery_property_ = nullptr;
-    return;
-  }
+void BatteryManager::ContextDestroyed() {
+  battery_property_ = nullptr;
+  return;
+}
 
-  void BatteryManager::DidUpdateData() {
-    return;
-  }
+bool BatteryManager::HasPendingActivity() const {
+  return false;
+}
+
+void BatteryManager::Trace(blink::Visitor* visitor) {
+  visitor->Trace(battery_property_);
+  PlatformEventController::Trace(visitor);
+  EventTargetWithInlineData::Trace(visitor);
+  ExecutionContextLifecycleStateObserver::Trace(visitor);
+}
 
-  bool BatteryManager::HasLastData() {
-    return false;
-  }
 }  // namespace blink

From 9a2845f00a34e42d6b8e05992913c335b5bf3820 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 6 Apr 2020 16:24:20 -0400
Subject: [PATCH 050/161] To<Document> -> Document::From.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/0177ea4ac533757e1d530458bf69fb5daf5557c0

commit 0177ea4ac533757e1d530458bf69fb5daf5557c0
Author: Nate Chapin <japhet@chromium.org>
Date:   Fri Feb 7 16:58:14 2020 +0000

    Make ExecutionContext a private parent class of Document

    This is a step in preparation for moving the ExecutionContext from
    Document to LocalDOMWindow. Using virtual inheritance, this CL leaves
    several ExecutionContext subclasses (UseCounter, ConsoleLogger, and
    FeaturePolicyParserDelegate) as public parent classes of Document,
    while making ExecutionContext private. This exposes all of the places
    that depend directly on Document being an ExecutionContext, while
    leaving the long tail of indirect dependencies in place temporarily.

    Downcasts (most using To<Document>, a few using static_cast) have been
    converted to use a set of new, temporary static Document::From and
    Document::DynamicFrom methods. These behave very similarly to To<> and
    DynamicTo<>, respectively. This is necessary because To<> and
    DynamicTo<> no longer have the needed visibility of the inheritance
    relationship between Document and ExecutionContext to be allowed to
    perform the cast.

    Added a new Document::ToExecutionContext() helper, and changed
    implicit upcasts to use that explicitly. This intentionally does not
    use the existing GetExecutionContext() that Document inherits from
    Node. ToExecutionContext() should be temporary, and and all
    ToExecutionContext() will be audited to determine whether they should
    use GetExecutionContext() or follow a different path to the
    LocalDOMWindow.

    Callers of functions that Document inherited from ExecutionContext
    were handled case by case. For cases where many callers were using
    the inherited function, I've added a helper on Document. For other
    cases, the call now requires a Document::ToExecutionContext().

    Bug: 1029822
---
 .../html/canvas/canvas_async_blob_creator.cc  |  2 +-
 .../peerconnection/rtc_peer_connection.cc     | 13 +++++
 .../modules/webaudio/analyser_node.cc         |  6 +--
 ...eerconnection-rtc_peer_connection.cc.patch | 53 +++++++------------
 4 files changed, 35 insertions(+), 39 deletions(-)
 create mode 100644 chromium_src/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc

diff --git a/chromium_src/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/chromium_src/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
index a88e0a047be0..3857ecb81bd6 100644
--- a/chromium_src/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
+++ b/chromium_src/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
@@ -6,7 +6,7 @@
 #include "third_party/blink/renderer/core/dom/document.h"
 
 #define BRAVE_CANVAS_ASYNC_BLOB_CREATOR                               \
-  Document* document = To<Document>(context);                         \
+  Document* document = Document::From(context);                       \
   if (document) {                                                     \
     image_ = brave::BraveSessionCache::From(*document).PerturbPixels( \
         document->GetFrame(), image_);                                \
diff --git a/chromium_src/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc b/chromium_src/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
new file mode 100644
index 000000000000..0a3d8a23e4b4
--- /dev/null
+++ b/chromium_src/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
@@ -0,0 +1,13 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/renderer/brave_content_settings_agent_impl_helper.h"
+
+#define BRAVE_RTC_PEER_CONNECTION                                              \
+  if (!AllowFingerprinting(Document::From(GetExecutionContext())->GetFrame())) \
+    return ScriptPromise::CastUndefined(script_state);
+
+#include "../../../../../../../third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc"
+#undef BRAVE_RTC_PEER_CONNECTION
diff --git a/chromium_src/third_party/blink/renderer/modules/webaudio/analyser_node.cc b/chromium_src/third_party/blink/renderer/modules/webaudio/analyser_node.cc
index 003ccf30a985..64797b53bc48 100644
--- a/chromium_src/third_party/blink/renderer/modules/webaudio/analyser_node.cc
+++ b/chromium_src/third_party/blink/renderer/modules/webaudio/analyser_node.cc
@@ -7,9 +7,9 @@
 
 #include "third_party/blink/renderer/core/dom/document.h"
 
-#define BRAVE_ANALYSERHANDLER_CONSTRUCTOR                                  \
-  analyser_.fudge_factor_ = brave::BraveSessionCache::From(                \
-                                *To<Document>(node.GetExecutionContext())) \
+#define BRAVE_ANALYSERHANDLER_CONSTRUCTOR                                    \
+  analyser_.fudge_factor_ = brave::BraveSessionCache::From(                  \
+                                *Document::From(node.GetExecutionContext())) \
                                 .GetFudgeFactor();
 
 #include "../../../../../../third_party/blink/renderer/modules/webaudio/analyser_node.cc"
diff --git a/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch b/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
index 1e64e1ce2d15..a1e39e8a3c43 100644
--- a/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
+++ b/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
@@ -1,85 +1,68 @@
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
-index 602d2ba03552486bd98df91e104491dc16d6f372..3d4b89f86f993c0233ba64c2d6652f22545ac1cd 100644
+index 602d2ba03552486bd98df91e104491dc16d6f372..34d9ccc1b3c3ea3708be65a29ec92d86e457d693 100644
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
-@@ -39,6 +39,7 @@
- #include "base/memory/ptr_util.h"
- #include "base/metrics/histogram_macros.h"
- #include "base/optional.h"
-+#include "brave/renderer/brave_content_settings_agent_impl_helper.h"
- #include "services/metrics/public/cpp/ukm_builders.h"
- #include "third_party/blink/public/common/features.h"
- #include "third_party/blink/public/platform/platform.h"
-@@ -837,6 +838,8 @@ void RTCPeerConnection::Dispose() {
+@@ -837,6 +837,7 @@ void RTCPeerConnection::Dispose() {
  ScriptPromise RTCPeerConnection::createOffer(ScriptState* script_state,
                                               const RTCOfferOptions* options,
                                               ExceptionState& exception_state) {
-+  if (!AllowFingerprinting(To<Document>(GetExecutionContext())->GetFrame()))
-+    return ScriptPromise::CastUndefined(script_state);
++  BRAVE_RTC_PEER_CONNECTION
    if (signaling_state_ ==
        webrtc::PeerConnectionInterface::SignalingState::kClosed) {
      exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError,
-@@ -900,6 +903,8 @@ ScriptPromise RTCPeerConnection::CreateOffer(
+@@ -900,6 +901,7 @@ ScriptPromise RTCPeerConnection::CreateOffer(
    ExecutionContext* context = ExecutionContext::From(script_state);
    UseCounter::Count(
        context, WebFeature::kRTCPeerConnectionCreateOfferLegacyFailureCallback);
-+  if (!AllowFingerprinting(To<Document>(GetExecutionContext())->GetFrame()))
-+    return ScriptPromise::CastUndefined(script_state);
++  BRAVE_RTC_PEER_CONNECTION
    if (CallErrorCallbackIfSignalingStateClosed(signaling_state_, error_callback))
      return ScriptPromise::CastUndefined(script_state);
  
-@@ -961,6 +966,8 @@ ScriptPromise RTCPeerConnection::CreateOffer(
+@@ -961,6 +963,7 @@ ScriptPromise RTCPeerConnection::CreateOffer(
  ScriptPromise RTCPeerConnection::createAnswer(ScriptState* script_state,
                                                const RTCAnswerOptions* options,
                                                ExceptionState& exception_state) {
-+  if (!AllowFingerprinting(To<Document>(GetExecutionContext())->GetFrame()))
-+    return ScriptPromise::CastUndefined(script_state);
++  BRAVE_RTC_PEER_CONNECTION
    if (signaling_state_ ==
        webrtc::PeerConnectionInterface::SignalingState::kClosed) {
      exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError,
-@@ -1022,7 +1029,8 @@ ScriptPromise RTCPeerConnection::CreateAnswer(
-     UseCounter::Count(
+@@ -1023,6 +1026,7 @@ ScriptPromise RTCPeerConnection::CreateAnswer(
          context, WebFeature::kRTCPeerConnectionCreateAnswerLegacyCompliant);
    }
--
-+  if (!AllowFingerprinting(To<Document>(GetExecutionContext())->GetFrame()))
-+    return ScriptPromise::CastUndefined(script_state);
+ 
++  BRAVE_RTC_PEER_CONNECTION
    if (CallErrorCallbackIfSignalingStateClosed(signaling_state_, error_callback))
      return ScriptPromise::CastUndefined(script_state);
  
-@@ -1335,6 +1343,8 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
+@@ -1335,6 +1339,7 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
      ScriptState* script_state,
      const RTCSessionDescriptionInit* session_description_init,
      ExceptionState& exception_state) {
-+  if (!AllowFingerprinting(To<Document>(GetExecutionContext())->GetFrame()))
-+    return ScriptPromise::CastUndefined(script_state);
++  BRAVE_RTC_PEER_CONNECTION
    if (session_description_init->type().IsNull() &&
        session_description_init->sdp().IsNull()) {
      return setLocalDescription(script_state);
-@@ -1395,6 +1405,8 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
+@@ -1395,6 +1400,7 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
            WebFeature::
                kRTCPeerConnectionSetLocalDescriptionLegacyNoFailureCallback);
    }
-+  if (!AllowFingerprinting(To<Document>(GetExecutionContext())->GetFrame()))
-+    return ScriptPromise::CastUndefined(script_state);
++  BRAVE_RTC_PEER_CONNECTION
    String sdp;
    if (session_description_init->type() != "rollback") {
      DOMException* exception =
-@@ -1447,6 +1459,8 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
+@@ -1447,6 +1453,7 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
      ScriptState* script_state,
      const RTCSessionDescriptionInit* session_description_init,
      ExceptionState& exception_state) {
-+  if (!AllowFingerprinting(To<Document>(GetExecutionContext())->GetFrame()))
-+    return ScriptPromise::CastUndefined(script_state);
++  BRAVE_RTC_PEER_CONNECTION
    if (session_description_init->type() != "rollback") {
      MaybeWarnAboutUnsafeSdp(session_description_init);
      ReportSetSdpUsage(SetSdpOperationType::kSetRemoteDescription,
-@@ -1501,6 +1515,8 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
+@@ -1501,6 +1508,7 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
            WebFeature::
                kRTCPeerConnectionSetRemoteDescriptionLegacyNoFailureCallback);
    }
-+  if (!AllowFingerprinting(To<Document>(GetExecutionContext())->GetFrame()))
-+    return ScriptPromise::CastUndefined(script_state);
++  BRAVE_RTC_PEER_CONNECTION
  
    if (CallErrorCallbackIfSignalingStateClosed(signaling_state_, error_callback))
      return ScriptPromise::CastUndefined(script_state);

From 97a8141007e4ff7ea283542c5910258f2d0a0c96 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 6 Apr 2020 18:00:21 -0400
Subject: [PATCH 051/161] Converted web_content_settings_client.h patch to an
 override.

Fixed #include path.
Converted both patches to an override.
---
 .../platform/web_content_settings_client.h    | 19 +++++++++------
 ...atform-web_content_settings_client.h.patch | 24 -------------------
 2 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 patches/third_party-blink-public-platform-web_content_settings_client.h.patch

diff --git a/chromium_src/third_party/blink/public/platform/web_content_settings_client.h b/chromium_src/third_party/blink/public/platform/web_content_settings_client.h
index f218a0c3bfdd..9c38ecf22c24 100644
--- a/chromium_src/third_party/blink/public/platform/web_content_settings_client.h
+++ b/chromium_src/third_party/blink/public/platform/web_content_settings_client.h
@@ -8,14 +8,19 @@
 
 #include "brave/third_party/blink/renderer/brave_farbling_constants.h"
 
-#define BRAVE_WEB_CONTENT_SETTINGS_CLIENT_H                                \
-  virtual bool AllowAutoplay(bool default_value) { return default_value; } \
-  virtual BraveFarblingLevel GetBraveFarblingLevel() {                     \
-    return BraveFarblingLevel::OFF;                                        \
-  }
+#define AllowDatabase                                           \
+  AllowAutoplay(bool default_value) { return default_value; }   \
+  virtual bool AllowFingerprinting(bool enabled_per_settings) { \
+    return enabled_per_settings;                                \
+  }                                                             \
+  virtual BraveFarblingLevel GetBraveFarblingLevel() {          \
+    return BraveFarblingLevel::OFF;                             \
+  }                                                             \
+  virtual bool AllowDatabase
 
-#include "../../../../../../third_party/blink/public/platform/web_content_settings_client.h"  // NOLINT
 
-#undef BRAVE_WEB_CONTENT_SETTINGS_CLIENT_H
+#include "../../../../../../third_party/blink/public/platform/web_content_settings_client.h"
+
+#undef AllowDatabase
 
 #endif  // BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_CONTENT_SETTINGS_CLIENT_H_
diff --git a/patches/third_party-blink-public-platform-web_content_settings_client.h.patch b/patches/third_party-blink-public-platform-web_content_settings_client.h.patch
deleted file mode 100644
index 4c7e8aabdc7e..000000000000
--- a/patches/third_party-blink-public-platform-web_content_settings_client.h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/third_party/blink/public/platform/web_content_settings_client.h
-index 3f98347f168943b98f9397629d9b046e2bd85a4b..4728274690203c8853d9fdd894ec2e7caa4bcc6d 100644
---- a/third_party/blink/public/platform/web_content_settings_client.h
-+++ b/third_party/blink/public/platform/web_content_settings_client.h
-@@ -62,6 +62,11 @@ class WebContentSettingsClient {
-     return enabled_per_settings;
-   }
- 
-+  // Controls whether fingerprinting is allowed for this frame.
-+  virtual bool AllowFingerprinting(bool enabled_per_settings) {
-+    return enabled_per_settings;
-+  }
-+
-   // Retrieves the client hints that should be attached to the request for the
-   // given URL.
-   virtual void GetAllowedClientHintsFromSource(const blink::WebURL& url,
-@@ -124,6 +129,7 @@ class WebContentSettingsClient {
-   virtual bool ShouldAutoupgradeMixedContent() { return true; }
- 
-   virtual ~WebContentSettingsClient() = default;
-+  BRAVE_WEB_CONTENT_SETTINGS_CLIENT_H
- };
- 
- }  // namespace blink

From e423ae62bb75b3895f4916d43d5b507d0a238078 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 6 Apr 2020 18:14:59 -0400
Subject: [PATCH 052/161] MaterialDesignController -> TouchUiController.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/f81f0d5d17c037c5866b8808322931f313b796e1

commit f81f0d5d17c037c5866b8808322931f313b796e1
Author: Peter Kasting <pkasting@chromium.org>
Date:   Wed Mar 11 01:51:08 2020 +0000

    Rename MaterialDesignController to TouchUiController.

    Also moves this to ui/base/pointer/, and while I'm touching all the
    lines anyway, renames GetInstance() to Get().

    Bug: 940769
---
 browser/ui/brave_layout_constants.cc            |  4 ++--
 .../profiles/brave_avatar_toolbar_button.cc     |  4 ++--
 .../ui/views/profiles/avatar_toolbar_button.h   | 17 -----------------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/browser/ui/brave_layout_constants.cc b/browser/ui/brave_layout_constants.cc
index f2f1a18c3d12..c59740c84818 100644
--- a/browser/ui/brave_layout_constants.cc
+++ b/browser/ui/brave_layout_constants.cc
@@ -6,11 +6,11 @@
 #include "brave/browser/ui/brave_layout_constants.h"
 
 #include "chrome/browser/ui/layout_constants.h"
-#include "ui/base/material_design/material_design_controller.h"
+#include "ui/base/pointer/touch_ui_controller.h"
 
 // Returns a |nullopt| if the UI color is not handled by Brave.
 base::Optional<int> GetBraveLayoutConstant(LayoutConstant constant) {
-  const bool touch = ui::MaterialDesignController::touch_ui();
+  const bool touch = ui::TouchUiController::Get()->touch_ui();
   // const bool hybrid = mode == ui::MaterialDesignController::MATERIAL_HYBRID;
   // const bool touch_optimized_material =
   //     ui::MaterialDesignController::touch_ui();
diff --git a/browser/ui/views/profiles/brave_avatar_toolbar_button.cc b/browser/ui/views/profiles/brave_avatar_toolbar_button.cc
index 42aea250ff6a..a28aa27c25c6 100644
--- a/browser/ui/views/profiles/brave_avatar_toolbar_button.cc
+++ b/browser/ui/views/profiles/brave_avatar_toolbar_button.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/profiles/avatar_toolbar_button.h"
-#include "ui/base/material_design/material_design_controller.h"
+#include "ui/base/pointer/touch_ui_controller.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
@@ -31,7 +31,7 @@ gfx::ImageSkia BraveAvatarToolbarButton::GetAvatarIcon(
     const gfx::Image& gaia_image) const {
   if (brave::IsTorProfile(browser_->profile()) ||
       browser_->profile()->IsGuestSession()) {
-    const int icon_size = ui::MaterialDesignController::touch_ui() ? 24 : 20;
+    const int icon_size = ui::TouchUiController::Get()->touch_ui() ? 24 : 20;
     const SkColor icon_color = GetThemeProvider()->GetColor(
         ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
     return gfx::CreateVectorIcon(brave::IsTorProfile(browser_->profile())
diff --git a/chromium_src/chrome/browser/ui/views/profiles/avatar_toolbar_button.h b/chromium_src/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
index c8659768de31..e0180dcdf410 100644
--- a/chromium_src/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
+++ b/chromium_src/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
@@ -6,23 +6,6 @@
 #ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_TOOLBAR_BUTTON_H_
 #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_TOOLBAR_BUTTON_H_
 
-// included all original headers in order to prevent our definitions leaking
-#include "base/feature_list.h"
-#include "base/macros.h"
-#include "base/scoped_observer.h"
-#include "build/build_config.h"
-#include "chrome/browser/profiles/profile_attributes_storage.h"
-#include "chrome/browser/ui/avatar_button_error_controller.h"
-#include "chrome/browser/ui/avatar_button_error_controller_delegate.h"
-#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/browser_list_observer.h"
-#include "chrome/browser/ui/views/toolbar/toolbar_button.h"
-#include "chrome/browser/ui/views/toolbar/toolbar_icon_container_view.h"
-#include "components/signin/public/identity_manager/identity_manager.h"
-#include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/material_design/material_design_controller_observer.h"
-#include "ui/events/event.h"
-
 #define GetAvatarIcon virtual GetAvatarIcon
 #include "../../../../../../../chrome/browser/ui/views/profiles/avatar_toolbar_button.h"
 #undef GetAvatarIcon

From e95d43cd4252a5bdd66bba6902f22b3410589869 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 6 Apr 2020 19:26:48 -0400
Subject: [PATCH 053/161] Updated url_constants.cc override.

---
 chromium_src/chrome/common/url_constants.cc | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc
index 0ba2cdf8c9fe..f744083cd38c 100644
--- a/chromium_src/chrome/common/url_constants.cc
+++ b/chromium_src/chrome/common/url_constants.cc
@@ -6,6 +6,7 @@
 #include "chrome/common/url_constants.h"
 
 #include "build/branding_buildflags.h"
+#include "chrome/common/webui_url_constants.h"
 
 namespace chrome {
 
@@ -36,6 +37,10 @@ const char kChooserUsbOverviewURL[] =
 
 const char kChromeBetaForumURL[] =
     "https://community.brave.com/c/beta-builds";
+
+const char kChromeFixUpdateProblems[] =
+    "https://support.brave.com/";
+
 const char kChromeReleaseNotesURL[] =
     "https://brave.com/latest/";
 
@@ -89,6 +94,9 @@ const char kChromeSearchRemoteNtpHost[] = "remote-ntp";
 
 const char kChromeSearchScheme[] = "chrome-search";
 
+const char kChromeUIUntrustedNewTabPageUrl[] =
+    "chrome-untrusted://new-tab-page/";
+
 const char kChromiumProjectURL[] = "https://github.com/brave/brave-browser/";
 
 const char kCloudPrintLearnMoreURL[] =
@@ -129,6 +137,9 @@ const char kExtensionControlledSettingLearnMoreURL[] =
 
 const char kExtensionInvalidRequestURL[] = "chrome-extension://invalid/";
 
+const char kFlashDeprecationLearnMoreURL[] =
+    "https://blog.chromium.org/2017/07/so-long-and-thanks-for-all-flash.html";
+
 const char kGoogleAccountActivityControlsURL[] =
     "https://support.brave.com/";
 
@@ -144,8 +155,6 @@ const char kLearnMoreReportingURL[] =
 
 const char kLegacySupervisedUserManagementDisplayURL[] =
     "https://support.brave.com/";
-const char kLegacySupervisedUserManagementURL[] =
-    "https://support.brave.com/";
 
 const char kManagedUiLearnMoreUrl[] = "https://support.brave.com/";
 
@@ -190,9 +199,6 @@ const char kSafetyTipHelpCenterURL[] =
 const char kSettingsSearchHelpURL[] =
     "https://support.brave.com/";
 
-const char kSymantecSupportUrl[] =
-    "https://support.brave.com/";
-
 const char kSyncAndGoogleServicesLearnMoreURL[] =
     "https://support.brave.com/";
 
@@ -212,6 +218,9 @@ const char kUpgradeHelpCenterBaseURL[] =
     "https://support.brave.com/hc/en-us/articles/"
     "360025390311-How-do-I-download-and-install-Brave-";
 
+const char kWhoIsMyAdministratorHelpURL[] =
+    "https://support.brave.com/";
+
 #if defined(OS_ANDROID)
 const char kAndroidAppScheme[] = "android-app";
 #endif

From c8e1804862c71c414928d53e2321727532f8100a Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 6 Apr 2020 19:29:58 -0400
Subject: [PATCH 054/161] Fixes ranged for loop in shield_exceptions.cc.

Use const &.
---
 common/shield_exceptions.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shield_exceptions.cc b/common/shield_exceptions.cc
index 183d7f200b36..d4f0b3cce0ef 100644
--- a/common/shield_exceptions.cc
+++ b/common/shield_exceptions.cc
@@ -73,7 +73,7 @@ bool IsWhitelistedFingerprintingException(const GURL& firstPartyOrigin,
             "https://map.1passwordservices.com/*")})
     }
   };
-  for (const auto whitelist : whitelist_patterns) {
+  for (const auto& whitelist : whitelist_patterns) {
       if (whitelist.first.MatchesURL(firstPartyOrigin)) {
           return std::any_of(whitelist.second.begin(), whitelist.second.end(),
             [&subresourceUrl](const URLPattern& pattern) {

From 6aabdb5c0ba1617608a7d1c30ff58f7a483c096f Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 7 Apr 2020 18:00:21 -0400
Subject: [PATCH 055/161] PermissionContextBase moved to
 //components/permissions.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/a11361ad301b54774036b3f34856dd647747d6a1

commit a11361ad301b54774036b3f34856dd647747d6a1
Author: Clark DuVall <cduvall@chromium.org>
Date:   Thu Feb 20 22:14:27 2020 +0000

    Move PermissionContextBase to //components/permissions

    There is a slight difference in the code after refactoring:
    PermissionContextBase::IsPermissionAvailableToOrigins() now uses
    PermissionsClient::CanBypassEmbeddingOriginCheck() which checks both if
    the requesting scheme was chrome-extension or if the embedding origin
    was chrome://newtab. This is slightly different from the existing logic
    which only checks for chrome-extension. I believe this should be fine,
    since content::IsOriginSecure() returns true for chrome://newtab
    anyway. This small change allows us to use
    CanBypassEmbeddingOriginCheck() in
    PermissionContextBase::DecidePermission() as well, and avoids adding
    another method to PermissionsClient.

    Bug: 1025609
---
 browser/autoplay/autoplay_permission_context.cc       | 11 ++++++-----
 browser/autoplay/autoplay_permission_context.h        |  8 ++++----
 .../autoplay/autoplay_permission_context_unittest.cc  |  2 +-
 ...etwork_delegate_hsts_fingerprinting_browsertest.cc |  1 +
 .../brave_shields/browser/brave_shields_util.cc       |  1 +
 ...ontent_settings_agent_impl_autoplay_browsertest.cc |  1 +
 .../brave_content_settings_agent_impl_browsertest.cc  |  1 +
 ...e_content_settings_agent_impl_flash_browsertest.cc |  1 +
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/browser/autoplay/autoplay_permission_context.cc b/browser/autoplay/autoplay_permission_context.cc
index 8da2e24a7f0f..964c441b3f16 100644
--- a/browser/autoplay/autoplay_permission_context.cc
+++ b/browser/autoplay/autoplay_permission_context.cc
@@ -14,9 +14,10 @@
 #include "components/permissions/permission_request_id.h"
 #include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
 
-AutoplayPermissionContext::AutoplayPermissionContext(Profile* profile)
-    : PermissionContextBase(
-          profile,
+AutoplayPermissionContext::AutoplayPermissionContext(
+    content::BrowserContext* browser_context)
+    : permissions::PermissionContextBase(
+          browser_context,
           ContentSettingsType::AUTOPLAY,
           blink::mojom::FeaturePolicyFeature::kAutoplay) {}
 
@@ -41,10 +42,10 @@ void AutoplayPermissionContext::NotifyPermissionSet(
     const permissions::PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
-    BrowserPermissionCallback callback,
+    permissions::BrowserPermissionCallback callback,
     bool persist,
     ContentSetting content_setting) {
-  PermissionContextBase::NotifyPermissionSet(
+  permissions::PermissionContextBase::NotifyPermissionSet(
       id, requesting_origin, embedding_origin, std::move(callback), persist,
       content_setting);
   // Ask -> Allow
diff --git a/browser/autoplay/autoplay_permission_context.h b/browser/autoplay/autoplay_permission_context.h
index a4b5de8ad81a..a55e92906ce6 100644
--- a/browser/autoplay/autoplay_permission_context.h
+++ b/browser/autoplay/autoplay_permission_context.h
@@ -7,11 +7,11 @@
 #define BRAVE_BROWSER_AUTOPLAY_AUTOPLAY_PERMISSION_CONTEXT_H_
 
 #include "base/macros.h"
-#include "chrome/browser/permissions/permission_context_base.h"
+#include "components/permissions/permission_context_base.h"
 
-class AutoplayPermissionContext : public PermissionContextBase {
+class AutoplayPermissionContext : public permissions::PermissionContextBase {
  public:
-  explicit AutoplayPermissionContext(Profile* profile);
+  explicit AutoplayPermissionContext(content::BrowserContext* browser_context);
   ~AutoplayPermissionContext() override;
 
  private:
@@ -22,7 +22,7 @@ class AutoplayPermissionContext : public PermissionContextBase {
   void NotifyPermissionSet(const permissions::PermissionRequestID& id,
                            const GURL& requesting_origin,
                            const GURL& embedding_origin,
-                           BrowserPermissionCallback callback,
+                           permissions::BrowserPermissionCallback callback,
                            bool persist,
                            ContentSetting content_setting) override;
   bool IsRestrictedToSecureOrigins() const override;
diff --git a/browser/autoplay/autoplay_permission_context_unittest.cc b/browser/autoplay/autoplay_permission_context_unittest.cc
index 9b5efe8c987d..28911eebccbf 100644
--- a/browser/autoplay/autoplay_permission_context_unittest.cc
+++ b/browser/autoplay/autoplay_permission_context_unittest.cc
@@ -43,7 +43,7 @@ class AutoplayPermissionContextTest : public AutoplayPermissionContext {
   void NotifyPermissionSet(const permissions::PermissionRequestID& id,
                            const GURL& requesting_origin,
                            const GURL& embedder_origin,
-                           BrowserPermissionCallback callback,
+                           permissions::BrowserPermissionCallback callback,
                            bool persist,
                            ContentSetting content_setting) override {
   if (!(persist && content_setting == CONTENT_SETTING_ALLOW))
diff --git a/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc b/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc
index 3471830f2d08..fe72320b9f9c 100644
--- a/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc
+++ b/browser/net/brave_network_delegate_hsts_fingerprinting_browsertest.cc
@@ -7,6 +7,7 @@
 #include "brave/common/brave_paths.h"
 #include "brave/components/brave_shields/common/brave_shield_constants.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/components/brave_shields/browser/brave_shields_util.cc b/components/brave_shields/browser/brave_shields_util.cc
index 41c9c9457d24..986e96947de5 100644
--- a/components/brave_shields/browser/brave_shields_util.cc
+++ b/components/brave_shields/browser/brave_shields_util.cc
@@ -19,6 +19,7 @@
 #include "brave/components/brave_shields/common/features.h"
 #include "brave/components/content_settings/core/common/content_settings_util.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/profiles/profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc b/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
index 1b79d4f7b392..3f1de7c2aa46 100644
--- a/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
+++ b/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
@@ -8,6 +8,7 @@
 #include "brave/browser/brave_content_browser_client.h"
 #include "brave/common/brave_paths.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h"
 #include "chrome/common/chrome_content_client.h"
diff --git a/renderer/brave_content_settings_agent_impl_browsertest.cc b/renderer/brave_content_settings_agent_impl_browsertest.cc
index ecf5b3fd4946..51ee26ccfa34 100644
--- a/renderer/brave_content_settings_agent_impl_browsertest.cc
+++ b/renderer/brave_content_settings_agent_impl_browsertest.cc
@@ -10,6 +10,7 @@
 #include "brave/components/brave_shields/common/brave_shield_constants.h"
 #include "brave/components/brave_shields/common/features.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/test/base/in_process_browser_test.h"
diff --git a/renderer/brave_content_settings_agent_impl_flash_browsertest.cc b/renderer/brave_content_settings_agent_impl_flash_browsertest.cc
index dcc0bedb8904..62be205a743d 100644
--- a/renderer/brave_content_settings_agent_impl_flash_browsertest.cc
+++ b/renderer/brave_content_settings_agent_impl_flash_browsertest.cc
@@ -8,6 +8,7 @@
 #include "brave/common/brave_paths.h"
 #include "brave/components/brave_shields/common/brave_shield_constants.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h"
 #include "chrome/common/chrome_content_client.h"

From 93fa40d4900f34cdc724871e6e8093331219fe0d Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 7 Apr 2020 14:59:52 -0400
Subject: [PATCH 056/161] GeolocationPermissionContext moved to
 //components/permissions.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/600abea8ab84ba57622c7877a84777f0c1bb273b

commit 600abea8ab84ba57622c7877a84777f0c1bb273b
Author: Clark DuVall <cduvall@chromium.org>
Date:   Mon Mar 23 16:16:17 2020 +0000

    Move GeolocationPermissionContext to //components/permissions

    This breaks out embedder-specific logic into a Delegate class which is
    implemented in //chrome. The Delegate can then be passed to the
    GeolocationPermissionContext in the constructor.

    This is the first permission context moved to //components/permissions.
    I created a new subdirectory there (contexts/), so we can separate DEPS
    that are only needed for permission contexts from DEPS needed for the
    core permissions code.

    All the unit tests were moved except for a couple that were specific
    to the //chrome version of the delegate.

    Bug: 1025609, 1025625
---
 browser/BUILD.gn                              |  4 +-
 .../brave_geolocation_permission_context.cc   | 37 -----------------
 .../brave_geolocation_permission_context.h    | 27 -------------
 ...geolocation_permission_context_delegate.cc | 40 +++++++++++++++++++
 ..._geolocation_permission_context_delegate.h | 33 +++++++++++++++
 .../permissions/permission_manager_factory.cc |  7 ++--
 6 files changed, 79 insertions(+), 69 deletions(-)
 delete mode 100644 browser/geolocation/brave_geolocation_permission_context.cc
 delete mode 100644 browser/geolocation/brave_geolocation_permission_context.h
 create mode 100644 browser/geolocation/brave_geolocation_permission_context_delegate.cc
 create mode 100644 browser/geolocation/brave_geolocation_permission_context_delegate.h

diff --git a/browser/BUILD.gn b/browser/BUILD.gn
index b7bef01fee86..62af973d026b 100644
--- a/browser/BUILD.gn
+++ b/browser/BUILD.gn
@@ -65,8 +65,8 @@ source_set("browser_process") {
     "component_updater/brave_component_updater_configurator.h",
     "component_updater/brave_component_updater_delegate.cc",
     "component_updater/brave_component_updater_delegate.h",
-    "geolocation/brave_geolocation_permission_context.cc",
-    "geolocation/brave_geolocation_permission_context.h",
+    "geolocation/brave_geolocation_permission_context_delegate.cc",
+    "geolocation/brave_geolocation_permission_context_delegate.h",
     "metrics/metrics_reporting_util.cc",
     "metrics/metrics_reporting_util.h",
     "search_engines/guest_window_search_engine_provider_service.cc",
diff --git a/browser/geolocation/brave_geolocation_permission_context.cc b/browser/geolocation/brave_geolocation_permission_context.cc
deleted file mode 100644
index a637baac1185..000000000000
--- a/browser/geolocation/brave_geolocation_permission_context.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/browser/geolocation/brave_geolocation_permission_context.h"
-
-#include <utility>
-
-#include "brave/browser/profiles/profile_util.h"
-#include "components/content_settings/core/common/content_settings.h"
-#include "components/prefs/pref_service.h"
-#include "brave/common/tor/pref_names.h"
-
-BraveGeolocationPermissionContext::BraveGeolocationPermissionContext(
-    Profile* profile) : GeolocationPermissionContext(profile) {
-}
-
-BraveGeolocationPermissionContext::~BraveGeolocationPermissionContext() {
-}
-
-void BraveGeolocationPermissionContext::DecidePermission(
-    content::WebContents* web_contents,
-    const permissions::PermissionRequestID& id,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin,
-    bool user_gesture,
-    BrowserPermissionCallback callback) {
-  if (brave::IsTorProfile(profile())) {
-    std::move(callback).Run(ContentSetting::CONTENT_SETTING_BLOCK);
-    return;
-  }
-
-  return GeolocationPermissionContext::DecidePermission(
-      web_contents, id, requesting_origin, embedding_origin, user_gesture,
-      std::move(callback));
-}
diff --git a/browser/geolocation/brave_geolocation_permission_context.h b/browser/geolocation/brave_geolocation_permission_context.h
deleted file mode 100644
index 24f480bfba02..000000000000
--- a/browser/geolocation/brave_geolocation_permission_context.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_H_
-#define BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_H_
-
-#include "chrome/browser/geolocation/geolocation_permission_context.h"
-
-class BraveGeolocationPermissionContext : public GeolocationPermissionContext {
- public:
-  explicit BraveGeolocationPermissionContext(Profile* profile);
-  ~BraveGeolocationPermissionContext() override;
-
-  void DecidePermission(content::WebContents* web_contents,
-                        const permissions::PermissionRequestID& id,
-                        const GURL& requesting_origin,
-                        const GURL& embedding_origin,
-                        bool user_gesture,
-                        BrowserPermissionCallback callback) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(BraveGeolocationPermissionContext);
-};
-
-#endif  // BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_H_
diff --git a/browser/geolocation/brave_geolocation_permission_context_delegate.cc b/browser/geolocation/brave_geolocation_permission_context_delegate.cc
new file mode 100644
index 000000000000..1e2d70214b8d
--- /dev/null
+++ b/browser/geolocation/brave_geolocation_permission_context_delegate.cc
@@ -0,0 +1,40 @@
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/geolocation/brave_geolocation_permission_context_delegate.h"
+
+#include <utility>
+
+#include "brave/browser/profiles/profile_util.h"
+#include "chrome/browser/profiles/profile.h"
+#include "components/content_settings/core/common/content_settings.h"
+#include "components/permissions/permission_request_id.h"
+#include "content/public/browser/web_contents.h"
+#include "url/gurl.h"
+
+BraveGeolocationPermissionContextDelegate::
+    BraveGeolocationPermissionContextDelegate(
+        content::BrowserContext* browser_context)
+    : GeolocationPermissionContextDelegate(browser_context),
+      profile_(Profile::FromBrowserContext(browser_context)) {}
+
+BraveGeolocationPermissionContextDelegate::
+    ~BraveGeolocationPermissionContextDelegate() {}
+
+bool BraveGeolocationPermissionContextDelegate::DecidePermission(
+    content::WebContents* web_contents,
+    const permissions::PermissionRequestID& id,
+    const GURL& requesting_origin,
+    bool user_gesture,
+    permissions::BrowserPermissionCallback* callback,
+    permissions::GeolocationPermissionContext* context) {
+  if (brave::IsTorProfile(profile_)) {
+    std::move(*callback).Run(ContentSetting::CONTENT_SETTING_BLOCK);
+    return true;
+  }
+
+  return GeolocationPermissionContextDelegate::DecidePermission(
+      web_contents, id, requesting_origin, user_gesture, callback, context);
+}
diff --git a/browser/geolocation/brave_geolocation_permission_context_delegate.h b/browser/geolocation/brave_geolocation_permission_context_delegate.h
new file mode 100644
index 000000000000..4a42a39f0d56
--- /dev/null
+++ b/browser/geolocation/brave_geolocation_permission_context_delegate.h
@@ -0,0 +1,33 @@
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_DELEGATE_H_
+#define BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_DELEGATE_H_
+
+#include "chrome/browser/geolocation/geolocation_permission_context_delegate.h"
+
+class Profile;
+
+class BraveGeolocationPermissionContextDelegate
+    : public GeolocationPermissionContextDelegate {
+ public:
+  explicit BraveGeolocationPermissionContextDelegate(
+      content::BrowserContext* browser_context);
+  ~BraveGeolocationPermissionContextDelegate() override;
+
+  bool DecidePermission(
+      content::WebContents* web_contents,
+      const permissions::PermissionRequestID& id,
+      const GURL& requesting_origin,
+      bool user_gesture,
+      permissions::BrowserPermissionCallback* callback,
+      permissions::GeolocationPermissionContext* context) override;
+
+ private:
+  Profile* profile_;
+  DISALLOW_COPY_AND_ASSIGN(BraveGeolocationPermissionContextDelegate);
+};
+
+#endif  // BRAVE_BROWSER_GEOLOCATION_BRAVE_GEOLOCATION_PERMISSION_CONTEXT_DELEGATE_H_
diff --git a/chromium_src/chrome/browser/permissions/permission_manager_factory.cc b/chromium_src/chrome/browser/permissions/permission_manager_factory.cc
index 423f5dc8b1f1..f9e8b48651c9 100644
--- a/chromium_src/chrome/browser/permissions/permission_manager_factory.cc
+++ b/chromium_src/chrome/browser/permissions/permission_manager_factory.cc
@@ -8,8 +8,9 @@
 #include <memory>
 
 #include "brave/browser/autoplay/autoplay_permission_context.h"
-#include "brave/browser/geolocation/brave_geolocation_permission_context.h"
+#include "brave/browser/geolocation/brave_geolocation_permission_context_delegate.h"
 #include "components/content_settings/core/common/content_settings_types.h"
+#include "components/permissions/permission_manager.h"
 
 namespace {
 
@@ -29,9 +30,9 @@ BraveCreatePermissionContexts(Profile* profile) {
 }  // namespace
 
 #define BuildServiceInstanceFor BuildServiceInstanceFor_ChromiumImpl
-#define GeolocationPermissionContext BraveGeolocationPermissionContext
+#define GeolocationPermissionContextDelegate BraveGeolocationPermissionContextDelegate
 #include "../../../../../chrome/browser/permissions/permission_manager_factory.cc"
-#undef GeolocationPermissionContext
+#undef GeolocationPermissionContextDelegate
 #undef BuildServiceInstanceFor
 
 KeyedService* PermissionManagerFactory::BuildServiceInstanceFor(

From af0e38d1a2a1bf0f84d6fac73baed8c76d6c3ed3 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 7 Apr 2020 18:22:21 -0400
Subject: [PATCH 057/161] SimplifyHttpsIndicator feature was removed.

It's been turned on by default for some time.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/dc818313c5a95f9d0dcee04349532ef7ac6363b8

commit dc818313c5a95f9d0dcee04349532ef7ac6363b8
Author: Christopher Thompson <cthomp@chromium.org>
Date:   Tue Feb 18 23:26:17 2020 +0000

    Remove SimplifyHttpsIndicator feature/flag

    SimplifyHttpsIndicator has been default enabled for a while, and the
    flag expired in M-76. This removes the feature and flag, and the logic
    for the disabled path.

    This also simplifies how the display and accessibility text are
    generated now that there are fewer edge cases to handle, removing the
    SecureChipText struct in favor of separating the logic of
    GetSecureDisplayText() and GetSecureAccessibilityText(). Accessibility
    text now defaults to the display text, except for specific hard-coded
    exceptions (i.e., SECURE and EV_SECURE states won't have display text,
    so GetSecureAccessibilityText() specifies their accessibility text).
---
 app/brave_main_delegate.cc                                 | 2 --
 app/brave_main_delegate_browsertest.cc                     | 2 --
 .../ui/views/location_bar/location_bar_view_browsertest.cc | 7 +------
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
index b73bfd257122..2d5b27859a0a 100644
--- a/app/brave_main_delegate.cc
+++ b/app/brave_main_delegate.cc
@@ -30,7 +30,6 @@
 #include "components/autofill/core/common/autofill_payments_features.h"
 #include "components/feed/feed_feature_list.h"
 #include "components/offline_pages/core/offline_page_feature.h"
-#include "components/omnibox/common/omnibox_features.h"
 #include "components/password_manager/core/common/password_manager_features.h"
 #include "components/security_state/core/features.h"
 #include "components/sync/driver/sync_driver_switches.h"
@@ -163,7 +162,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
     // Enable webui dark theme: @media (prefers-color-scheme: dark) is gated on
     // this feature.
       features::kWebUIDarkMode.name,
-      omnibox::kSimplifyHttpsIndicator.name,
   };
 
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
index acab442d43d4..2e9188cbe0b2 100644
--- a/app/brave_main_delegate_browsertest.cc
+++ b/app/brave_main_delegate_browsertest.cc
@@ -12,7 +12,6 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/autofill/core/common/autofill_features.h"
 #include "components/autofill/core/common/autofill_payments_features.h"
-#include "components/omnibox/common/omnibox_features.h"
 #include "components/password_manager/core/common/password_manager_features.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/content_features.h"
@@ -59,7 +58,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
 
 IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, EnabledFeatures) {
   const base::Feature* enabled_features[] = {
-    &omnibox::kSimplifyHttpsIndicator,
     &password_manager::features::kPasswordImport,
   };
 
diff --git a/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc
index d26efe017250..a07689a3559e 100644
--- a/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc
+++ b/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc
@@ -11,7 +11,6 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/omnibox/browser/location_bar_model_impl.h"
-#include "components/omnibox/common/omnibox_features.h"
 #include "content/public/test/url_loader_interceptor.h"
 #include "net/cert/ct_policy_status.h"
 #include "net/ssl/ssl_info.h"
@@ -32,9 +31,7 @@ class SecurityIndicatorTest
     : public InProcessBrowserTest,
       public ::testing::WithParamInterface<SecurityIndicatorTestParams> {
  public:
-  SecurityIndicatorTest() : InProcessBrowserTest(), cert_(nullptr) {
-    feature_list_.InitAndEnableFeature(omnibox::kSimplifyHttpsIndicator);
-  }
+  SecurityIndicatorTest() : InProcessBrowserTest(), cert_(nullptr) {}
 
   void SetUpInProcessBrowserTestFixture() override {
     cert_ =
@@ -80,8 +77,6 @@ class SecurityIndicatorTest
   }
 
  private:
-  base::test::ScopedFeatureList feature_list_;
-
   scoped_refptr<net::X509Certificate> cert_;
 
   std::unique_ptr<content::URLLoaderInterceptor> url_loader_interceptor_;

From f7c2682bb848b06a7c4d7853da6295ba21a7e92e Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 10 Apr 2020 17:06:33 -0400
Subject: [PATCH 058/161] Converted AutocompleteController overrides to a
 patch.

Due to the Chromium change below, AutocompleteController now has an inner
Observer class some of whose methods take AutocompleteController as a
parameter. This means we can no longer just redefine
AutocompleteController to BraveAutocompleteController in classes that
created AutocompleteController and implemented its observer.
Instead of patching each of these classes, removed the overrides and
patched a single place in AutocompleteController.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/c9d02005c7893e5fe1ad24df3f1041224ab61c4c

commit c9d02005c7893e5fe1ad24df3f1041224ab61c4c
Author: Tommy C. Li <tommycli@chromium.org>
Date:   Thu Mar 19 22:44:02 2020 +0000

    [omnibox] Combine AutocompleteController observer classes

    This CL combines AutocompleteControllerDelegate and
    OmniboxControllerEmitter::Observer classes into a single
    AutocompleteController::Observer class.

    This is because these two classes are essentially the same, both
    observing the AutocompleteController.

    In the future, we can also make OmniboxControllerEmitter itself an
    instance of AutocompleteController::Observer, because it too, is
    essentially an observer class that's a KeyedService.

    The ultimate goal is to hook up the Android omnibox and NTP realbox
    to the chrome://omnibox debug surfaces.

    This refactor is to pave the way for that. See the bug for the full
    engineering plan on how to get there.

    Bug: 1058486
---
 .../autocomplete_controller_android.cc        | 12 ---------
 .../autocomplete_classifier_factory.cc        |  3 ---
 .../ui/app_list/search/omnibox_provider.cc    | 10 -------
 .../ui/webui/omnibox/omnibox_page_handler.cc  | 11 --------
 .../browser/autocomplete_controller.cc        | 15 +++++++++++
 .../omnibox/browser/omnibox_controller.cc     | 12 ---------
 components/omnibox/browser/BUILD.gn           |  2 --
 .../browser/brave_autocomplete_controller.cc  | 26 -------------------
 .../browser/brave_autocomplete_controller.h   | 24 -----------------
 ...x-browser-autocomplete_controller.cc.patch | 12 +++++++++
 ...ox-browser-autocomplete_controller.h.patch | 12 ---------
 11 files changed, 27 insertions(+), 112 deletions(-)
 delete mode 100644 chromium_src/chrome/browser/android/omnibox/autocomplete_controller_android.cc
 delete mode 100644 chromium_src/chrome/browser/ui/app_list/search/omnibox_provider.cc
 delete mode 100644 chromium_src/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
 create mode 100644 chromium_src/components/omnibox/browser/autocomplete_controller.cc
 delete mode 100644 chromium_src/components/omnibox/browser/omnibox_controller.cc
 delete mode 100644 components/omnibox/browser/brave_autocomplete_controller.cc
 delete mode 100644 components/omnibox/browser/brave_autocomplete_controller.h
 create mode 100644 patches/components-omnibox-browser-autocomplete_controller.cc.patch
 delete mode 100644 patches/components-omnibox-browser-autocomplete_controller.h.patch

diff --git a/chromium_src/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chromium_src/chrome/browser/android/omnibox/autocomplete_controller_android.cc
deleted file mode 100644
index a682f67bc4af..000000000000
--- a/chromium_src/chrome/browser/android/omnibox/autocomplete_controller_android.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 3.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/components/omnibox/browser/brave_autocomplete_controller.h"
-#include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
-#include "components/omnibox/browser/autocomplete_controller.h"
-
-#define AutocompleteController BraveAutocompleteController
-#include "../../../../../../../chrome/browser/android/omnibox/autocomplete_controller_android.cc"  // NOLINT
-#undef AutocompleteController
diff --git a/chromium_src/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/chromium_src/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
index 6b9567740f12..c35c05e4559a 100644
--- a/chromium_src/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
+++ b/chromium_src/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
@@ -5,14 +5,11 @@
 
 #include "brave/browser/autocomplete/brave_autocomplete_provider_client_for_classifier.h"
 #include "brave/browser/autocomplete/brave_autocomplete_scheme_classifier.h"
-#include "brave/components/omnibox/browser/brave_autocomplete_controller.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
 
-#define AutocompleteController BraveAutocompleteController
 #define ChromeAutocompleteProviderClient BraveAutocompleteProviderClientForClassifier  // NOLINT
 #define ChromeAutocompleteSchemeClassifier BraveAutocompleteSchemeClassifier
 #include "../../../../../chrome/browser/autocomplete/autocomplete_classifier_factory.cc"
 #undef ChromeAutocompleteSchemeClassifier
 #undef ChromeAutocompleteProviderClient
-#undef AutocompleteController
diff --git a/chromium_src/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chromium_src/chrome/browser/ui/app_list/search/omnibox_provider.cc
deleted file mode 100644
index 12b912048a46..000000000000
--- a/chromium_src/chrome/browser/ui/app_list/search/omnibox_provider.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/components/omnibox/browser/brave_autocomplete_controller.h"
-#include "components/omnibox/browser/autocomplete_controller.h"
-
-#define AutocompleteController BraveAutocompleteController
-#include "../../../../../../../chrome/browser/ui/app_list/search/omnibox_provider.cc"
-#undef AutocompleteController
diff --git a/chromium_src/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc b/chromium_src/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
deleted file mode 100644
index 432944180359..000000000000
--- a/chromium_src/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/components/omnibox/browser/brave_autocomplete_controller.h"
-#include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
-#include "components/omnibox/browser/autocomplete_controller.h"
-
-#define AutocompleteController BraveAutocompleteController
-#include "../../../../../../../chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc"
-#undef AutocompleteController
diff --git a/chromium_src/components/omnibox/browser/autocomplete_controller.cc b/chromium_src/components/omnibox/browser/autocomplete_controller.cc
new file mode 100644
index 000000000000..9a8dfe602d21
--- /dev/null
+++ b/chromium_src/components/omnibox/browser/autocomplete_controller.cc
@@ -0,0 +1,15 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/components/omnibox/browser/suggested_sites_provider.h"
+#include "brave/components/omnibox/browser/topsites_provider.h"
+
+#define BRAVE_AUTOCOMPLETE_CONTROLLER_AUTOCOMPLETE_CONTROLLER         \
+  providers_.push_back(new TopSitesProvider(provider_client_.get())); \
+  providers_.push_back(new SuggestedSitesProvider(provider_client_.get()));
+
+#include "../../../../../components/omnibox/browser/autocomplete_controller.cc"
+#undef BRAVE_AUTOCOMPLETE_CONTROLLER_AUTOCOMPLETE_CONTROLLER
+
diff --git a/chromium_src/components/omnibox/browser/omnibox_controller.cc b/chromium_src/components/omnibox/browser/omnibox_controller.cc
deleted file mode 100644
index 97fd38f0fbf0..000000000000
--- a/chromium_src/components/omnibox/browser/omnibox_controller.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/components/omnibox/browser/brave_autocomplete_controller.h"
-#include "components/omnibox/browser/autocomplete_controller.h"
-#include "components/omnibox/browser/omnibox_controller_emitter.h"
-
-#define AutocompleteController BraveAutocompleteController
-#include "../../../../../../../components/omnibox/browser/omnibox_controller.cc"  // NOLINT
-#undef AutocompleteController
diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
index e9805b6502b6..915be417e543 100644
--- a/components/omnibox/browser/BUILD.gn
+++ b/components/omnibox/browser/BUILD.gn
@@ -4,8 +4,6 @@ source_set("browser") {
   visibility = [ "//components/omnibox/browser" ]
 
   sources = [
-    "brave_autocomplete_controller.cc",
-    "brave_autocomplete_controller.h",
     "brave_omnibox_client.cc",
     "brave_omnibox_client.h",
     "constants.cc",
diff --git a/components/omnibox/browser/brave_autocomplete_controller.cc b/components/omnibox/browser/brave_autocomplete_controller.cc
deleted file mode 100644
index 563f1934b584..000000000000
--- a/components/omnibox/browser/brave_autocomplete_controller.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/components/omnibox/browser/brave_autocomplete_controller.h"
-
-#include <memory>
-#include <utility>
-
-#include "brave/components/omnibox/browser/suggested_sites_provider.h"
-#include "brave/components/omnibox/browser/topsites_provider.h"
-
-BraveAutocompleteController::BraveAutocompleteController(
-    std::unique_ptr<AutocompleteProviderClient> provider_client,
-    AutocompleteControllerDelegate* delegate,
-    int provider_types) : AutocompleteController(std::move(provider_client),
-                                                 delegate, provider_types) {
-  if (provider_types & AutocompleteProvider::TYPE_SEARCH) {
-    providers_.push_back(new TopSitesProvider(provider_client_.get()));
-    providers_.push_back(new SuggestedSitesProvider(provider_client_.get()));
-  }
-}
-
-BraveAutocompleteController::~BraveAutocompleteController() {
-}
diff --git a/components/omnibox/browser/brave_autocomplete_controller.h b/components/omnibox/browser/brave_autocomplete_controller.h
deleted file mode 100644
index 10d367998e9b..000000000000
--- a/components/omnibox/browser/brave_autocomplete_controller.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-#ifndef BRAVE_COMPONENTS_OMNIBOX_BROWSER_BRAVE_AUTOCOMPLETE_CONTROLLER_H_
-#define BRAVE_COMPONENTS_OMNIBOX_BROWSER_BRAVE_AUTOCOMPLETE_CONTROLLER_H_
-
-#include <memory>
-
-#include "components/omnibox/browser/autocomplete_controller.h"
-
-class BraveAutocompleteController : public AutocompleteController {
- public:
-  BraveAutocompleteController(
-      std::unique_ptr<AutocompleteProviderClient> provider_client,
-      AutocompleteControllerDelegate* delegate,
-      int provider_types);
-  ~BraveAutocompleteController() override;
-};
-
-
-#endif  // BRAVE_COMPONENTS_OMNIBOX_BROWSER_BRAVE_AUTOCOMPLETE_CONTROLLER_H_
diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch
new file mode 100644
index 000000000000..08ebebe9a912
--- /dev/null
+++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch
@@ -0,0 +1,12 @@
+diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
+index e2070029a60a26fe536af663cceb730313cb62d7..f7adcb7fe9907787b9539f7b438bee62a8f2013c 100644
+--- a/components/omnibox/browser/autocomplete_controller.cc
++++ b/components/omnibox/browser/autocomplete_controller.cc
+@@ -238,6 +238,7 @@ AutocompleteController::AutocompleteController(
+   if (provider_types & AutocompleteProvider::TYPE_SEARCH) {
+     search_provider_ = new SearchProvider(provider_client_.get(), this);
+     providers_.push_back(search_provider_);
++    BRAVE_AUTOCOMPLETE_CONTROLLER_AUTOCOMPLETE_CONTROLLER
+   }
+   // It's important that the HistoryURLProvider gets added after SearchProvider:
+   // AutocompleteController::Start() calls each providers' Start() function
diff --git a/patches/components-omnibox-browser-autocomplete_controller.h.patch b/patches/components-omnibox-browser-autocomplete_controller.h.patch
deleted file mode 100644
index 8233fc70f9a8..000000000000
--- a/patches/components-omnibox-browser-autocomplete_controller.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/components/omnibox/browser/autocomplete_controller.h b/components/omnibox/browser/autocomplete_controller.h
-index 2f2212f8ed24eda809923c61615d79282464e3f1..0e57502584dfc1bf7c66ced61ad9228711afb399 100644
---- a/components/omnibox/browser/autocomplete_controller.h
-+++ b/components/omnibox/browser/autocomplete_controller.h
-@@ -170,6 +170,7 @@ class AutocompleteController : public AutocompleteProviderListener,
-   }
- 
-  private:
-+  friend class BraveAutocompleteController;
-   friend class AutocompleteProviderTest;
-   FRIEND_TEST_ALL_PREFIXES(AutocompleteProviderTest,
-                            RedundantKeywordsIgnoredInResult);

From 2c1820bee09d1ebf45e20a97a9fb8359ddc2089b Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 10 Apr 2020 17:33:18 -0400
Subject: [PATCH 059/161] Theme color ids were renamed.

Chromium changes:

https://chromium.googlesource.com/chromium/src/+/439a8dd6a860f5dd25d174b4ffb170a7dc531e4d

commit 439a8dd6a860f5dd25d174b4ffb170a7dc531e4d
Author: Thomas Lukaszewicz <tluk@chromium.org>
Date:   Thu Mar 12 17:58:27 2020 +0000

    Updated Tab color ids

    Updated color ids for tab background and foreground colors. New tab
    ids describe the specific tab state they represent. These ids will
    help in transitioning over to Color Pipeline in future changes.

    Bug: 1056916

https://chromium.googlesource.com/chromium/src/+/ab2ca22fb75c61f7167e9b20ac88cc7a85c3be6b

commit ab2ca22fb75c61f7167e9b20ac88cc7a85c3be6b
Author: Thomas Lukaszewicz <tluk@chromium.org>
Date:   Mon Mar 16 19:30:47 2020 +0000

    Consistent naming for COLOR_FRAME, simplified GetTabBackgroundColor()

    Updated COLOR_FRAME ThemeProperty color ids to match the naming
    convention used for tab background and foreground color ids.

    Simplified color calculation logic in GetTabBackgroundColor().

    Bug: 1056916
---
 browser/themes/theme_properties.cc | 37 +++++++++++++++---------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/browser/themes/theme_properties.cc b/browser/themes/theme_properties.cc
index e147ee23672f..233afcc319f1 100644
--- a/browser/themes/theme_properties.cc
+++ b/browser/themes/theme_properties.cc
@@ -18,14 +18,14 @@ base::Optional<SkColor> MaybeGetDefaultColorForBraveLightUi(int id) {
   switch (id) {
     // Applies when the window is active, tabs and also tab bar everywhere
     // except active tab
-    case ThemeProperties::COLOR_FRAME:
-    case ThemeProperties::COLOR_BACKGROUND_TAB:
+    case ThemeProperties::COLOR_FRAME_ACTIVE:
+    case ThemeProperties::COLOR_TAB_BACKGROUND_INACTIVE_FRAME_ACTIVE:
     case ThemeProperties::COLOR_TOOLBAR_CONTENT_AREA_SEPARATOR:
       return kLightFrame;
     // Window when the window is innactive, tabs and also tab bar everywhere
     // except active tab
     case ThemeProperties::COLOR_FRAME_INACTIVE:
-    case ThemeProperties::COLOR_BACKGROUND_TAB_INACTIVE:
+    case ThemeProperties::COLOR_TAB_BACKGROUND_INACTIVE_FRAME_INACTIVE:
       return color_utils::HSLShift(kLightFrame, { -1, -1, 0.6 });
     // Active tab and also the URL toolbar
     // Parts of this color show up as you hover over innactive tabs too
@@ -33,9 +33,9 @@ base::Optional<SkColor> MaybeGetDefaultColorForBraveLightUi(int id) {
     case ThemeProperties::COLOR_TOOLBAR_TOP_SEPARATOR:
     case ThemeProperties::COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE:
       return kLightToolbar;
-    case ThemeProperties::COLOR_TAB_TEXT:
+    case ThemeProperties::COLOR_TAB_FOREGROUND_ACTIVE_FRAME_ACTIVE:
     case ThemeProperties::COLOR_BOOKMARK_TEXT:
-    case ThemeProperties::COLOR_BACKGROUND_TAB_TEXT:
+    case ThemeProperties::COLOR_TAB_FOREGROUND_INACTIVE_FRAME_ACTIVE:
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON:
       return kLightToolbarIcon;
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE:
@@ -59,13 +59,13 @@ base::Optional<SkColor> MaybeGetDefaultColorForBraveDarkUi(int id) {
   switch (id) {
     // Applies when the window is active, tabs and also tab bar everywhere
     // except active tab
-    case ThemeProperties::COLOR_FRAME:
-    case ThemeProperties::COLOR_BACKGROUND_TAB:
+    case ThemeProperties::COLOR_FRAME_ACTIVE:
+    case ThemeProperties::COLOR_TAB_BACKGROUND_INACTIVE_FRAME_ACTIVE:
       return kDarkFrame;
     // Window when the window is innactive, tabs and also tab bar everywhere
     // except active tab
     case ThemeProperties::COLOR_FRAME_INACTIVE:
-    case ThemeProperties::COLOR_BACKGROUND_TAB_INACTIVE:
+    case ThemeProperties::COLOR_TAB_BACKGROUND_INACTIVE_FRAME_INACTIVE:
       return color_utils::HSLShift(kDarkFrame, { -1, -1, 0.6 });
     // Active tab and also the URL toolbar
     // Parts of this color show up as you hover over innactive tabs too
@@ -74,10 +74,10 @@ base::Optional<SkColor> MaybeGetDefaultColorForBraveDarkUi(int id) {
     case ThemeProperties::COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE:
     case ThemeProperties::COLOR_TOOLBAR_CONTENT_AREA_SEPARATOR:
       return kDarkToolbar;
-    case ThemeProperties::COLOR_TAB_TEXT:
+    case ThemeProperties::COLOR_TAB_FOREGROUND_ACTIVE_FRAME_ACTIVE:
       return SkColorSetRGB(0xF3, 0xF3, 0xF3);
     case ThemeProperties::COLOR_BOOKMARK_TEXT:
-    case ThemeProperties::COLOR_BACKGROUND_TAB_TEXT:
+    case ThemeProperties::COLOR_TAB_FOREGROUND_INACTIVE_FRAME_ACTIVE:
       return SkColorSetRGB(0xFF, 0xFF, 0xFF);
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON:
       return kDarkToolbarIcon;
@@ -101,26 +101,27 @@ base::Optional<SkColor> MaybeGetDefaultColorForPrivateUi(int id) {
   switch (id) {
     // Applies when the window is active, tabs and also tab bar everywhere
     // except active tab
-    case ThemeProperties::COLOR_FRAME:
-    case ThemeProperties::COLOR_FRAME_INCOGNITO:
-    case ThemeProperties::COLOR_BACKGROUND_TAB:
-    case ThemeProperties::COLOR_BACKGROUND_TAB_INCOGNITO:
+    case ThemeProperties::COLOR_FRAME_ACTIVE:
+    case ThemeProperties::COLOR_FRAME_ACTIVE_INCOGNITO:
+    case ThemeProperties::COLOR_TAB_BACKGROUND_INACTIVE_FRAME_ACTIVE:
+    case ThemeProperties::COLOR_TAB_BACKGROUND_INACTIVE_FRAME_ACTIVE_INCOGNITO:
       return kPrivateFrame;
     // Window when the window is innactive, tabs and also tab bar everywhere
     // except active tab
     case ThemeProperties::COLOR_FRAME_INACTIVE:
-    case ThemeProperties::COLOR_FRAME_INCOGNITO_INACTIVE:
-    case ThemeProperties::COLOR_BACKGROUND_TAB_INCOGNITO_INACTIVE:
+    case ThemeProperties::COLOR_FRAME_INACTIVE_INCOGNITO:
+    case ThemeProperties::
+        COLOR_TAB_BACKGROUND_INACTIVE_FRAME_INACTIVE_INCOGNITO:
       return color_utils::HSLShift(kPrivateFrame, { -1, -1, 0.55 });
     // Active tab and also the URL toolbar
     // Parts of this color show up as you hover over innactive tabs too
     case ThemeProperties::COLOR_TOOLBAR:
     case ThemeProperties::COLOR_TOOLBAR_CONTENT_AREA_SEPARATOR:
       return kPrivateToolbar;
-    case ThemeProperties::COLOR_TAB_TEXT:
+    case ThemeProperties::COLOR_TAB_FOREGROUND_ACTIVE_FRAME_ACTIVE:
       return SkColorSetRGB(0xF3, 0xF3, 0xF3);
     case ThemeProperties::COLOR_BOOKMARK_TEXT:
-    case ThemeProperties::COLOR_BACKGROUND_TAB_TEXT:
+    case ThemeProperties::COLOR_TAB_FOREGROUND_INACTIVE_FRAME_ACTIVE:
       return SkColorSetRGB(0xFF, 0xFF, 0xFF);
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON:
       return kDarkToolbarIcon;

From 9ee24fe4d7d3c631d2d6969d5a73706cd9cecdb1 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 10 Apr 2020 18:05:56 -0400
Subject: [PATCH 060/161] content_settings: add force allow origins.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/5a7ac1444c5b0a691aa480374c6e390f3fda9741

commit 5a7ac1444c5b0a691aa480374c6e390f3fda9741
Author: Jiewei Qian <qjw@chromium.org>
Date:   Thu Feb 27 07:04:28 2020 +0000

    content_settings: add force allow origins

    This CL adds support to allow individual origins in content settings.

    Also force allow chrome-untrusted://terminal origin to Clipboard API.

    Bug: 1035255
---
 .../core/browser/content_settings_registry.cc | 190 +++++++++---------
 1 file changed, 95 insertions(+), 95 deletions(-)

diff --git a/chromium_src/components/content_settings/core/browser/content_settings_registry.cc b/chromium_src/components/content_settings/core/browser/content_settings_registry.cc
index 3e191fbd785e..a8720b092ba1 100644
--- a/chromium_src/components/content_settings/core/browser/content_settings_registry.cc
+++ b/chromium_src/components/content_settings/core/browser/content_settings_registry.cc
@@ -3,101 +3,101 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#define BRAVE_INIT { \
-  /* Add CONTENT_SETTING_ASK for autoplay*/ \
-  content_settings_info_.erase(ContentSettingsType::AUTOPLAY); \
-  website_settings_registry_->UnRegister(ContentSettingsType::AUTOPLAY); \
-  Register(ContentSettingsType::AUTOPLAY, "autoplay", CONTENT_SETTING_ALLOW, \
-           WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(), \
-           ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, \
-                         CONTENT_SETTING_ASK), \
-           WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE, \
-           WebsiteSettingsRegistry::DESKTOP | \
-               WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-           ContentSettingsInfo::INHERIT_IN_INCOGNITO, \
-           ContentSettingsInfo::PERSISTENT, \
-           ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); \
-  \
-  /* Change plugins default to CONTENT_SETTING_BLOCK*/ \
-  content_settings_info_.erase(ContentSettingsType::PLUGINS); \
-  website_settings_registry_->UnRegister(ContentSettingsType::PLUGINS); \
-  Register( \
-      ContentSettingsType::PLUGINS, "plugins", \
-      CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE, \
-      WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), \
-      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, \
-                    CONTENT_SETTING_ASK, \
-                    CONTENT_SETTING_DETECT_IMPORTANT_CONTENT), \
-      WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE, \
-      WebsiteSettingsRegistry::DESKTOP | \
-          WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IN_INCOGNITO, \
-      ContentSettingsInfo::EPHEMERAL, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); \
-  \
-  /* Disable background sync by default (brave/brave-browser#4709)*/ \
-  content_settings_info_.erase(ContentSettingsType::BACKGROUND_SYNC); \
-  website_settings_registry_->UnRegister( \
-      ContentSettingsType::BACKGROUND_SYNC); \
-  Register( \
-      ContentSettingsType::BACKGROUND_SYNC, "background-sync", \
-      CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE, \
-      WhitelistedSchemes(), \
-      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), \
-      WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE, \
-      WebsiteSettingsRegistry::DESKTOP | \
-          WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IN_INCOGNITO, \
-      ContentSettingsInfo::PERSISTENT, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); \
-  \
-  /* Disable motion sensors by default (brave/brave-browser#4789)*/ \
-  content_settings_info_.erase(ContentSettingsType::SENSORS); \
-  website_settings_registry_->UnRegister(ContentSettingsType::SENSORS); \
-  Register( \
-      ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_BLOCK, \
-      WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(), \
-      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), \
-      WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE, \
-      WebsiteSettingsRegistry::DESKTOP | \
-          WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IN_INCOGNITO, \
-      ContentSettingsInfo::PERSISTENT, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); \
-  /* We need 62, 63, 64 for ContentSettingsTypes for Android tabs migration*/ \
-  /* We read only from these settings*/ \
-  Register( \
-      static_cast<ContentSettingsType>(62), "desktop-view", \
-      CONTENT_SETTING_BLOCK,  \
-      WebsiteSettingsInfo::UNSYNCABLE, \
-      WhitelistedSchemes(), \
-      ValidSettings(CONTENT_SETTING_BLOCK, CONTENT_SETTING_ALLOW), \
-      WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, \
-      WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE, \
-      ContentSettingsInfo::PERSISTENT, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); \
-  Register( \
-      static_cast<ContentSettingsType>(63), "play-video-in-background", \
-      CONTENT_SETTING_BLOCK, \
-      WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(), \
-      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), \
-      WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE, \
-      WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE, \
-      ContentSettingsInfo::PERSISTENT, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); \
-  Register( \
-      static_cast<ContentSettingsType>(64), "play-yt-video-in-browser", \
-      CONTENT_SETTING_ALLOW, \
-      WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(), \
-      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), \
-      WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE, \
-      WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE, \
-      ContentSettingsInfo::PERSISTENT, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); \
-}
+#define BRAVE_INIT                                                             \
+  {                                                                            \
+    /* Add CONTENT_SETTING_ASK for autoplay*/                                  \
+    content_settings_info_.erase(ContentSettingsType::AUTOPLAY);               \
+    website_settings_registry_->UnRegister(ContentSettingsType::AUTOPLAY);     \
+    Register(ContentSettingsType::AUTOPLAY, "autoplay", CONTENT_SETTING_ALLOW, \
+             WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(),            \
+             ForceAllowedOrigins(),                                            \
+             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,       \
+                           CONTENT_SETTING_ASK),                               \
+             WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,                    \
+             WebsiteSettingsRegistry::DESKTOP |                                \
+                 WebsiteSettingsRegistry::PLATFORM_ANDROID,                    \
+             ContentSettingsInfo::INHERIT_IN_INCOGNITO,                        \
+             ContentSettingsInfo::PERSISTENT,                                  \
+             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);  \
+                                                                               \
+    /* Change plugins default to CONTENT_SETTING_BLOCK*/                       \
+    content_settings_info_.erase(ContentSettingsType::PLUGINS);                \
+    website_settings_registry_->UnRegister(ContentSettingsType::PLUGINS);      \
+    Register(                                                                  \
+        ContentSettingsType::PLUGINS, "plugins", CONTENT_SETTING_BLOCK,        \
+        WebsiteSettingsInfo::SYNCABLE,                                         \
+        WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),            \
+        ForceAllowedOrigins(),                                                 \
+        ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,            \
+                      CONTENT_SETTING_ASK,                                     \
+                      CONTENT_SETTING_DETECT_IMPORTANT_CONTENT),               \
+        WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE,     \
+        WebsiteSettingsRegistry::DESKTOP |                                     \
+            WebsiteSettingsRegistry::PLATFORM_ANDROID,                         \
+        ContentSettingsInfo::INHERIT_IN_INCOGNITO,                             \
+        ContentSettingsInfo::EPHEMERAL,                                        \
+        ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);       \
+                                                                               \
+    /* Disable background sync by default (brave/brave-browser#4709)*/         \
+    content_settings_info_.erase(ContentSettingsType::BACKGROUND_SYNC);        \
+    website_settings_registry_->UnRegister(                                    \
+        ContentSettingsType::BACKGROUND_SYNC);                                 \
+    Register(ContentSettingsType::BACKGROUND_SYNC, "background-sync",          \
+             CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE,           \
+             WhitelistedSchemes(), ForceAllowedOrigins(),                      \
+             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),      \
+             WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,                    \
+             WebsiteSettingsRegistry::DESKTOP |                                \
+                 WebsiteSettingsRegistry::PLATFORM_ANDROID,                    \
+             ContentSettingsInfo::INHERIT_IN_INCOGNITO,                        \
+             ContentSettingsInfo::PERSISTENT,                                  \
+             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);          \
+                                                                               \
+    /* Disable motion sensors by default (brave/brave-browser#4789)*/          \
+    content_settings_info_.erase(ContentSettingsType::SENSORS);                \
+    website_settings_registry_->UnRegister(ContentSettingsType::SENSORS);      \
+    Register(ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_BLOCK,   \
+             WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(),            \
+             ForceAllowedOrigins(),                                            \
+             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),      \
+             WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,                    \
+             WebsiteSettingsRegistry::DESKTOP |                                \
+                 WebsiteSettingsRegistry::PLATFORM_ANDROID,                    \
+             ContentSettingsInfo::INHERIT_IN_INCOGNITO,                        \
+             ContentSettingsInfo::PERSISTENT,                                  \
+             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);  \
+    /* We need 62, 63, 64 for ContentSettingsTypes for Android tabs            \
+     * migration*/                                                             \
+    /* We read only from these settings*/                                      \
+    Register(                                                                  \
+        static_cast<ContentSettingsType>(62), "desktop-view",                  \
+        CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE,                \
+        WhitelistedSchemes(), ForceAllowedOrigins(),                           \
+        ValidSettings(CONTENT_SETTING_BLOCK, CONTENT_SETTING_ALLOW),           \
+        WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,     \
+        WebsiteSettingsRegistry::PLATFORM_ANDROID,                             \
+        ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,                       \
+        ContentSettingsInfo::PERSISTENT,                                       \
+        ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);               \
+    Register(static_cast<ContentSettingsType>(63), "play-video-in-background", \
+             CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE,           \
+             WhitelistedSchemes(), ForceAllowedOrigins(),                      \
+             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),      \
+             WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,                    \
+             WebsiteSettingsRegistry::PLATFORM_ANDROID,                        \
+             ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,                  \
+             ContentSettingsInfo::PERSISTENT,                                  \
+             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);          \
+    Register(static_cast<ContentSettingsType>(64), "play-yt-video-in-browser", \
+             CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE,           \
+             WhitelistedSchemes(), ForceAllowedOrigins(),                      \
+             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),      \
+             WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,                    \
+             WebsiteSettingsRegistry::PLATFORM_ANDROID,                        \
+             ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,                  \
+             ContentSettingsInfo::PERSISTENT,                                  \
+             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);          \
+  }
 
 #include "../../../../../../components/content_settings/core/browser/content_settings_registry.cc"
 

From eddcb263618f8bef7d91bbe325554afd54f43399 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 13 Apr 2020 13:32:28 -0400
Subject: [PATCH 061/161] PermissionRequestManager moved to //components.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/5ca4ae16c0c1fe5e53de615ea680ff5779ab2dc4

commit 5ca4ae16c0c1fe5e53de615ea680ff5779ab2dc4
Author: Clark DuVall <cduvall@chromium.org>
Date:   Wed Feb 19 22:25:27 2020 +0000

    Move PermissionRequestManager to //components/permissions

    This required moving a few other classes:
    - NotificationPermissionUiSelector
    - PermissionPrompt
    - MockPermission*

    The GetDisplayNameOrOrigin() method which used to be part of
    PermissionPrompt::Delegate was moved to PermissionPromptBubbleView
    since that is the only place it's used.

    A set of unit tests was left in chrome which tests chrome-specific
    behavior of the PermissionRequestManager. The rest of the tests were
    moved into the component.

    Bug: 1025609
---
 ...autoplay_permission_context_browsertest.cc | 55 ++++++++++---------
 .../autoplay_permission_context_unittest.cc   |  4 +-
 ...widevine_permission_request_browsertest.cc | 20 ++++---
 browser/widevine/widevine_utils.cc            |  6 +-
 ...ettings_agent_impl_autoplay_browsertest.cc |  6 +-
 ...t_settings_agent_impl_flash_browsertest.cc |  4 +-
 6 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/browser/autoplay/autoplay_permission_context_browsertest.cc b/browser/autoplay/autoplay_permission_context_browsertest.cc
index 7ff7a7ded949..e0d2f5a8d62a 100644
--- a/browser/autoplay/autoplay_permission_context_browsertest.cc
+++ b/browser/autoplay/autoplay_permission_context_browsertest.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -24,6 +23,7 @@
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/permissions/permission_request.h"
+#include "components/permissions/test/mock_permission_prompt_factory.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/test/browser_test_utils.h"
@@ -146,8 +146,8 @@ class AutoplayPermissionContextBrowserTest : public InProcessBrowserTest {
 IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest,
                        DISABLED_BlockByDefault) {
   std::string result;
-  PermissionRequestManager* manager =
-      PermissionRequestManager::FromWebContents(contents());
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(contents());
 
   NavigateToURLUntilLoadStop(autoplay_method_url());
   EXPECT_FALSE(manager->IsRequestInProgress());
@@ -186,8 +186,8 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest,
                        DISABLED_AskAutoplay) {
   std::string result;
   AskAutoplay();
-  PermissionRequestManager* manager =
-      PermissionRequestManager::FromWebContents(contents());
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(contents());
 
   NavigateToURLUntilLoadStop(autoplay_method_url());
   EXPECT_TRUE(manager->IsRequestInProgress());
@@ -225,13 +225,14 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest,
 IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, ClickAllow) {
   std::string result;
   AskAutoplay();
-  PermissionRequestManager* manager =
-      PermissionRequestManager::FromWebContents(contents());
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(contents());
   auto popup_prompt_factory =
-      std::make_unique<MockPermissionPromptFactory>(manager);
+      std::make_unique<permissions::MockPermissionPromptFactory>(manager);
 
   EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount());
-  popup_prompt_factory->set_response_type(PermissionRequestManager::ACCEPT_ALL);
+  popup_prompt_factory->set_response_type(
+      permissions::PermissionRequestManager::ACCEPT_ALL);
 
   NavigateToURLUntilLoadStop(autoplay_method_url());
   EXPECT_TRUE(popup_prompt_factory->RequestTypeSeen(
@@ -262,13 +263,14 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, ClickAllow) {
 IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, ClickAllowMuted) {
   std::string result;
   AskAutoplay();
-  PermissionRequestManager* manager =
-      PermissionRequestManager::FromWebContents(contents());
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(contents());
   auto popup_prompt_factory =
-      std::make_unique<MockPermissionPromptFactory>(manager);
+      std::make_unique<permissions::MockPermissionPromptFactory>(manager);
 
   EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount());
-  popup_prompt_factory->set_response_type(PermissionRequestManager::ACCEPT_ALL);
+  popup_prompt_factory->set_response_type(
+      permissions::PermissionRequestManager::ACCEPT_ALL);
 
   NavigateToURLUntilLoadStop(autoplay_method_muted_url());
   EXPECT_TRUE(popup_prompt_factory->RequestTypeSeen(
@@ -300,13 +302,14 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest,
                        DISABLED_ClickBlock) {
   std::string result;
   AskAutoplay();
-  PermissionRequestManager* manager =
-      PermissionRequestManager::FromWebContents(contents());
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(contents());
   auto popup_prompt_factory =
-      std::make_unique<MockPermissionPromptFactory>(manager);
+      std::make_unique<permissions::MockPermissionPromptFactory>(manager);
 
   EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount());
-  popup_prompt_factory->set_response_type(PermissionRequestManager::DENY_ALL);
+  popup_prompt_factory->set_response_type(
+      permissions::PermissionRequestManager::DENY_ALL);
 
   NavigateToURLUntilLoadStop(autoplay_method_url());
   EXPECT_TRUE(popup_prompt_factory->RequestTypeSeen(
@@ -364,10 +367,10 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest,
 IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, AllowAutoplay) {
   std::string result;
   AllowAutoplay();
-  PermissionRequestManager* manager =
-      PermissionRequestManager::FromWebContents(contents());
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(contents());
   auto popup_prompt_factory =
-      std::make_unique<MockPermissionPromptFactory>(manager);
+      std::make_unique<permissions::MockPermissionPromptFactory>(manager);
 
   EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount());
 
@@ -426,10 +429,10 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest,
                        DISABLED_BlockAutoplay) {
   std::string result;
   BlockAutoplay();
-  PermissionRequestManager* manager =
-      PermissionRequestManager::FromWebContents(contents());
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(contents());
   auto popup_prompt_factory =
-      std::make_unique<MockPermissionPromptFactory>(manager);
+      std::make_unique<permissions::MockPermissionPromptFactory>(manager);
 
   EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount());
 
@@ -482,10 +485,10 @@ IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest,
 // Default allow autoplay on file urls
 IN_PROC_BROWSER_TEST_F(AutoplayPermissionContextBrowserTest, FileAutoplay) {
   std::string result;
-  PermissionRequestManager* manager =
-      PermissionRequestManager::FromWebContents(contents());
+  permissions::PermissionRequestManager* manager =
+      permissions::PermissionRequestManager::FromWebContents(contents());
   auto popup_prompt_factory =
-      std::make_unique<MockPermissionPromptFactory>(manager);
+      std::make_unique<permissions::MockPermissionPromptFactory>(manager);
 
   EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount());
 
diff --git a/browser/autoplay/autoplay_permission_context_unittest.cc b/browser/autoplay/autoplay_permission_context_unittest.cc
index 28911eebccbf..98e924ab1e6a 100644
--- a/browser/autoplay/autoplay_permission_context_unittest.cc
+++ b/browser/autoplay/autoplay_permission_context_unittest.cc
@@ -12,13 +12,13 @@
 #include "base/bind.h"
 #include "base/macros.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
-#include "chrome/browser/permissions/permission_request_manager.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/permissions/permission_request_id.h"
+#include "components/permissions/permission_request_manager.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
@@ -69,7 +69,7 @@ class AutoplayPermissionContextTests
   // content::RenderViewHostTestHarness:
   void SetUp() override {
     content::RenderViewHostTestHarness::SetUp();
-    PermissionRequestManager::CreateForWebContents(web_contents());
+    permissions::PermissionRequestManager::CreateForWebContents(web_contents());
   }
 
   std::unique_ptr<content::BrowserContext> CreateBrowserContext() override {
diff --git a/browser/widevine/widevine_permission_request_browsertest.cc b/browser/widevine/widevine_permission_request_browsertest.cc
index 9d897a91315c..82aa33ffa33a 100644
--- a/browser/widevine/widevine_permission_request_browsertest.cc
+++ b/browser/widevine/widevine_permission_request_browsertest.cc
@@ -10,7 +10,6 @@
 #include "brave/browser/widevine/widevine_utils.h"
 #include "brave/common/brave_paths.h"
 #include "brave/common/pref_names.h"
-#include "chrome/browser/permissions/permission_request_manager.h"
 #include "chrome/browser/ssl/cert_verifier_browser_test.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -19,6 +18,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/permissions/permission_request_manager_test_api.h"
+#include "components/permissions/permission_request_manager.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
@@ -38,7 +38,7 @@
 #endif
 
 namespace {
-class TestObserver : public PermissionRequestManager::Observer {
+class TestObserver : public permissions::PermissionRequestManager::Observer {
  public:
   void OnBubbleAdded() override {
     added_count_++;
@@ -69,8 +69,9 @@ class WidevinePermissionRequestBrowserTest
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
-  PermissionRequestManager* GetPermissionRequestManager() {
-    return PermissionRequestManager::FromWebContents(GetActiveWebContents());
+  permissions::PermissionRequestManager* GetPermissionRequestManager() {
+    return permissions::PermissionRequestManager::FromWebContents(
+        GetActiveWebContents());
   }
 
   BraveDrmTabHelper* GetBraveDrmTabHelper() {
@@ -83,7 +84,7 @@ class WidevinePermissionRequestBrowserTest
 
 IN_PROC_BROWSER_TEST_F(WidevinePermissionRequestBrowserTest, VisibilityTest) {
   GetPermissionRequestManager()->set_auto_response_for_test(
-      PermissionRequestManager::DISMISS);
+      permissions::PermissionRequestManager::DISMISS);
   auto* drm_tab_helper = GetBraveDrmTabHelper();
 
   // Check permission bubble is visible.
@@ -157,7 +158,7 @@ IN_PROC_BROWSER_TEST_F(WidevinePermissionRequestBrowserTest,
   EXPECT_FALSE(IsWidevineOptedIn());
 
   GetPermissionRequestManager()->set_auto_response_for_test(
-      PermissionRequestManager::ACCEPT_ALL);
+      permissions::PermissionRequestManager::ACCEPT_ALL);
   auto* drm_tab_helper = GetBraveDrmTabHelper();
   drm_tab_helper->OnWidevineKeySystemAccessRequest();
   content::RunAllTasksUntilIdle();
@@ -188,7 +189,7 @@ IN_PROC_BROWSER_TEST_F(WidevinePermissionRequestBrowserTest,
   auto* permission_request_manager = GetPermissionRequestManager();
   permission_request_manager->AddObserver(&observer);
   permission_request_manager->set_auto_response_for_test(
-      PermissionRequestManager::ACCEPT_ALL);
+      permissions::PermissionRequestManager::ACCEPT_ALL);
 
   GetBraveDrmTabHelper()->OnWidevineKeySystemAccessRequest();
   content::RunAllTasksUntilIdle();
@@ -235,8 +236,9 @@ class ScriptTriggerWidevinePermissionRequestBrowserTest
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
-  PermissionRequestManager* GetPermissionRequestManager() {
-    return PermissionRequestManager::FromWebContents(active_contents());
+  permissions::PermissionRequestManager* GetPermissionRequestManager() {
+    return permissions::PermissionRequestManager::FromWebContents(
+        active_contents());
   }
 
   bool IsPermissionBubbleShown() {
diff --git a/browser/widevine/widevine_utils.cc b/browser/widevine/widevine_utils.cc
index c16c64516d78..73e745807254 100644
--- a/browser/widevine/widevine_utils.cc
+++ b/browser/widevine/widevine_utils.cc
@@ -9,8 +9,8 @@
 #include "brave/browser/widevine/widevine_permission_request.h"
 #include "brave/common/pref_names.h"
 #include "brave/grit/brave_generated_resources.h"
-#include "chrome/browser/permissions/permission_request_manager.h"
 #include "chrome/browser/profiles/profile.h"
+#include "components/permissions/permission_request_manager.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/pref_registry/pref_registry_syncable.h"
@@ -137,8 +137,8 @@ int GetWidevinePermissionRequestTextFrangmentResourceId() {
 }
 
 void RequestWidevinePermission(content::WebContents* web_contents) {
-  PermissionRequestManager::FromWebContents(web_contents)->AddRequest(
-      new WidevinePermissionRequest(web_contents));
+  permissions::PermissionRequestManager::FromWebContents(web_contents)
+      ->AddRequest(new WidevinePermissionRequest(web_contents));
 }
 void DontAskWidevineInstall(content::WebContents* web_contents, bool dont_ask) {
   Profile* profile = static_cast<Profile*>(web_contents->GetBrowserContext());
diff --git a/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc b/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
index 3f1de7c2aa46..0d06f0fec746 100644
--- a/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
+++ b/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -20,6 +19,7 @@
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/permissions/permission_request.h"
+#include "components/permissions/test/mock_permission_prompt_factory.h"
 #include "net/dns/mock_host_resolver.h"
 
 const char kVideoPlaying[] = "Video playing";
@@ -109,7 +109,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplAutoplayTest,
   permissions::PermissionRequestManager* manager =
       permissions::PermissionRequestManager::FromWebContents(contents());
   auto popup_prompt_factory =
-      std::make_unique<MockPermissionPromptFactory>(manager);
+      std::make_unique<permissions::MockPermissionPromptFactory>(manager);
 
   EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount());
 
@@ -133,7 +133,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplAutoplayTest,
   permissions::PermissionRequestManager* manager =
       permissions::PermissionRequestManager::FromWebContents(contents());
   auto popup_prompt_factory =
-      std::make_unique<MockPermissionPromptFactory>(manager);
+      std::make_unique<permissions::MockPermissionPromptFactory>(manager);
 
   EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount());
 
diff --git a/renderer/brave_content_settings_agent_impl_flash_browsertest.cc b/renderer/brave_content_settings_agent_impl_flash_browsertest.cc
index 62be205a743d..0c6fa055b411 100644
--- a/renderer/brave_content_settings_agent_impl_flash_browsertest.cc
+++ b/renderer/brave_content_settings_agent_impl_flash_browsertest.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -21,6 +20,7 @@
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
+#include "components/permissions/test/mock_permission_prompt_factory.h"
 #include "net/dns/mock_host_resolver.h"
 
 const char kFlashPluginExists[] =
@@ -158,7 +158,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplFlashBrowserTest,
       permissions::PermissionRequestManager::FromWebContents(contents());
 
   auto popup_prompt_factory =
-      std::make_unique<MockPermissionPromptFactory>(manager);
+      std::make_unique<permissions::MockPermissionPromptFactory>(manager);
 
   EXPECT_EQ(0, popup_prompt_factory->TotalRequestCount());
   popup_prompt_factory->set_response_type(

From 30d91226c77cb237cdf6bd521289fb86a2adfa27 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 13 Apr 2020 14:28:49 -0400
Subject: [PATCH 062/161] InteractiveTiming.interactive was removed from page
 load metrics.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Chromium change:

https://chromium.googlesource.com/chromium/src/+/aa4f7b3f23460707dea0d73ca9dbbd5d9aff8c8a

commit aa4f7b3f23460707dea0d73ca9dbbd5d9aff8c8a
Author: Nicolás Peña Moreno <npm@chromium.org>
Date:   Thu Feb 27 18:34:26 2020 +0000

    Remove Time To Interactive plumbing to the browser process

    TTI should not be used as a RUM metric. This CL removes the plumbing of
    TTI and related values from the renderer to the browser process. It also
    removes the UMA and UKM histograms that were using it.

    Bug: 1055806
---
 .../browser/bandwidth_savings_predictor.cc                  | 5 -----
 .../browser/bandwidth_savings_predictor_unittest.cc         | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc b/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc
index e04af7db130c..2a0246274bff 100644
--- a/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc
+++ b/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc
@@ -43,11 +43,6 @@ void BandwidthSavingsPredictor::OnPageLoadTimingUpdated(
   if (timing.document_timing->load_event_start.has_value())
     feature_map_["metrics.observedLoad"] =
         timing.document_timing->load_event_start.value().InMillisecondsF();
-
-  // Interactive
-  if (timing.interactive_timing->interactive.has_value())
-    feature_map_["metrics.interactive"] =
-        timing.interactive_timing->interactive.value().InMillisecondsF();
 }
 
 void BandwidthSavingsPredictor::OnSubresourceBlocked(
diff --git a/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc b/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
index f8bb88528549..121a0e666596 100644
--- a/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
+++ b/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
@@ -53,7 +53,6 @@ TEST_F(BandwidthSavingsPredictorTest, FeaturiseTiming) {
   EXPECT_EQ(predictor_->feature_map_["metrics.observedDomContentLoaded"], 0);
   EXPECT_EQ(predictor_->feature_map_["metrics.observedFirstVisualChange"], 0);
   EXPECT_EQ(predictor_->feature_map_["metrics.observedLoad"], 0);
-  EXPECT_EQ(predictor_->feature_map_["metrics.interactive"], 0);
 
   auto timing = page_load_metrics::CreatePageLoadTiming();
   timing->document_timing->dom_content_loaded_event_start =
@@ -75,11 +74,6 @@ TEST_F(BandwidthSavingsPredictorTest, FeaturiseTiming) {
       base::TimeDelta::FromMilliseconds(800);
   predictor_->OnPageLoadTimingUpdated(*timing);
   EXPECT_EQ(predictor_->feature_map_["metrics.observedFirstVisualChange"], 800);
-
-  timing->interactive_timing->interactive =
-      base::TimeDelta::FromMilliseconds(2500);
-  predictor_->OnPageLoadTimingUpdated(*timing);
-  EXPECT_EQ(predictor_->feature_map_["metrics.interactive"], 2500);
 }
 
 TEST_F(BandwidthSavingsPredictorTest, FeaturiseResourceLoading) {

From 7d28c8f9baa585ce3f214e3038885fb6da0a4390 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 13 Apr 2020 15:13:53 -0400
Subject: [PATCH 063/161] ResourceType in ResourceLoadInfo has been deprecated.

Switched to using ResourceLoadInfo.request_destination.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/433f710a959de22379e68221e250bab51be2ca68

commit 433f710a959de22379e68221e250bab51be2ca68
Author: Kinuko Yasuda <kinuko@chromium.org>
Date:   Fri Feb 14 02:11:58 2020 +0000

    Deprecate ResourceType in ResourceLoadInfo and ExtraRequestCompleteInfo

    - blink::mojom::ResourceType is deprecated, see crbug.com/960143
    - Use network::mojom::RequestDestination instead when possible
    - For "resource_type == kMainFrame" checks I replaced this with
      "request_type == kDocument" (this should mean a main-frame main
      resource in most cases except for Portals cases)

    Request destination:
    https://fetch.spec.whatwg.org/#concept-request-destination

    A PR to introduce "frame", "iframe" etc:
    https://github.com/whatwg/fetch/pull/948

    Bug: 960143
---
 browser/brave_rewards/rewards_tab_helper.cc   | 23 +++++++++++++------
 .../browser/bandwidth_savings_predictor.cc    | 18 ++++++++-------
 .../bandwidth_savings_predictor_unittest.cc   | 19 +++++++++------
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/browser/brave_rewards/rewards_tab_helper.cc b/browser/brave_rewards/rewards_tab_helper.cc
index 1d345748e43c..52d3fbfb6496 100644
--- a/browser/brave_rewards/rewards_tab_helper.cc
+++ b/browser/brave_rewards/rewards_tab_helper.cc
@@ -76,13 +76,22 @@ void RewardsTabHelper::ResourceLoadComplete(
     return;
 
   // TODO(nejczdovc): do we need to get anyother type then XHR??
-  if (resource_load_info.resource_type == ResourceType::kMedia ||
-      resource_load_info.resource_type == ResourceType::kXhr ||
-      resource_load_info.resource_type == ResourceType::kImage ||
-      resource_load_info.resource_type == ResourceType::kScript) {
-    rewards_service_->OnXHRLoad(tab_id_, GURL(resource_load_info.final_url),
-                                web_contents()->GetURL(),
-                                resource_load_info.referrer);
+  switch (resource_load_info.request_destination) {
+    // Formerly ResourceType::kMedia
+    case network::mojom::RequestDestination::kAudio:
+    case network::mojom::RequestDestination::kTrack:
+    case network::mojom::RequestDestination::kVideo:
+    // Best match for ResourceType::kXhr (though, not limited to kXhr)
+    case network::mojom::RequestDestination::kEmpty:
+    // Formerly ResourceType::kImage
+    case network::mojom::RequestDestination::kImage:
+    case network::mojom::RequestDestination::kScript:
+      rewards_service_->OnXHRLoad(tab_id_, GURL(resource_load_info.final_url),
+                                  web_contents()->GetURL(),
+                                  resource_load_info.referrer);
+      break;
+    default:
+      break;
   }
 }
 
diff --git a/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc b/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc
index 2a0246274bff..8a08e7100c0f 100644
--- a/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc
+++ b/components/brave_perf_predictor/browser/bandwidth_savings_predictor.cc
@@ -83,26 +83,28 @@ void BandwidthSavingsPredictor::OnResourceLoadComplete(
   feature_map_["transfer.total.size"] +=
       resource_load_info.total_received_bytes;
   std::string resource_type;
-  switch (resource_load_info.resource_type) {
-    case blink::mojom::ResourceType::kMainFrame:
+  switch (resource_load_info.request_destination) {
+    case network::mojom::RequestDestination::kDocument:
       resource_type = "document";
       break;
-    case blink::mojom::ResourceType::kSubFrame:
+    case network::mojom::RequestDestination::kIframe:
       resource_type = "document";
       break;
-    case blink::mojom::ResourceType::kStylesheet:
+    case network::mojom::RequestDestination::kStyle:
       resource_type = "stylesheet";
       break;
-    case blink::mojom::ResourceType::kScript:
+    case network::mojom::RequestDestination::kScript:
       resource_type = "script";
       break;
-    case blink::mojom::ResourceType::kImage:
+    case network::mojom::RequestDestination::kImage:
       resource_type = "image";
       break;
-    case blink::mojom::ResourceType::kFontResource:
+    case network::mojom::RequestDestination::kFont:
       resource_type = "font";
       break;
-    case blink::mojom::ResourceType::kMedia:
+    case network::mojom::RequestDestination::kAudio:
+    case network::mojom::RequestDestination::kTrack:
+    case network::mojom::RequestDestination::kVideo:
       resource_type = "media";
       break;
     default:
diff --git a/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc b/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
index 121a0e666596..50c8b4d3c4de 100644
--- a/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
+++ b/components/brave_perf_predictor/browser/bandwidth_savings_predictor_unittest.cc
@@ -82,7 +82,8 @@ TEST_F(BandwidthSavingsPredictorTest, FeaturiseResourceLoading) {
   const GURL main_frame("https://brave.com/");
 
   auto fp_style = predictors::CreateResourceLoadInfo(
-      "https://brave.com/style.css", blink::mojom::ResourceType::kStylesheet);
+      "https://brave.com/style.css",
+      network::mojom::RequestDestination::kStyle);
   fp_style->raw_body_bytes = 1000;
   predictor_->OnResourceLoadComplete(main_frame, *fp_style);
   EXPECT_EQ(predictor_->feature_map_["resources.third-party.requestCount"], 0);
@@ -91,7 +92,7 @@ TEST_F(BandwidthSavingsPredictorTest, FeaturiseResourceLoading) {
 
   auto tp_style = predictors::CreateResourceLoadInfo(
       "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.js",
-      blink::mojom::ResourceType::kScript);
+      network::mojom::RequestDestination::kScript);
   tp_style->raw_body_bytes = 1001;
   predictor_->OnResourceLoadComplete(main_frame, *tp_style);
 
@@ -120,7 +121,8 @@ TEST_F(BandwidthSavingsPredictorTest, PredictZeroInternalUrl) {
 TEST_F(BandwidthSavingsPredictorTest, PredictZeroBadFrame) {
   const GURL main_frame("");
   auto res = predictors::CreateResourceLoadInfo(
-      "https://brave.com/style.css", blink::mojom::ResourceType::kStylesheet);
+      "https://brave.com/style.css",
+      network::mojom::RequestDestination::kStyle);
   res->raw_body_bytes = 1000;
   predictor_->OnResourceLoadComplete(main_frame, *res);
 
@@ -130,7 +132,8 @@ TEST_F(BandwidthSavingsPredictorTest, PredictZeroBadFrame) {
 TEST_F(BandwidthSavingsPredictorTest, PredictZeroNoBlocks) {
   const GURL main_frame("https://brave.com");
   auto res = predictors::CreateResourceLoadInfo(
-      "https://brave.com/style.css", blink::mojom::ResourceType::kStylesheet);
+      "https://brave.com/style.css",
+      network::mojom::RequestDestination::kStyle);
   res->raw_body_bytes = 1000;
   predictor_->OnResourceLoadComplete(main_frame, *res);
 
@@ -140,15 +143,17 @@ TEST_F(BandwidthSavingsPredictorTest, PredictZeroNoBlocks) {
 TEST_F(BandwidthSavingsPredictorTest, PredictNonZero) {
   const GURL main_frame("https://brave.com");
   auto res = predictors::CreateResourceLoadInfo(
-      "https://brave.com/style.css", blink::mojom::ResourceType::kStylesheet);
+      "https://brave.com/style.css",
+      network::mojom::RequestDestination::kStyle);
   res->raw_body_bytes = 200000;
   res->total_received_bytes = 200000;
   predictor_->OnResourceLoadComplete(main_frame, *res);
 
   predictor_->OnSubresourceBlocked("https://google-analytics.com/ga.js");
   // resource still seen as complete, but with 0 bytes
-  auto blocked = predictors::CreateResourceLoadInfo("https://google-analytics.com/ga.js",
-                                         blink::mojom::ResourceType::kScript);
+  auto blocked = predictors::CreateResourceLoadInfo(
+      "https://google-analytics.com/ga.js",
+      network::mojom::RequestDestination::kScript);
   blocked->raw_body_bytes = 0;
   predictor_->OnResourceLoadComplete(main_frame, *blocked);
 

From 78a8a51454cd0709b8d4963f7b84c2b7d76d15bf Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 13 Apr 2020 15:42:15 -0400
Subject: [PATCH 064/161] Patched HatsSurveyStatusChecker's use of
 CanonicalCookie::Create.

We added an extra parameter to CanonicalCookie::Create in the past.
This change updates newly added code with the extra param.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/dcf3e8ddbd1aaba4585859b713d00c9f8bc2c155

commit dcf3e8ddbd1aaba4585859b713d00c9f8bc2c155
Author: Wei Li <weili@chromium.org>
Date:   Tue Mar 10 04:43:38 2020 +0000

    [HaTS] Stop when the survey reaches its capacity

    Added a check for the survey's status. When the survey is not
    reachable or over its capacity, we won't show the HaTS bubble any more.
    Also, we will record the over capacity information so we won't need to
    check it again.

    BUG=1048385
---
 .../browser/ui/hats/hats_survey_status_checker.cc    |  9 +++++++++
 ...owser-ui-hats-hats_survey_status_checker.cc.patch | 12 ++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 chromium_src/chrome/browser/ui/hats/hats_survey_status_checker.cc
 create mode 100644 patches/chrome-browser-ui-hats-hats_survey_status_checker.cc.patch

diff --git a/chromium_src/chrome/browser/ui/hats/hats_survey_status_checker.cc b/chromium_src/chrome/browser/ui/hats/hats_survey_status_checker.cc
new file mode 100644
index 000000000000..c6dd997d3eb2
--- /dev/null
+++ b/chromium_src/chrome/browser/ui/hats/hats_survey_status_checker.cc
@@ -0,0 +1,9 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#define BRAVE_HATS_SURVEY_STATUS_CHECKER true /*is_from_http*/,
+
+#include "../../../../../../chrome/browser/ui/hats/hats_survey_status_checker.cc"
+#undef BRAVE_HATS_SURVEY_STATUS_CHECKER
diff --git a/patches/chrome-browser-ui-hats-hats_survey_status_checker.cc.patch b/patches/chrome-browser-ui-hats-hats_survey_status_checker.cc.patch
new file mode 100644
index 000000000000..28de4f241915
--- /dev/null
+++ b/patches/chrome-browser-ui-hats-hats_survey_status_checker.cc.patch
@@ -0,0 +1,12 @@
+diff --git a/chrome/browser/ui/hats/hats_survey_status_checker.cc b/chrome/browser/ui/hats/hats_survey_status_checker.cc
+index 328080d846c6df9400ee912489d98b973cf60940..9ff78c9c96254a7111738ba536f40ccb8e3b3e91 100644
+--- a/chrome/browser/ui/hats/hats_survey_status_checker.cc
++++ b/chrome/browser/ui/hats/hats_survey_status_checker.cc
+@@ -41,6 +41,7 @@ HatsSurveyStatusChecker::HatsSurveyStatusChecker(Profile* profile)
+   // To fetch the survey status directly, we need to set the cookie, but it is
+   // ok to use a non-conforming value.
+   auto survey_cookie = net::CanonicalCookie::Create(
++      BRAVE_HATS_SURVEY_STATUS_CHECKER
+       GURL("https://www.google.com"), "PAIDCONTENT=0", base::Time::Now(),
+       base::nullopt);
+   content::StoragePartition* partition =

From 33f1ba32d37fbb0161eb65e2d6c30dbc150334c4 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 13 Apr 2020 18:24:38 -0400
Subject: [PATCH 065/161] ExtensionPrefs::OnExtensionInstalled signature
 change.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/0a0e3c94ef825809e27ed8ec4a57c01d28c491f5

commit 0a0e3c94ef825809e27ed8ec4a57c01d28c491f5
Author: Karandeep Bhatia <karandeepb@chromium.org>
Date:   Fri Mar 20 11:25:41 2020 +0000

    DNR: Consolidate how ruleset checksums are stored in prefs.

    Currently the ruleset checksum for each extension using the
    declarativeNetRequest API is stored as an entry corresponding to the
    "dnr_ruleset_checksum" or "dnr_dynamic_ruleset_checksum" key. This CL
    replaces them with the "dnr_static_ruleset" and "dnr_dynamic_ruleset"
    keys respectively, corresponding to which we store a dictionary mapping
    ruleset IDs to their prefs. The prefs for each ruleset is a dictionary
    storing just the ruleset checksum for now.

    This CL helps move the code away from the assumption of a single static
    ruleset and will aid in the transition towards multiple static rulesets.

    A side effect of this change is that existing extensions using
    declarativeNetRequest will fail to load their rulesets with an install
    warning. Users will have to reinstall the extension. However that's ok
    given that the API is only in beta and has seen limited usage as of now.

    BUG=754526
---
 browser/extensions/brave_extension_service.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/extensions/brave_extension_service.cc b/browser/extensions/brave_extension_service.cc
index f919a4a410af..a23af646cf7d 100644
--- a/browser/extensions/brave_extension_service.cc
+++ b/browser/extensions/brave_extension_service.cc
@@ -62,7 +62,7 @@ void BraveExtensionService::AddComponentExtension(const Extension* extension) {
                                          syncer::StringOrdinal(),
                                          extensions::kInstallFlagNone,
                                          std::string(),
-                                         base::nullopt);
+                                         {} /* ruleset_checksums */);
   extensions::ContentSettingsService::Get(profile_)->OnExtensionPrefsLoaded(
       extension->id(), extension_prefs_);
 }

From 5aad85dfc571f91f4464b22d8e5cb2f4c72b3698 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 13 Apr 2020 18:33:00 -0400
Subject: [PATCH 066/161] Added a missing header include.

---
 browser/ui/webui/basic_ui.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/ui/webui/basic_ui.cc b/browser/ui/webui/basic_ui.cc
index 69343ac606cb..4aadca755c44 100644
--- a/browser/ui/webui/basic_ui.cc
+++ b/browser/ui/webui/basic_ui.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/bindings_policy.h"
 #include "ui/resources/grit/webui_resources_map.h"

From e487657f06af4c18757f9f4ac39ac44ba0905b26 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 13 Apr 2020 18:53:31 -0400
Subject: [PATCH 067/161] WebSocketHandshakeClient::OnConnectionEstablished
 signature change.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/307321d474256f41b12b53220e4dec1f2d6fdba8

commit 307321d474256f41b12b53220e4dec1f2d6fdba8
Author: Keita Suzuki <suzukikeita@google.com>
Date:   Thu Mar 19 01:30:30 2020 +0000

    [WebSocket] Add support to consume Datapipe in network service

    This commit adds support to network service to consume websocket frame
    data from mojo datapipe produced from blink. To achieve this, this
    commit adds a new message SendMessage() in mojo WebSocket interface.
    It also adds SimpleWatcher to watch the consumer and be notified when
    needed, and add callback function OnReadable() to support this.

    This commit also adds ReadAndSendFrameFromDataPipe() to actually
    consume data from the datapipe.

    The producer side of the datapipe and the caller of SendMessage() are
    not implemented yet for security review. WIP CLs are uploaded here:
    https://chromium-review.googlesource.com/c/chromium/src/+/2082869
    https://chromium-review.googlesource.com/c/chromium/src/+/2083777

    Design Doc:
    https://docs.google.com/document/d/1YWj1z9r8wxemGdod6S2tkchudhp6PvNaH3qSO0oucfY/

    Bug: 1056030
---
 browser/net/brave_proxying_web_socket.cc | 5 +++--
 browser/net/brave_proxying_web_socket.h  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/browser/net/brave_proxying_web_socket.cc b/browser/net/brave_proxying_web_socket.cc
index bb1c0958b437..dba8258953c2 100644
--- a/browser/net/brave_proxying_web_socket.cc
+++ b/browser/net/brave_proxying_web_socket.cc
@@ -183,13 +183,14 @@ void BraveProxyingWebSocket::OnConnectionEstablished(
     mojo::PendingRemote<network::mojom::WebSocket> websocket,
     mojo::PendingReceiver<network::mojom::WebSocketClient> client_receiver,
     network::mojom::WebSocketHandshakeResponsePtr response,
-    mojo::ScopedDataPipeConsumerHandle readable) {
+    mojo::ScopedDataPipeConsumerHandle readable,
+    mojo::ScopedDataPipeProducerHandle writable) {
   DCHECK(forwarding_handshake_client_);
   DCHECK(!is_done_);
   remote_endpoint_ = response->remote_endpoint;
   forwarding_handshake_client_->OnConnectionEstablished(
       std::move(websocket), std::move(client_receiver), std::move(response),
-      std::move(readable));
+      std::move(readable), std::move(writable));
 
   OnError(net::ERR_FAILED);
 }
diff --git a/browser/net/brave_proxying_web_socket.h b/browser/net/brave_proxying_web_socket.h
index 43b47677961e..564f05dd01e6 100644
--- a/browser/net/brave_proxying_web_socket.h
+++ b/browser/net/brave_proxying_web_socket.h
@@ -80,7 +80,8 @@ class BraveProxyingWebSocket : public network::mojom::WebSocketHandshakeClient,
       mojo::PendingRemote<network::mojom::WebSocket> websocket,
       mojo::PendingReceiver<network::mojom::WebSocketClient> client_receiver,
       network::mojom::WebSocketHandshakeResponsePtr response,
-      mojo::ScopedDataPipeConsumerHandle readable) override;
+      mojo::ScopedDataPipeConsumerHandle readable,
+      mojo::ScopedDataPipeProducerHandle writable) override;
 
   // network::mojom::AuthenticationHandler method:
   void OnAuthRequired(const net::AuthChallengeInfo& auth_info,

From cd6bd85956304276094173290802efe584243ebc Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 14 Apr 2020 16:49:18 -0400
Subject: [PATCH 068/161] AvatarToolbarButton::GetAvatarIcon signature changed.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/29015bf18a3fc97518d0613937f4703aa8cd4d82

commit 29015bf18a3fc97518d0613937f4703aa8cd4d82
Author: Nic Champagne Williamson <champnic@microsoft.com>
Date:   Sat Feb 8 02:09:35 2020 +0000

    Reland "Add Windows high contrast support to the toolbar button icons"

    This is a reland of 26a7b762471459c204a89360aa6653e887a84a78

    The fix for the button showing up as disabled when a new widget gets
    activation (from a bubble, for example) is to have the buttons use
    Widget::PaintAsActive() instead of Widget::IsActive() when calculating
    the visual state. As part of this fix, we also need the buttons to
    listen to when PaintAsActive changes, as opposed to when Activation
    changes. Old workarounds have been removed as part of this fix.

    Original change's description:
    > Add Windows high contrast support to the toolbar button icons
    >
    > This change adds different foreground icon colors to the toolbar buttons
    > for the hovered and pressed states when the high contrast ink drop
    > feature is enabled. This is to support the desired platform high contrast
    > colors. Future work will add foreground color support to other buttons.
    >
    > New theme properties were added to support the additional _HOVERED and
    > _PRESSED state high contrast colors. When not in high contrast, these
    > are the same as the normal icon color. In high contrast (+ flag) they
    > return the selected text HC color. These new colors are used to create
    > images in the toolbar buttons for the various button states.
    >
    > New helper functions we added to ToolbarButton to simplify setting the
    > images for the different button states, including one that just uses
    > the standard colors returned by |GetForegroundColor|.
    >
    > In the future, we might want to do work to allow icons to be separated
    > from colors to allow for easier recoloring.
    >
    > Bug: 776871
---
 browser/ui/views/profiles/brave_avatar_toolbar_button.cc | 8 ++++----
 browser/ui/views/profiles/brave_avatar_toolbar_button.h  | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/browser/ui/views/profiles/brave_avatar_toolbar_button.cc b/browser/ui/views/profiles/brave_avatar_toolbar_button.cc
index a28aa27c25c6..149f797d03ba 100644
--- a/browser/ui/views/profiles/brave_avatar_toolbar_button.cc
+++ b/browser/ui/views/profiles/brave_avatar_toolbar_button.cc
@@ -28,17 +28,17 @@ void BraveAvatarToolbarButton::SetHighlight(
 }
 
 gfx::ImageSkia BraveAvatarToolbarButton::GetAvatarIcon(
-    const gfx::Image& gaia_image) const {
+    ButtonState state,
+    const gfx::Image& gaia_account_image) const {
   if (brave::IsTorProfile(browser_->profile()) ||
       browser_->profile()->IsGuestSession()) {
     const int icon_size = ui::TouchUiController::Get()->touch_ui() ? 24 : 20;
-    const SkColor icon_color = GetThemeProvider()->GetColor(
-        ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
+    const SkColor icon_color = GetForegroundColor(state);
     return gfx::CreateVectorIcon(brave::IsTorProfile(browser_->profile())
                                      ? kTorProfileIcon
                                      : kUserMenuGuestIcon,
                                  icon_size, icon_color);
   }
-  return AvatarToolbarButton::GetAvatarIcon(gaia_image);
+  return AvatarToolbarButton::GetAvatarIcon(state, gaia_account_image);
 }
 
diff --git a/browser/ui/views/profiles/brave_avatar_toolbar_button.h b/browser/ui/views/profiles/brave_avatar_toolbar_button.h
index 5a4dd3ea55e1..fb048a09af4d 100644
--- a/browser/ui/views/profiles/brave_avatar_toolbar_button.h
+++ b/browser/ui/views/profiles/brave_avatar_toolbar_button.h
@@ -17,7 +17,9 @@ class BraveAvatarToolbarButton : public AvatarToolbarButton {
                     base::Optional<SkColor> highlight_color) override;
 
  private:
-  gfx::ImageSkia GetAvatarIcon(const gfx::Image& gaia_image) const override;
+  gfx::ImageSkia GetAvatarIcon(
+      ButtonState state,
+      const gfx::Image& profile_identity_image) const override;
   DISALLOW_COPY_AND_ASSIGN(BraveAvatarToolbarButton);
 };
 

From 86f8c6f4ce5fcb20511403367b70b74e0ae1905b Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 14 Apr 2020 17:05:51 -0400
Subject: [PATCH 069/161] NativeThemeDarkAura has been removed.

Chromium changes:

https://chromium.googlesource.com/chromium/src/+/6176b1d2cb6da6eac04ded7c013b5fcace9e19ca

commit 6176b1d2cb6da6eac04ded7c013b5fcace9e19ca
Author: John Smith <johnsm@microsoft.com>
Date:   Fri Mar 6 21:56:53 2020 +0000

    Replace NativeThemeDarkAura with platform native themes for incognito.

    NativeThemeDarkAura creates some complexity in other parts of the code
    where we need to be aware of high/increased contrast colors and changes.
    Removing it and replacing it with a version of the platform native
    theme would allow us to remove all of the logic where we call
    GetInstanceForNativeUi without losing any of the benefits that we get
    from it. This streamlines the code as we move towards the Color Pipeline.

    This adds an additional instance to the NativeThemes,
    GetInstanceForDarkUI, which is a version of the platform native theme
    that would be forced to use only dark mode. It also avoids setting up
    any links to the webinstances in order to not pollute their state.

    The IsForcedDarkMode behavior was not used or changed as that flag is
    meant to override any other behavior. We would still want to be able to
    apply high contrast where appropriate in incognito mode.

    Additionally, this fixes an issue where the
    IncreasedContrastThemeSupplier was not being removed correctly on
    native theme changes.

    See discussion in
    https://chromium-review.googlesource.com/c/chromium/src/+/2068882 for
    the additional context for this change.

    Bug: 1003612, 953978

https://chromium.googlesource.com/chromium/src/+/920433a0a4ea915610e5e7ac5755472196d58ec8

commit 920433a0a4ea915610e5e7ac5755472196d58ec8
Author: John Smith <johnsm@microsoft.com>
Date:   Wed Mar 18 18:15:52 2020 +0000

    Remove NativeThemeDarkAura files and clean up remaining refs

    After https://chromium-review.googlesource.com/c/chromium/src/+/2079840,
    the NativeThemeDarkAura was almost entirely replaced by a forced to dark
    version of the platform native theme. This change cleans up the
    remaining usages as well as removing the files and any straggling
    includes and build references.

    Bug: 1058945
---
 browser/themes/brave_theme_service_browsertest.cc | 1 -
 browser/ui/views/frame/brave_browser_frame.cc     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/browser/themes/brave_theme_service_browsertest.cc b/browser/themes/brave_theme_service_browsertest.cc
index 7a52818ff226..08b3bc943111 100644
--- a/browser/themes/brave_theme_service_browsertest.cc
+++ b/browser/themes/brave_theme_service_browsertest.cc
@@ -15,7 +15,6 @@
 #include "components/prefs/pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/native_theme/native_theme.h"
-#include "ui/native_theme/native_theme_dark_aura.h"
 #include "ui/native_theme/native_theme_observer.h"
 
 #if defined(OS_WIN)
diff --git a/browser/ui/views/frame/brave_browser_frame.cc b/browser/ui/views/frame/brave_browser_frame.cc
index 65ba894c796b..d24bc2ba16e3 100644
--- a/browser/ui/views/frame/brave_browser_frame.cc
+++ b/browser/ui/views/frame/brave_browser_frame.cc
@@ -11,7 +11,6 @@
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "ui/native_theme/native_theme_dark_aura.h"
 
 BraveBrowserFrame::BraveBrowserFrame(BrowserView* browser_view)
     : BrowserFrame(browser_view),
@@ -25,7 +24,7 @@ const ui::NativeTheme* BraveBrowserFrame::GetNativeTheme() const {
        brave::IsGuestProfile(view_->browser()->profile())) &&
       ThemeServiceFactory::GetForProfile(view_->browser()->profile())
           ->UsingDefaultTheme()) {
-    return ui::NativeThemeDarkAura::instance();
+    return ui::NativeTheme::GetInstanceForDarkUI();
   }
   return views::Widget::GetNativeTheme();
 }

From 25084b688e233a28a871e1a53ecf84a17f2ee5f7 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 14 Apr 2020 17:44:26 -0400
Subject: [PATCH 070/161] Profile menu GetSyncIcon moved to the base class.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/88ecfb08c25630c810301a8449c40275d6bf8352

commit 88ecfb08c25630c810301a8449c40275d6bf8352
Author: Thomas Lukaszewicz <tluk@chromium.org>
Date:   Thu Feb 27 15:12:53 2020 +0000

    Fixed color management for sync and avatar icons in profile menus.

    Removed the need to use the global GetInstanceForNativeUi() call
    to get required colors when constructing avatars and sync icons
    for profile menu views.

    Also updated the profile menus such that their sync and avatar
    icons are updated appropriately on theme changes.

    Performed some basic cleanup, moved some functions into the base
    class.

    Bug: None
---
 browser/ui/views/profiles/brave_incognito_menu_view.cc         | 1 -
 browser/ui/views/profiles/brave_profile_menu_view.cc           | 3 +--
 browser/ui/views/profiles/brave_profile_menu_view.h            | 2 +-
 .../chrome/browser/ui/views/profiles/profile_menu_view.h       | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/browser/ui/views/profiles/brave_incognito_menu_view.cc b/browser/ui/views/profiles/brave_incognito_menu_view.cc
index 2ad15a98c486..36e73b4b3c7e 100644
--- a/browser/ui/views/profiles/brave_incognito_menu_view.cc
+++ b/browser/ui/views/profiles/brave_incognito_menu_view.cc
@@ -71,7 +71,6 @@ void BraveIncognitoMenuView::BuildMenu() {
   int window_count = GetWindowCount(browser()->profile());
   SetIdentityInfo(
       ColoredImageForMenu(kIncognitoProfileIcon, icon_color),
-      /*badge=*/gfx::ImageSkia(),
       l10n_util::GetStringUTF16(GetProfileMenuTitleId(browser()->profile())),
       window_count > 1 ? l10n_util::GetPluralStringFUTF16(
                              IDS_INCOGNITO_WINDOW_COUNT_MESSAGE, window_count)
diff --git a/browser/ui/views/profiles/brave_profile_menu_view.cc b/browser/ui/views/profiles/brave_profile_menu_view.cc
index 1e56cda8e995..8f371c0e53d8 100644
--- a/browser/ui/views/profiles/brave_profile_menu_view.cc
+++ b/browser/ui/views/profiles/brave_profile_menu_view.cc
@@ -24,14 +24,13 @@ void BraveProfileMenuView::BuildIdentity() {
   // Reset IdentityInfo to get rid of the subtitle string
   // IDS_PROFILES_LOCAL_PROFILE_STATE("Not signed in").
   SetIdentityInfo(profile_attributes->GetAvatarIcon().AsImageSkia(),
-                  GetSyncIcon(),
                   /*title=*/base::string16());
 }
 
 // We don't want autofill buttons in this menu.
 void BraveProfileMenuView::BuildAutofillButtons() {}
 
-gfx::ImageSkia BraveProfileMenuView::GetSyncIcon() {
+gfx::ImageSkia BraveProfileMenuView::GetSyncIcon() const {
   // We don't need sync overlay.
   return gfx::ImageSkia();
 }
diff --git a/browser/ui/views/profiles/brave_profile_menu_view.h b/browser/ui/views/profiles/brave_profile_menu_view.h
index fa7ab032ba83..e7104c4c09ca 100644
--- a/browser/ui/views/profiles/brave_profile_menu_view.h
+++ b/browser/ui/views/profiles/brave_profile_menu_view.h
@@ -21,7 +21,7 @@ class BraveProfileMenuView : public ProfileMenuView {
   // Helper methods for building the menu.
   void BuildIdentity() override;
   void BuildAutofillButtons() override;
-  gfx::ImageSkia GetSyncIcon() override;
+  gfx::ImageSkia GetSyncIcon() const override;
 
   DISALLOW_COPY_AND_ASSIGN(BraveProfileMenuView);
 };
diff --git a/chromium_src/chrome/browser/ui/views/profiles/profile_menu_view.h b/chromium_src/chrome/browser/ui/views/profiles/profile_menu_view.h
index e5d86162c675..e232dbf807e7 100644
--- a/chromium_src/chrome/browser/ui/views/profiles/profile_menu_view.h
+++ b/chromium_src/chrome/browser/ui/views/profiles/profile_menu_view.h
@@ -12,10 +12,8 @@
 #define OnExitProfileButtonClicked virtual OnExitProfileButtonClicked
 #define BuildAutofillButtons virtual BuildAutofillButtons
 #define BuildIdentity virtual BuildIdentity
-#define GetSyncIcon virtual GetSyncIcon
 
 #include "../../../../../../../chrome/browser/ui/views/profiles/profile_menu_view.h"
-#undef GetSyncIcon
 #undef BuildIdentity
 #undef BuildAutofillButtons
 #undef OnExitProfileButtonClicked

From 13451357157fb0f1d0b49777eee6d893f460d024 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 14 Apr 2020 17:57:14 -0400
Subject: [PATCH 071/161] Profile menu AddFeatureButton signature changed.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/888af74006ea1c4ee9907d18c8df2a7ca424eab9%5E%21/#F5

commit 888af74006ea1c4ee9907d18c8df2a7ca424eab9
Author: Thomas Lukaszewicz <tluk@chromium.org>
Date:   Thu Feb 27 15:47:31 2020 +0000

    Removed remaining use of GetInstanceForNativeUi() from profile Menu.

    Removed remaining use of global NativeTheme accessor from profile
    menu and added color update capability on theme change.

    Fixed spacing on HoverButtons taking image views for consistency with
    other constructors.

    Bug: None
---
 browser/ui/views/profiles/brave_incognito_menu_view.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser/ui/views/profiles/brave_incognito_menu_view.cc b/browser/ui/views/profiles/brave_incognito_menu_view.cc
index 36e73b4b3c7e..9102f140514b 100644
--- a/browser/ui/views/profiles/brave_incognito_menu_view.cc
+++ b/browser/ui/views/profiles/brave_incognito_menu_view.cc
@@ -78,20 +78,20 @@ void BraveIncognitoMenuView::BuildMenu() {
 
   AddTorButton();
 
-  AddFeatureButton(ImageForMenu(kCloseAllIcon),
-                   l10n_util::GetStringUTF16(
+  AddFeatureButton(l10n_util::GetStringUTF16(
                        GetProfileMenuCloseButtonTextId(browser()->profile())),
                    base::BindRepeating(&IncognitoMenuView::OnExitButtonClicked,
-                                       base::Unretained(this)));
+                                       base::Unretained(this)),
+                   kCloseAllIcon);
 }
 
 void BraveIncognitoMenuView::AddTorButton() {
   if (ShouldShowTorProfileButton(browser()->profile())) {
     AddFeatureButton(
-        ImageForMenu(vector_icons::kLaunchIcon),
         l10n_util::GetStringUTF16(IDS_PROFILES_OPEN_TOR_PROFILE_BUTTON),
         base::BindRepeating(&BraveIncognitoMenuView::OnTorProfileButtonClicked,
-                            base::Unretained(this)));
+                            base::Unretained(this)),
+        vector_icons::kLaunchIcon);
   }
 }
 

From 5cfc334ced34055f2c0eaa0755950f16d44ac92d Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 14 Apr 2020 19:13:31 -0400
Subject: [PATCH 072/161] BrowserTabStripController c'tor signature change.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/510a2977507625a53c84947b4238ad592d734f39

commit 510a2977507625a53c84947b4238ad592d734f39
Author: Jason Lin <lxj@google.com>
Date:   Fri Mar 20 03:14:06 2020 +0000

    crostini: remove irrelevant items from terminal's tab menu

    Some of the default tab menu items (e.g. reload, move to existing
    window) does not make sense or work well with the terminal SWA, so we
    want to remove them.

    This CL adds GetTabMenuModelFactory() to AppBrowserController to allow
    an app to specify the tab menu model that it wants.

    Before screenshot: https://bugs.chromium.org/p/chromium/issues/attachment?aid=438083&signed_aid=ucqPxHzsGWc98617EvvGUQ==&inline=1
    After Screenshot: https://bugs.chromium.org/p/chromium/issues/attachment?aid=438084&signed_aid=R3gAlYCzETMUFNVq8NvAxw==&inline=1

    Bug: 1060861
---
 .../ui/views/tabs/brave_browser_tab_strip_controller.cc   | 8 +++++---
 .../ui/views/tabs/brave_browser_tab_strip_controller.h    | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc b/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc
index 954ff4387b41..c2c18b34a5ce 100644
--- a/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc
+++ b/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc
@@ -11,9 +11,11 @@
 
 BraveBrowserTabStripController::BraveBrowserTabStripController(
     TabStripModel* model,
-    BrowserView* browser_view)
-    : BrowserTabStripController(model, browser_view) {
-}
+    BrowserView* browser_view,
+    std::unique_ptr<TabMenuModelFactory> menu_model_factory_override)
+    : BrowserTabStripController(model,
+                                browser_view,
+                                std::move(menu_model_factory_override)) {}
 
 BraveBrowserTabStripController::~BraveBrowserTabStripController() {
   if (context_menu_contents_)
diff --git a/browser/ui/views/tabs/brave_browser_tab_strip_controller.h b/browser/ui/views/tabs/brave_browser_tab_strip_controller.h
index e0e87167e2aa..9ca615f7af67 100644
--- a/browser/ui/views/tabs/brave_browser_tab_strip_controller.h
+++ b/browser/ui/views/tabs/brave_browser_tab_strip_controller.h
@@ -15,7 +15,9 @@ class BraveTabContextMenuContents;
 class BraveBrowserTabStripController : public BrowserTabStripController {
  public:
   BraveBrowserTabStripController(TabStripModel* model,
-                                 BrowserView* browser_view);
+                                 BrowserView* browser_view,
+                                 std::unique_ptr<TabMenuModelFactory>
+                                     menu_model_factory_override = nullptr);
   ~BraveBrowserTabStripController() override;
 
   // BrowserTabStripController overrides:

From d30fbe94201f8ee493556a2bd012d56b4f03e994 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 15 Apr 2020 14:27:38 -0400
Subject: [PATCH 073/161] Upgrade patches from Chromium 83.0.4100.3 to Chromium
 83.0.4103.14.

---
 ...dded_i18n-generate_embedded_i18n.gni.patch |  2 +-
 patches/build-config-android-config.gni.patch |  2 +-
 patches/build-config-android-rules.gni.patch  |  2 +-
 patches/chrome-BUILD.gn.patch                 |  4 ++--
 patches/chrome-VERSION.patch                  |  6 +++---
 patches/chrome-android-BUILD.gn.patch         | 10 +++++-----
 ...rome-android-chrome_java_sources.gni.patch |  2 +-
 ...ome-android-java-AndroidManifest.xml.patch |  4 ++--
 ...me-browser-ChromeTabbedActivity.java.patch |  8 ++++----
 ...e-browser-settings-MainSettings.java.patch |  2 +-
 ...e_settings-ChosenObjectSettings.java.patch |  6 +++---
 ...settings-SingleCategorySettings.java.patch |  4 ++--
 ...ync-settings-ManageSyncSettings.java.patch |  6 +++---
 ...-browser-toolbar-ToolbarManager.java.patch |  4 ++--
 ...rowser-toolbar-top-ToolbarPhone.java.patch | 10 +++++-----
 ...owser-toolbar-top-ToolbarTablet.java.patch |  2 +-
 ...cing-settings-DeveloperSettings.java.patch |  4 ++--
 patches/chrome-browser-BUILD.gn.patch         |  4 ++--
 patches/chrome-browser-about_flags.cc.patch   |  6 +++---
 ...tensions-extension_install_prompt.cc.patch |  2 +-
 ...xtensions-extension_install_prompt.h.patch |  4 ++--
 ...r-extensions-extension_management.cc.patch |  4 ++--
 ...er-extensions-extension_management.h.patch |  4 ++--
 ...ser-extensions-extension_tab_util.cc.patch |  4 ++--
 ...flags-android-chrome_feature_list.cc.patch |  4 ++--
 ...et-system_network_context_manager.cc.patch |  4 ++--
 ...hrome-browser-prefs-browser_prefs.cc.patch |  6 +++---
 ...autofill_page-passwords_section.html.patch |  4 ++--
 ...ettings-people_page-people_page.html.patch |  2 +-
 ...tings-privacy_page-privacy_page.html.patch | 12 +++++------
 ...y_page-privacy_page_browser_proxy.js.patch |  2 +-
 patches/chrome-browser-ui-BUILD.gn.patch      |  6 +++---
 ...rowser-ui-cocoa-main_menu_builder.mm.patch |  6 +++---
 ...-extension_action_view_controller.cc.patch |  4 ++--
 ...rtup-startup_browser_creator_impl.cc.patch |  2 +-
 .../chrome-browser-ui-tab_helpers.cc.patch    |  4 ++--
 ...ws-location_bar-location_bar_view.cc.patch |  2 +-
 ...s-translate-translate_bubble_view.cc.patch |  2 +-
 ...ttings_localized_strings_provider.cc.patch |  4 ++--
 patches/chrome-common-BUILD.gn.patch          |  4 ++--
 patches/chrome-installer-linux-BUILD.gn.patch | 20 +++++++++----------
 ...rome-installer-linux-debian-build.sh.patch | 12 +++++------
 .../chrome-installer-linux-rpm-build.sh.patch |  6 +++---
 ...me-installer-mac-signing-pipeline.py.patch |  4 ++--
 patches/chrome-renderer-BUILD.gn.patch        |  4 ++--
 ...er-chrome_content_renderer_client.cc.patch |  4 ++--
 ...rer-chrome_content_renderer_client.h.patch |  4 ++--
 patches/chrome-test-BUILD.gn.patch            |  2 +-
 ...owser-distiller_page_web_contents.cc.patch |  2 +-
 ...x-browser-autocomplete_controller.cc.patch |  2 +-
 ...mnibox-browser-omnibox_edit_model.cc.patch |  2 +-
 .../components-page_info-page_info.cc.patch   |  4 ++--
 ...nts-permissions-permission_request.h.patch |  2 +-
 ...s-bookmark_remote_updates_handler.cc.patch |  2 +-
 ...ser-frame_host-navigation_request.cc.patch |  4 ++--
 ...ntent-renderer-render_thread_impl.cc.patch |  5 ++---
 .../tsconfig.base.json.patch                  |  6 +++---
 patches/extensions-browser-BUILD.gn.patch     |  4 ++--
 patches/net-BUILD.gn.patch                    |  4 ++--
 ...nfigured_proxy_resolution_service.cc.patch |  4 ++--
 ...-url_request-url_request_http_job.cc.patch |  4 ++--
 ...e_manager-sandbox-win-sandbox_win.cc.patch |  2 +-
 ...d_party-blink-renderer-core-BUILD.gn.patch |  2 +-
 ...arty-blink-renderer-modules-BUILD.gn.patch |  2 +-
 ...anvas2d-base_rendering_context_2d.cc.patch |  6 +++---
 ...canvas2d-base_rendering_context_2d.h.patch |  2 +-
 ...modules-mediastream-media_devices.cc.patch |  4 ++--
 ...eerconnection-rtc_peer_connection.cc.patch |  2 +-
 ...ls-metrics-histograms-histograms.xml.patch |  4 ++--
 patches/ui-base-BUILD.gn.patch                |  2 +-
 70 files changed, 150 insertions(+), 151 deletions(-)

diff --git a/patches/base-win-embedded_i18n-generate_embedded_i18n.gni.patch b/patches/base-win-embedded_i18n-generate_embedded_i18n.gni.patch
index a8dbc8b60e4c..274b1e61df11 100644
--- a/patches/base-win-embedded_i18n-generate_embedded_i18n.gni.patch
+++ b/patches/base-win-embedded_i18n-generate_embedded_i18n.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/base/win/embedded_i18n/generate_embedded_i18n.gni b/base/win/embedded_i18n/generate_embedded_i18n.gni
-index e515c8b01c73dadefcae183d6c4d4d2e51987160..701939a5c136bd36ff6343190e63890366057138 100644
+index eaf9e790e16b26b92358791cc28c6396a2798506..8bc68ce2b586747275a91bd55c7676f0fb9e6a9b 100644
 --- a/base/win/embedded_i18n/generate_embedded_i18n.gni
 +++ b/base/win/embedded_i18n/generate_embedded_i18n.gni
 @@ -98,6 +98,10 @@ template("generate_embedded_i18n") {
diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch
index eb6217ebabb7..af4a227a6e23 100644
--- a/patches/build-config-android-config.gni.patch
+++ b/patches/build-config-android-config.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/config.gni b/build/config/android/config.gni
-index afa18677326c63f455b7400fffb13005dfa2c89f..8f246f144848f31faebc41b74b89ad69f3087268 100644
+index 0df2b57d437c5cde523699a16aa8322d94d77004..a2f6c47bc9000910e5c5e682db6e95491691d929 100644
 --- a/build/config/android/config.gni
 +++ b/build/config/android/config.gni
 @@ -3,6 +3,7 @@
diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch
index ec1a80c985b5..cea81472ee5c 100644
--- a/patches/build-config-android-rules.gni.patch
+++ b/patches/build-config-android-rules.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
-index 13a9631c10a7f763bffdf42e9c4009700076e83c..9d101093d61b134047c803b4155260f0f03cd024 100644
+index c7414ad8795338f3209f497363c4a95cc8c0ce24..cd08e24530fa529638cc5597939d887826971b93 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
 @@ -513,6 +513,7 @@ if (enable_java_templates) {
diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch
index 605035444283..b0d9ce59551d 100644
--- a/patches/chrome-BUILD.gn.patch
+++ b/patches/chrome-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index dc1faa8f3a75fa958201372f2df674c44a94b4e0..5d46f1c78ea615c0727d80b65fab54c9144ac718 100644
+index d113eedf7afc704b0c2e8d112413e3bd7c58d8c7..c9a0b1ab122b25a92f414f6f6880ae9fadec8ac8 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -169,6 +169,10 @@ if (!is_android && !is_mac) {
@@ -110,4 +110,4 @@ index dc1faa8f3a75fa958201372f2df674c44a94b4e0..5d46f1c78ea615c0727d80b65fab54c9
 +    "//brave:resources",
    ]
  }
- 
+ 
\ No newline at end of file
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index 976adb2c4aa4..79768986505f 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 6a560f9868c252f53eb02043e4112492e44c9a8d..074a8f25c9a0607f9b39303d5395a290b4e0fa37 100644
+index f7693b18d4c1776c03bd27bae8d7bf2127cfb555..074a8f25c9a0607f9b39303d5395a290b4e0fa37 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=83
 -MINOR=0
--BUILD=4093
--PATCH=3
+-BUILD=4103
+-PATCH=14
 +MINOR=1
 +BUILD=11
 +PATCH=28
diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch
index 13300fa36515..c7afe610957a 100644
--- a/patches/chrome-android-BUILD.gn.patch
+++ b/patches/chrome-android-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 4afefa2041966ad0f881a4f857ca9f45898fe254..03527fa89f2eba7f6607b8d86755c8477448f41e 100644
+index de0b8bbe9c6751033b6ddac36a4e25f94c0937b4..da685af5d8dd5919e23177a13c945e584e4a91a5 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -196,6 +196,7 @@ android_resources("chrome_app_java_resources") {
@@ -10,7 +10,7 @@ index 4afefa2041966ad0f881a4f857ca9f45898fe254..03527fa89f2eba7f6607b8d86755c847
    custom_package = "org.chromium.chrome"
  }
  
-@@ -445,6 +446,7 @@ android_library("chrome_java") {
+@@ -448,6 +449,7 @@ android_library("chrome_java") {
    ]
  
    deps += feed_deps
@@ -18,7 +18,7 @@ index 4afefa2041966ad0f881a4f857ca9f45898fe254..03527fa89f2eba7f6607b8d86755c847
  
    srcjar_deps = [
      ":chrome_android_java_enums_srcjar",
-@@ -490,6 +492,7 @@ android_library("chrome_java") {
+@@ -494,6 +496,7 @@ android_library("chrome_java") {
      "//content/public/browser:contacts_picker_properties_requested_javagen",
      "//net:effective_connection_type_java",
    ]
@@ -26,7 +26,7 @@ index 4afefa2041966ad0f881a4f857ca9f45898fe254..03527fa89f2eba7f6607b8d86755c847
  
    android_manifest_for_lint = chrome_public_android_manifest
  
-@@ -597,6 +600,7 @@ group("jni_headers") {
+@@ -601,6 +604,7 @@ group("jni_headers") {
      "//chrome/browser/ui/android/favicon:jni_headers",
      "//chrome/browser/util:jni_headers",
    ]
@@ -34,7 +34,7 @@ index 4afefa2041966ad0f881a4f857ca9f45898fe254..03527fa89f2eba7f6607b8d86755c847
  }
  
  action("chrome_android_java_google_api_keys_srcjar") {
-@@ -1515,6 +1519,7 @@ if (current_toolchain == default_toolchain) {
+@@ -1522,6 +1526,7 @@ if (current_toolchain == default_toolchain) {
          ":${_variant}_locale_pak_assets",
          ":${_variant}_paks",
        ]
diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch
index 86913d987c05..5ba665315f7f 100644
--- a/patches/chrome-android-chrome_java_sources.gni.patch
+++ b/patches/chrome-android-chrome_java_sources.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
-index f8adec862e78f7b4cd18eb5296504c7d5468ae8e..9efd1b591880e40b69c21ee9f8f4bdbaf509ef9d 100644
+index 95b13fbb677e18d90cf2ab84c18bba2394057307..d6a712c4eaf342b3bc38fd7055ebc1d04e08e62c 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
 @@ -1884,3 +1884,4 @@ chrome_java_sources = [
diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch
index 47d72c8c9238..c6bb5514ec8a 100644
--- a/patches/chrome-android-java-AndroidManifest.xml.patch
+++ b/patches/chrome-android-java-AndroidManifest.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index a18cd3d5572951b7bada82907e9eb48df5b47a3c..4aa022393170dee6afac8353fcf54cb0cb6c77d3 100644
+index 0fe966536d28f654dbdb3fddd1657478bf9caeb8..2fdc3ee302a02a9376682c37187b4239a412a284 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
 @@ -34,7 +34,9 @@ by a child template that "extends" this file.
@@ -72,7 +72,7 @@ index a18cd3d5572951b7bada82907e9eb48df5b47a3c..4aa022393170dee6afac8353fcf54cb0
          {% endif %}
  
          <!-- Cast support -->
-@@ -1295,6 +1311,7 @@ android:value="true" />
+@@ -1299,6 +1315,7 @@ android:value="true" />
          </activity>
          {% endif %}
  
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
index 8e10cb1e21b0..df5ea10c512c 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-index 8fd4f00557ac71fb86e7ce6ae3b6a00dd24d2589..6a4175eb49d16103164f636f3a602d2bc906d1c2 100644
+index e5c7e73e669df02d2595cab4572e3e129bd565d4..1a1efffdf43afe1b8d2cc7fb0a8a14db2a2a82a9 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 @@ -178,7 +178,7 @@ import java.util.Locale;
@@ -11,7 +11,7 @@ index 8fd4f00557ac71fb86e7ce6ae3b6a00dd24d2589..6a4175eb49d16103164f636f3a602d2b
      private static final String TAG = "ChromeTabbedActivity";
  
      private static final String HELP_URL_PREFIX = "https://support.google.com/chrome/";
-@@ -1576,7 +1576,7 @@ public class ChromeTabbedActivity
+@@ -1580,7 +1580,7 @@ public class ChromeTabbedActivity
  
      @Override
      public AppMenuPropertiesDelegate createAppMenuPropertiesDelegate() {
@@ -20,7 +20,7 @@ index 8fd4f00557ac71fb86e7ce6ae3b6a00dd24d2589..6a4175eb49d16103164f636f3a602d2b
                  getMultiWindowModeStateDispatcher(), getTabModelSelector(), getToolbarManager(),
                  getWindow().getDecorView(), this,
                  mOverviewModeController.mOverviewModeBehaviorSupplier,
-@@ -1600,9 +1600,9 @@ public class ChromeTabbedActivity
+@@ -1604,9 +1604,9 @@ public class ChromeTabbedActivity
                  }
              };
          }
@@ -32,7 +32,7 @@ index 8fd4f00557ac71fb86e7ce6ae3b6a00dd24d2589..6a4175eb49d16103164f636f3a602d2b
                          tabDelegateFactorySupplier, true, overviewNTPCreator));
      }
  
-@@ -1979,7 +1979,7 @@ public class ChromeTabbedActivity
+@@ -1982,7 +1982,7 @@ public class ChromeTabbedActivity
          }
      }
  
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch
index eedde543f9a5..c36d485d58ab 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-MainSettings.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
-index 41d1d92745aaaf27f0407c025a5dd6aaba4b68fd..cb0e4bd87d43f1b85de9bbfd7a0fe8e632d9b6c8 100644
+index b0ae472102cddf9e7b65edd3e759f5746565412c..51c41e23686b7dc5544cba44461818939f52a260 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
 @@ -44,7 +44,7 @@ import java.util.Map;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch
index e23ad1cad8dd..94f1c4bc11e7 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-ChosenObjectSettings.java.patch
@@ -1,9 +1,9 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
-index e3ad44adfd849b0d390cb8e797e2049aab40decf..aa03e6403e64ce52b7d5aa8a7f2d7a935c0da9cf 100644
+index 737380516e3f72f0580644f6aa61a987e0f43bde..2f148b0b102ab3210a2cd5ac4753e76501038d59 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java
-@@ -134,7 +134,7 @@ public class ChosenObjectSettings extends SiteSettingsPreferenceFragment {
-                     null);
+@@ -131,7 +131,7 @@ public class ChosenObjectSettings extends SiteSettingsPreferenceFragment {
+                     getActivity(), getString(R.string.help_context_settings));
              return true;
          }
 -        return false;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch
index 270eb6a34903..3f92314bc84b 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-site_settings-SingleCategorySettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
-index 55dbf87b53bc281ec760f4442dad68e52f8c849e..f9dd0b11d158bf88e2ec71575175d52c63f140b1 100644
+index 754ce5e2b1fab682642f6c21d7988d83f8558be1..9cacedb4b3d9fecc2f3448c507610fd30123a8c8 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java
-@@ -427,7 +427,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -426,7 +426,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              if (queryHasChanged) getInfoForOrigins();
              return true;
          }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
index 8f7548f3ce53..e84d72b16a21 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
-index df17ffb0581f4329b34d2a79819aafb0a8a03829..bd7883b677d3eddc5cf7e89a5fd2635a77b95c27 100644
+index 4a7c610cec562ed067a86629b8a6f5d0b8758ddf..e5b2f7a726b7efe4d3f5dfe2322a1d375e49f631 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
-@@ -51,7 +51,7 @@ import java.util.Set;
+@@ -64,7 +64,7 @@ import java.util.Set;
   * Settings fragment to customize Sync options (data types, encryption). Can be accessed from
   * {@link SyncAndServicesSettings}.
   */
@@ -10,4 +10,4 @@ index df17ffb0581f4329b34d2a79819aafb0a8a03829..bd7883b677d3eddc5cf7e89a5fd2635a
 +public class ManageSyncSettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment
          implements PassphraseDialogFragment.Listener, PassphraseCreationDialogFragment.Listener,
                     PassphraseTypeDialogFragment.Listener, Preference.OnPreferenceChangeListener,
-                    ProfileSyncService.SyncStateChangedListener {
+                    ProfileSyncService.SyncStateChangedListener,
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
index b05b448628df..b93aac2900a7 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-index 5049e6ee153005f5035d29895385d265d1064377..9c59ad568efc1edee123eb4caa25ffa5734fedbf 100644
+index 2430766283e8008369b502b920a37687cc098f48..0cf2602a27cb6553d35c73035f0c3aee825ecf20 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -1674,6 +1674,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
+@@ -1671,6 +1671,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
          boolean editingAllowed = currentTab == null || mBookmarkBridge == null
                  || mBookmarkBridge.isEditBookmarksEnabled();
          mToolbar.updateBookmarkButton(isBookmarked, editingAllowed);
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
index 75bdf30a48e9..19697934719b 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
-index d0e312498d3e7cef40f3676d51edd22b8bc4aafe..8232e1dd1471b4c83f571aa8ad3b251fc76c1c91 100644
+index 8803c290bda481fc04cb03a4f07ddcc3dd92e551..1ad4ba14169b7051ec387b91d62d5ac8ec089837 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 @@ -92,7 +92,7 @@ import java.util.List;
@@ -37,7 +37,7 @@ index d0e312498d3e7cef40f3676d51edd22b8bc4aafe..8232e1dd1471b4c83f571aa8ad3b251f
      }
  
      /**
-@@ -549,6 +553,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -550,6 +554,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
                          EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
              }
          }
@@ -45,7 +45,7 @@ index d0e312498d3e7cef40f3676d51edd22b8bc4aafe..8232e1dd1471b4c83f571aa8ad3b251f
      }
  
      @Override
-@@ -715,7 +720,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -716,7 +721,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
       * @return The right bounds of the location bar after accounting for any visible left buttons.
       */
      private int getBoundsAfterAccountingForRightButtons() {
@@ -54,7 +54,7 @@ index d0e312498d3e7cef40f3676d51edd22b8bc4aafe..8232e1dd1471b4c83f571aa8ad3b251f
      }
  
      private void updateToolbarBackground(int color) {
-@@ -2171,6 +2176,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -2172,6 +2177,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
          } else {
              populateUrlClearFocusingAnimatorSet(animators);
          }
@@ -62,7 +62,7 @@ index d0e312498d3e7cef40f3676d51edd22b8bc4aafe..8232e1dd1471b4c83f571aa8ad3b251f
          mUrlFocusLayoutAnimator = new AnimatorSet();
          mUrlFocusLayoutAnimator.playTogether(animators);
  
-@@ -2849,6 +2855,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -2850,6 +2856,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
  
      @Override
      public void onBottomToolbarVisibilityChanged(boolean isVisible) {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
index d97fd811ad69..56c02a402399 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
-index 1a9e11fefe426c6a4ee835bb9137d995a8ffb9f9..fd6ce1ce799db821d8b0af60a4ea9a68f566decb 100644
+index b1ddc7c038bebf297241e3f41cc1d9d8569ca1cb..d1733fd6410e6d8e1b7bec9ffc04ca14d130b935 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
 @@ -56,7 +56,7 @@ import java.util.Collection;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch
index 01492cb7d53d..a32bb6868221 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-tracing-settings-DeveloperSettings.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
-index fa2221eb9f130ec4c038346c90a8ddec813e3307..55e2a594ff5c7e480f0ffd7cfe3ab62378d6b632 100644
+index e07a8f2febf6bf643d18ed0e4db5ef51eb307e56..ad81c00746c9ef16c7d2271e0fd905e9307ec4ab 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
-@@ -19,7 +19,7 @@ import org.chromium.components.version_info.VersionConstants;
+@@ -20,7 +20,7 @@ import org.chromium.components.version_info.VersionConstants;
  /**
   * Settings fragment containing preferences aimed at Chrome and web developers.
   */
diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
index 9b529eed69ee..22d15d0d0090 100644
--- a/patches/chrome-browser-BUILD.gn.patch
+++ b/patches/chrome-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index c7530f3c16db14865b555a27f2c32b7f6cbd58ad..ce2aa5e970ef1b9957e3142670778fd59f9526ba 100644
+index 023024e81c99d09efc0d1530a6c9ae3f1acf3abe..4554a8aa717ba00fc585f58c63e04cf229535f5c 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2296,6 +2296,7 @@ jumbo_static_library("browser") {
+@@ -2295,6 +2295,7 @@ jumbo_static_library("browser") {
      "//ui/strings",
      "//ui/surface",
      "//ui/web_dialogs",
diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
index d3fd4d6fa9b4..727292908927 100644
--- a/patches/chrome-browser-about_flags.cc.patch
+++ b/patches/chrome-browser-about_flags.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 33df2ec26606b28e0c38e94bc61ea4358e812e94..111effeff4cfd9313ca216e7b2ddd686ec39d390 100644
+index 18289552dc9d7a5246cbb734d481cf897191e869..25a009c166b871303e181ef1a3bd093ece162424 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -287,14 +287,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
+@@ -290,14 +290,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
  const FeatureEntry::Choice kTraceUploadURL[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
      {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL,
@@ -21,7 +21,7 @@ index 33df2ec26606b28e0c38e94bc61ea4358e812e94..111effeff4cfd9313ca216e7b2ddd686
  
  const FeatureEntry::Choice kPassiveListenersChoices[] = {
      {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -5197,6 +5197,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5208,6 +5208,7 @@ const FeatureEntry kFeatureEntries[] = {
      // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
      // Histograms" in tools/metrics/histograms/README.md (run the
      // AboutFlagsHistogramTest unit test to verify this process).
diff --git a/patches/chrome-browser-extensions-extension_install_prompt.cc.patch b/patches/chrome-browser-extensions-extension_install_prompt.cc.patch
index 117b001f0265..f582eee0fca0 100644
--- a/patches/chrome-browser-extensions-extension_install_prompt.cc.patch
+++ b/patches/chrome-browser-extensions-extension_install_prompt.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
-index 081b1dba7c13c599c934b90a6473b52afc5f5f5a..45ed600f4c05545ae66fcd0298b497e38bdcc163 100644
+index 194a12a82a1bc6a9af38ed5c9b7bba9a2a30d286..91ce280ee39f71b23c5b9c35a09138fe8d02cdfe 100644
 --- a/chrome/browser/extensions/extension_install_prompt.cc
 +++ b/chrome/browser/extensions/extension_install_prompt.cc
 @@ -13,6 +13,7 @@
diff --git a/patches/chrome-browser-extensions-extension_install_prompt.h.patch b/patches/chrome-browser-extensions-extension_install_prompt.h.patch
index ed6712c11705..730a4efd106b 100644
--- a/patches/chrome-browser-extensions-extension_install_prompt.h.patch
+++ b/patches/chrome-browser-extensions-extension_install_prompt.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/extension_install_prompt.h b/chrome/browser/extensions/extension_install_prompt.h
-index f797a6e2bde19ecf91443a27f97c1a227b06e54a..cdc89811407db706a540a791361831038a881f85 100644
+index bf9919930d0fdf0b7e25b79fca04e14f59cc20b0..bfa2fc3d3053e07b366d65ec5133a23d23f91a12 100644
 --- a/chrome/browser/extensions/extension_install_prompt.h
 +++ b/chrome/browser/extensions/extension_install_prompt.h
 @@ -86,7 +86,7 @@ class ExtensionInstallPrompt {
@@ -11,7 +11,7 @@ index f797a6e2bde19ecf91443a27f97c1a227b06e54a..cdc89811407db706a540a79136183103
  
      void AddPermissionSet(const extensions::PermissionSet& permissions);
      void AddPermissionMessages(
-@@ -167,6 +167,7 @@ class ExtensionInstallPrompt {
+@@ -169,6 +169,7 @@ class ExtensionInstallPrompt {
  
      bool has_webstore_data() const { return has_webstore_data_; }
  
diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch
index 7a9291d70aa7..3427398861d9 100644
--- a/patches/chrome-browser-extensions-extension_management.cc.patch
+++ b/patches/chrome-browser-extensions-extension_management.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
-index e6fe22c10e38b6d65a190c3331ee94ff4d1dd3f2..4dfd87c8c22e3379bef99546f78176e763f987f1 100644
+index 73c51032e486199042d2b051ea17743933406248..80a2b87ac444ad8c07d89d2841a39bfe79740014 100644
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
 @@ -17,6 +17,7 @@
@@ -10,7 +10,7 @@ index e6fe22c10e38b6d65a190c3331ee94ff4d1dd3f2..4dfd87c8c22e3379bef99546f78176e7
  #include "chrome/browser/extensions/extension_management_constants.h"
  #include "chrome/browser/extensions/extension_management_internal.h"
  #include "chrome/browser/extensions/external_policy_loader.h"
-@@ -672,7 +673,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor(
+@@ -666,7 +667,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor(
      content::BrowserContext* context) const {
    TRACE_EVENT0("browser,startup",
                 "ExtensionManagementFactory::BuildServiceInstanceFor");
diff --git a/patches/chrome-browser-extensions-extension_management.h.patch b/patches/chrome-browser-extensions-extension_management.h.patch
index 8ee54910ff67..2855650195f4 100644
--- a/patches/chrome-browser-extensions-extension_management.h.patch
+++ b/patches/chrome-browser-extensions-extension_management.h.patch
@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h
-index 7d50b4a57aa5cee47149df30ccc026dfefdc3161..def64912783c871c39aa5321b1645bd234acabdb 100644
+index e1f99b71f5911e8fec1b00c6499a431077b38e96..9aaf3392b6059054956e676fbf25c1c37559e57e 100644
 --- a/chrome/browser/extensions/extension_management.h
 +++ b/chrome/browser/extensions/extension_management.h
 @@ -185,6 +185,7 @@ class ExtensionManagement : public KeyedService {
-   bool IsChild() const { return is_child_; }
+   bool is_child() const { return is_child_; }
  
   private:
 +  friend class BraveExtensionManagement;
diff --git a/patches/chrome-browser-extensions-extension_tab_util.cc.patch b/patches/chrome-browser-extensions-extension_tab_util.cc.patch
index 1a347b8cb0f5..1457117e12df 100644
--- a/patches/chrome-browser-extensions-extension_tab_util.cc.patch
+++ b/patches/chrome-browser-extensions-extension_tab_util.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
-index 805b1f35c231198643f54400c75f47665f315014..68e769b2987de905c5175ed3fd1782062df156de 100644
+index 87986bdccacab5ed95b08c6312eb06911f88feae..cb9e59fbea2c98b0c105453b583698c541466b12 100644
 --- a/chrome/browser/extensions/extension_tab_util.cc
 +++ b/chrome/browser/extensions/extension_tab_util.cc
-@@ -795,6 +795,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
+@@ -780,6 +780,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
    GURL fixed_url =
        url_formatter::FixupURL(url.possibly_invalid_spec(), std::string());
    if (!fixed_url.SchemeIs(content::kChromeUIScheme))
diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
index e2dbfe9bb41f..7e33f7899c78 100644
--- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
+++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
-index ad613737fda00315ab827c157df8b222308a8129..0e1f6403703336a7fc3189fb2f7bb6eff4289612 100644
+index d4a4e54a661aa9f0e58cff593f60af25cb9997a7..4e6dd7436f99a1765814a970dda77664b7448d31 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -253,6 +253,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
+@@ -249,6 +249,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
  };
  
  const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
diff --git a/patches/chrome-browser-net-system_network_context_manager.cc.patch b/patches/chrome-browser-net-system_network_context_manager.cc.patch
index b7017f489180..5ea4667a4703 100644
--- a/patches/chrome-browser-net-system_network_context_manager.cc.patch
+++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
-index 0ce4445b906e28b680d177c96c1f8b8a467d19b5..b6f675f5f5b5c1219879eff372cc9d766dcb64c7 100644
+index 11e4953a79222c4e92582f89f6bcb9999d430e71..d589f1b836960c64299d6699e4970277564ca467 100644
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -253,7 +253,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
+@@ -213,7 +213,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
      if (!manager_)
        return;
      manager_->GetURLLoaderFactory()->CreateLoaderAndStart(
diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch
index 4f977a270d77..e8d05f126981 100644
--- a/patches/chrome-browser-prefs-browser_prefs.cc.patch
+++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 28441480d78191b1fd63ed9238b33b2bc6ad099a..2da182f36628c37c9cc783d801424b1cc3845005 100644
+index 7d01e4acda839de52694d139584991a5922bbe8a..331f9f77eee3594899a565bb221dc338a273557c 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -829,6 +829,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -828,6 +828,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
  #if defined(TOOLKIT_VIEWS)
    RegisterBrowserViewLocalPrefs(registry);
  #endif
@@ -10,7 +10,7 @@ index 28441480d78191b1fd63ed9238b33b2bc6ad099a..2da182f36628c37c9cc783d801424b1c
  
    // Obsolete. See MigrateObsoleteBrowserPrefs().
    registry->RegisterBooleanPref(kGCMChannelStatus, true);
-@@ -1095,6 +1096,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1094,6 +1095,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
  #endif
  
    RegisterProfilePrefsForMigration(registry);
diff --git a/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch b/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch
index 516596c6c402..d1ffe8bee6ee 100644
--- a/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch
+++ b/patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/autofill_page/passwords_section.html b/chrome/browser/resources/settings/autofill_page/passwords_section.html
-index 59158c3b8fcb8e89713082eed9377deed10996c7..350afa707c21065ffdd6b94e0d652340ec93afb2 100644
+index e308f8e587a3b3c7d8e18782372fc60b0125ddbf..c0d3ca07fba92ea55a57f925844924a09057b18c 100644
 --- a/chrome/browser/resources/settings/autofill_page/passwords_section.html
 +++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html
-@@ -153,11 +153,15 @@
+@@ -163,11 +163,15 @@
          </cr-icon-button>
        </div>
      </template>
diff --git a/patches/chrome-browser-resources-settings-people_page-people_page.html.patch b/patches/chrome-browser-resources-settings-people_page-people_page.html.patch
index 94fc29f08d77..9077aee7114c 100644
--- a/patches/chrome-browser-resources-settings-people_page-people_page.html.patch
+++ b/patches/chrome-browser-resources-settings-people_page-people_page.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
-index 96b3755acc7d81e569b41dd5c52031a4b6e14bdb..27818f38ee83f369448d6539dced20d6a0314852 100644
+index 31a6bcea82112623b1527d0860b318561f23ee2b..12ffa6488b98dd4d69383cc545ab4421579fbf19 100644
 --- a/chrome/browser/resources/settings/people_page/people_page.html
 +++ b/chrome/browser/resources/settings/people_page/people_page.html
 @@ -147,12 +147,14 @@
diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
index df0cf8e85e29..504a7bd10b3e 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-index d848b6414df5999d22ec8c5cb49581b2df2d41ef..9ab0791fdc8d893a4868cfa8f248f6f79abc8d7b 100644
+index cde7a3097bebddbe4b68ebbb2960c65130b30392..c68104dde38cc9f1608739c5b1efdca0ec476394 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
 @@ -29,6 +29,7 @@
@@ -60,7 +60,7 @@ index d848b6414df5999d22ec8c5cb49581b2df2d41ef..9ab0791fdc8d893a4868cfa8f248f6f7
          </template>
          <template is="dom-if" if="[[privacySettingsRedesignEnabled_]]" restamp>
            <cr-link-row id="clearBrowsingData"
-@@ -212,6 +220,7 @@
+@@ -213,6 +221,7 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
@@ -68,7 +68,7 @@ index d848b6414df5999d22ec8c5cb49581b2df2d41ef..9ab0791fdc8d893a4868cfa8f248f6f7
        <template is="dom-if" route-path="/content/backgroundSync" no-search>
          <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
-@@ -229,6 +238,7 @@
+@@ -230,6 +239,7 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
@@ -76,7 +76,7 @@ index d848b6414df5999d22ec8c5cb49581b2df2d41ef..9ab0791fdc8d893a4868cfa8f248f6f7
        <template is="dom-if" route-path="/content/camera" no-search>
          <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
-@@ -270,11 +280,13 @@
+@@ -272,11 +282,13 @@
                sub-option-label="$i18n{deleteDataPostSession}"
                sub-option-mode="cookies-session-only">
            </category-default-setting>
@@ -90,7 +90,7 @@ index d848b6414df5999d22ec8c5cb49581b2df2d41ef..9ab0791fdc8d893a4868cfa8f248f6f7
            <cr-link-row id="site-data-trigger" class="hr"
                on-click="onSiteDataTap_" label="$i18n{siteSettingsCookieLink}">
            </cr-link-row>
-@@ -364,11 +376,13 @@
+@@ -366,11 +378,13 @@
          <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
              search-term="{{searchFilter_}}">
@@ -104,7 +104,7 @@ index d848b6414df5999d22ec8c5cb49581b2df2d41ef..9ab0791fdc8d893a4868cfa8f248f6f7
            <category-setting-exceptions
                category="{{ContentSettingsTypes.JAVASCRIPT}}"
                block-header="$i18n{siteSettingsBlock}"
-@@ -467,6 +481,19 @@
+@@ -469,6 +483,19 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch
index 77a72bd941f7..f7bf75dd145c 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js
-index 658b4d6ab99050787352154dce3d00d1b39f5eda..c334612e66e1fb3f9c9562726de2aa624c830589 100644
+index f1a535aa22337b043f990f5e4e7f27e2da97e4c2..ee5d342797c6985f74498d68107c099c334221a9 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js
 @@ -48,7 +48,7 @@ cr.define('settings', function() {
diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch
index 0f882d7b977d..fbedce696876 100644
--- a/patches/chrome-browser-ui-BUILD.gn.patch
+++ b/patches/chrome-browser-ui-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
-index 1e9de5eaa18f89b89905e1e4d567123635c20bff..4fcfb74e92e9e3514a573ab4123a603b0f5ad8cc 100644
+index dfffff81bcf220dc0bed329fc2219641a55244db..8995c02221f70b2667dd11ed6598f6ab6061bef0 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -607,6 +607,9 @@ jumbo_static_library("ui") {
+@@ -605,6 +605,9 @@ jumbo_static_library("ui") {
      "//ui/webui",
      "//v8:v8_version",
    ]
@@ -12,7 +12,7 @@ index 1e9de5eaa18f89b89905e1e4d567123635c20bff..4fcfb74e92e9e3514a573ab4123a603b
    allow_circular_includes_from +=
        [ "//chrome/browser/ui/webui/bluetooth_internals" ]
  
-@@ -2599,10 +2602,13 @@ jumbo_static_library("ui") {
+@@ -2603,10 +2606,13 @@ jumbo_static_library("ui") {
        ]
        deps += [ "//google_update" ]
      } else {
diff --git a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch
index 86e0a8c2b7d2..f0aff264eefe 100644
--- a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch
+++ b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/cocoa/main_menu_builder.mm
-index 04198bee3ea102ecfb512aceb91d830b2bfc6a2b..ea2d7eff04d6529348941d35280617c4c04b29be 100644
+index 1216e57ff20295dbdf0d7eccc4d4f6dd3bbd1d54..b926ee78c81bc13452279817e745d7daa90e9759 100644
 --- a/chrome/browser/ui/cocoa/main_menu_builder.mm
 +++ b/chrome/browser/ui/cocoa/main_menu_builder.mm
-@@ -100,6 +100,7 @@ base::scoped_nsobject<NSMenuItem> BuildFileMenu(
+@@ -101,6 +101,7 @@ base::scoped_nsobject<NSMenuItem> BuildFileMenu(
                  Item(IDS_NEW_INCOGNITO_WINDOW_MAC)
                      .command_id(IDC_NEW_INCOGNITO_WINDOW)
                      .remove_if(is_pwa),
@@ -10,7 +10,7 @@ index 04198bee3ea102ecfb512aceb91d830b2bfc6a2b..ea2d7eff04d6529348941d35280617c4
                  Item(IDS_REOPEN_CLOSED_TABS_MAC)
                      .command_id(IDC_RESTORE_TAB)
                      .remove_if(is_pwa),
-@@ -457,6 +458,7 @@ base::scoped_nsobject<NSMenuItem> BuildHelpMenu(
+@@ -464,6 +465,7 @@ base::scoped_nsobject<NSMenuItem> BuildHelpMenu(
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
              Item(IDS_FEEDBACK_MAC).command_id(IDC_FEEDBACK),
  #endif
diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
index b811fa4b23e1..91cb6eb7b534 100644
--- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
+++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc
-index 4b1e239146b242649c652b2b99a96d81fd56dad6..cc36febdce3cf0ac7c6e0f2fd2ae8e9e126eaf93 100644
+index 41ca2bb913aaa2945d11e197554f2c2547f46f67..2f18a404abcea168b9dd5f23d3de9f383936c1f6 100644
 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc
 +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc
-@@ -59,7 +59,6 @@ ExtensionActionViewController::ExtensionActionViewController(
+@@ -58,7 +58,6 @@ ExtensionActionViewController::ExtensionActionViewController(
        icon_factory_(browser->profile(), extension, extension_action, this),
        extension_registry_(
            extensions::ExtensionRegistry::Get(browser_->profile())) {
diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
index f9d0c93d8fcd..58952c173f91 100644
--- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
+++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-index 729221503fabdbe9d9b4564562cb16e263433908..de8a4e4d3bef77c12709d5e26f22b762a0ed59ff 100644
+index 03d2b4e6456b9b132388a3db6cf9c1d44716749d..dd6d42b5f7414293e5580e9b79ddd46b41bf59a7 100644
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 @@ -665,6 +665,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch
index 01ceac28d574..d17d6d0d0c3a 100644
--- a/patches/chrome-browser-ui-tab_helpers.cc.patch
+++ b/patches/chrome-browser-ui-tab_helpers.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
-index e37e00ef6541afd57a78164dd0b385c05b2a3586..bed4a8d787f75316721b4033b6aafdcb73100f11 100644
+index 840e84fba887cbe7221f1fc39acd99b9b9c05639..4f58565fcae953a27e2fa558b3a84029ff31751e 100644
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -445,4 +445,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -447,4 +447,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
  
    // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and
    // organized.
diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
index 08b54ac04282..033167999070 100644
--- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
+++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-index 62652585d10091da49d5bac4c4d25d2d0be6298b..90df44d8c0a50c493ee040a3f8e5103af10bdac8 100644
+index 0fc1d142dcf7c6528d181f811b01ebcc84eb4850..4a8ac31b6d28670f6b226edac3f4e58bdbe0a115 100644
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
 @@ -442,7 +442,7 @@ void LocationBarView::OnKeywordFaviconFetched(const gfx::Image& icon) {
diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
index 7d99744a252d..262db0532846 100644
--- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
-index 325fac91ab832682e07d3aab6b202ea21f89ab6d..8d5acddae44d38dff3fd080487112f8f586ad550 100644
+index 32dfd0daeec460e1394d52949a85c47d4c46aa85..0323db3603e4c9efc78f24cd00edb628235cde45 100644
 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
 +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
 @@ -182,7 +182,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
index d86efb392b0c..5cf99412b677 100644
--- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
+++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-index 2d1c836bf0b1fd9f5334b87367ca98a48472235f..6a6eed9ab7209d43f9fd02aa7b9f87eb627c6ce2 100644
+index 90189cf77f16f06ffd416cb4cc5b247b08c41cdc..ebad3013bc436daf9f1b42076f1bed25e1bb92e7 100644
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -2050,6 +2050,7 @@ void AddBrowserLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -2088,6 +2088,7 @@ void AddBrowserLocalizedStrings(content::WebUIDataSource* html_source,
    policy_indicator::AddLocalizedStrings(html_source);
    AddSecurityKeysStrings(html_source);
  
diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch
index a1878ddbf58f..c263e89ff7f8 100644
--- a/patches/chrome-common-BUILD.gn.patch
+++ b/patches/chrome-common-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
-index 03336cf469c9959307da60555819e8919738c6bf..611d2ddaf62ff04f041302e100b5e9e774513fbb 100644
+index 625031e4bf349607f1d391a95a616cd26e1f3f44..e724d7c3193825de09049eeb838ff651e0e612f6 100644
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
 @@ -69,6 +69,7 @@ source_set("channel_info") {
@@ -18,7 +18,7 @@ index 03336cf469c9959307da60555819e8919738c6bf..611d2ddaf62ff04f041302e100b5e9e7
      ":available_offline_content_mojom",
      ":buildflags",
      ":channel_info",
-@@ -555,6 +557,7 @@ static_library("non_code_constants") {
+@@ -553,6 +555,7 @@ static_library("non_code_constants") {
      "//printing/buildflags",
      "//ui/base:buildflags",
    ]
diff --git a/patches/chrome-installer-linux-BUILD.gn.patch b/patches/chrome-installer-linux-BUILD.gn.patch
index e083c4c14fa1..d02048075749 100644
--- a/patches/chrome-installer-linux-BUILD.gn.patch
+++ b/patches/chrome-installer-linux-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
-index f1129b48a91054e81e0c340533bf683334775431..cc01f86585c407a772c02c00592b796ee7d53ac6 100644
+index 9c92012ce3b4b0db28f29046240720da04997d98..0f3bdfe2d0d928168ca55bb33a747a980555deef 100644
 --- a/chrome/installer/linux/BUILD.gn
 +++ b/chrome/installer/linux/BUILD.gn
-@@ -26,8 +26,8 @@ declare_args() {
+@@ -29,8 +29,8 @@ declare_args() {
  assert(is_linux)
  
  packaging_files_executables = [
@@ -13,7 +13,7 @@ index f1129b48a91054e81e0c340533bf683334775431..cc01f86585c407a772c02c00592b796e
    "$root_out_dir/crashpad_handler",
  ]
  packaging_files_shlibs = []
-@@ -137,10 +137,15 @@ action("merge_rpm_dependencies") {
+@@ -140,10 +140,15 @@ action("merge_rpm_dependencies") {
  }
  
  action("strip_chrome_binary") {
@@ -30,7 +30,7 @@ index f1129b48a91054e81e0c340533bf683334775431..cc01f86585c407a772c02c00592b796e
    script = "//build/gn_run_binary.py"
    sources = [
      "//buildtools/third_party/eu-strip/bin/eu-strip",
-@@ -207,7 +212,7 @@ branding_dir_100 =
+@@ -210,7 +215,7 @@ branding_dir_100 =
  copy("common_packaging_files") {
    visibility = [ ":*" ]
    sources = [
@@ -39,7 +39,7 @@ index f1129b48a91054e81e0c340533bf683334775431..cc01f86585c407a772c02c00592b796e
      "common/apt.include",
      "common/default-app-block.template",
      "common/default-app.template",
-@@ -230,8 +235,8 @@ copy("common_packaging_files") {
+@@ -233,8 +238,8 @@ copy("common_packaging_files") {
      ]
    } else {
      sources += [
@@ -50,7 +50,7 @@ index f1129b48a91054e81e0c340533bf683334775431..cc01f86585c407a772c02c00592b796e
      ]
    }
  
-@@ -332,6 +337,12 @@ group("installer_deps") {
+@@ -335,6 +340,12 @@ group("installer_deps") {
      "//sandbox/linux:chrome_sandbox",
      "//third_party/crashpad/crashpad/handler:crashpad_handler",
    ]
@@ -63,7 +63,7 @@ index f1129b48a91054e81e0c340533bf683334775431..cc01f86585c407a772c02c00592b796e
    if (enable_nacl) {
      public_deps += [
        "//components/nacl/loader:nacl_helper",
-@@ -357,6 +368,9 @@ group("installer_deps") {
+@@ -360,6 +371,9 @@ group("installer_deps") {
  template("linux_package") {
    assert(defined(invoker.channel))
    channel = invoker.channel
@@ -71,9 +71,9 @@ index f1129b48a91054e81e0c340533bf683334775431..cc01f86585c407a772c02c00592b796e
 +    channel = "dev"
 +  }
  
-   deb_target_name = "${target_name}_deb"
-   action(deb_target_name) {
-@@ -486,3 +500,6 @@ linux_package("beta") {
+   if (is_chrome_branded) {
+     package = "google-chrome"
+@@ -523,3 +537,6 @@ linux_package("beta") {
  linux_package("unstable") {
    channel = "unstable"
  }
diff --git a/patches/chrome-installer-linux-debian-build.sh.patch b/patches/chrome-installer-linux-debian-build.sh.patch
index b56110361d36..c729aea9bf92 100644
--- a/patches/chrome-installer-linux-debian-build.sh.patch
+++ b/patches/chrome-installer-linux-debian-build.sh.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh
-index c8e2130d81c95692c4298a6418f2bf00c78c4d5e..bdd0a2098752863de7fe20c635e9d97c4c85083a 100755
+index 29e94a6f46f38b5c34ca83d3901c7ed193a4a922..4d9f965c1b0bc4d1e3471b2b977be87e2034bf89 100755
 --- a/chrome/installer/linux/debian/build.sh
 +++ b/chrome/installer/linux/debian/build.sh
 @@ -21,7 +21,7 @@ gen_changelog() {
@@ -38,7 +38,7 @@ index c8e2130d81c95692c4298a6418f2bf00c78c4d5e..bdd0a2098752863de7fe20c635e9d97c
        grep '^ Depends: ' | sed 's/^ Depends: //' | sed 's/, /\n/g' | \
        LANG=C sort > "${ACTUAL_DEPENDS}"
    BAD_DIFF=0
-@@ -161,8 +161,11 @@ verify_channel() {
+@@ -160,8 +160,11 @@ verify_channel() {
        ;;
      dev|unstable|alpha )
        CHANNEL=unstable
@@ -50,7 +50,7 @@ index c8e2130d81c95692c4298a6418f2bf00c78c4d5e..bdd0a2098752863de7fe20c635e9d97c
      * )
        echo
        echo "ERROR: '$CHANNEL' is not a valid channel type."
-@@ -170,6 +173,7 @@ verify_channel() {
+@@ -169,6 +172,7 @@ verify_channel() {
        exit 1
        ;;
    esac
@@ -58,9 +58,9 @@ index c8e2130d81c95692c4298a6418f2bf00c78c4d5e..bdd0a2098752863de7fe20c635e9d97c
  }
  
  process_opts() {
-@@ -253,6 +257,17 @@ fi
+@@ -248,6 +252,17 @@ fi
  eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \
-   "${BUILDDIR}/installer/theme/BRANDING")
+   "${OUTPUTDIR}/installer/theme/BRANDING")
  
 +PACKAGEANDCHANNEL="${PACKAGE}-${CHANNEL}"
 +if [ "$CHANNEL" = "unstable" ]; then
@@ -76,7 +76,7 @@ index c8e2130d81c95692c4298a6418f2bf00c78c4d5e..bdd0a2098752863de7fe20c635e9d97c
  verify_channel
  
  # Some Debian packaging tools want these set.
-@@ -266,6 +281,10 @@ COMMON_PREDEPS="dpkg (>= 1.14.0)"
+@@ -261,6 +276,10 @@ COMMON_PREDEPS="dpkg (>= 1.14.0)"
  MANUAL_RECOMMENDS="${SCRIPTDIR}/manual_recommends"
  COMMON_RECOMMENDS=$(grep -v ^$ "${MANUAL_RECOMMENDS}" | grep -v ^# |
                          sed ':a;N;$!ba;s/\n/, /g')
diff --git a/patches/chrome-installer-linux-rpm-build.sh.patch b/patches/chrome-installer-linux-rpm-build.sh.patch
index 5f6b772d4afe..553501c5b4aa 100644
--- a/patches/chrome-installer-linux-rpm-build.sh.patch
+++ b/patches/chrome-installer-linux-rpm-build.sh.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh
-index 8e9c7e56813d8791c46fa28c866e67dbde03e60a..0c433285add2b2dbfd06bb2fdcca0a81a07d39be 100755
+index 9df8cebcd39d38088b94ff2f364aa31472bfe038..294af1e03e3f7a2467bdcd6161049e48e7b09238 100755
 --- a/chrome/installer/linux/rpm/build.sh
 +++ b/chrome/installer/linux/rpm/build.sh
 @@ -15,8 +15,9 @@ gen_spec() {
@@ -15,7 +15,7 @@ index 8e9c7e56813d8791c46fa28c866e67dbde03e60a..0c433285add2b2dbfd06bb2fdcca0a81
      local MENUNAME="${MENUNAME} (${CHANNEL})"
 @@ -87,6 +88,12 @@ do_package() {
    PROVIDES="${PACKAGE}"
-   RPM_COMMON_DEPS="${BUILDDIR}/rpm_common.deps"
+   RPM_COMMON_DEPS="${OUTPUTDIR}/rpm_common.deps"
    DEPENDS=$(cat "${RPM_COMMON_DEPS}" | tr '\n' ',')
 +
 +  # Ensure that our signing key is up-to-date (brave/brave-browser#4205).
@@ -38,7 +38,7 @@ index 8e9c7e56813d8791c46fa28c866e67dbde03e60a..0c433285add2b2dbfd06bb2fdcca0a81
    mv "$RPMBUILD_DIR/RPMS/$ARCHITECTURE/${PKGNAME}.${ARCHITECTURE}.rpm" \
       "${OUTPUTDIR}"
    # Make sure the package is world-readable, otherwise it causes problems when
-@@ -145,7 +155,10 @@ verify_channel() {
+@@ -144,7 +154,10 @@ verify_channel() {
        CHANNEL=stable
        ;;
      unstable|dev|alpha )
diff --git a/patches/chrome-installer-mac-signing-pipeline.py.patch b/patches/chrome-installer-mac-signing-pipeline.py.patch
index 27b897477eec..2aca1a8fdf20 100644
--- a/patches/chrome-installer-mac-signing-pipeline.py.patch
+++ b/patches/chrome-installer-mac-signing-pipeline.py.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/mac/signing/pipeline.py b/chrome/installer/mac/signing/pipeline.py
-index ecca8aa75bcbd7774414e777b4f573c0f3ad9a72..5d925e0daf64012da0aa29fddd6424596f4c4095 100644
+index 95ef978f5f1189a91a13040735c22f0b6b6a0f4c..c306a5596f06357eb7c9329ec9e2fcca3bdf4e79 100644
 --- a/chrome/installer/mac/signing/pipeline.py
 +++ b/chrome/installer/mac/signing/pipeline.py
-@@ -522,5 +522,8 @@ def sign_all(orig_paths,
+@@ -559,5 +559,8 @@ def sign_all(orig_paths,
                          uuids_to_package_path.keys(), config):
                      package_path = uuids_to_package_path[result]
                      notarize.staple(package_path)
diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch
index 1bd3f8ed4ca4..f8517330d8ac 100644
--- a/patches/chrome-renderer-BUILD.gn.patch
+++ b/patches/chrome-renderer-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
-index 9b93e72eee7b41587f7e7c63a8797e8ed2b98f1d..5dd5924462094517cb2a3e364c1bb73e5e8889fe 100644
+index 88cbad65b714c264344728d903e89ed1eff9d671..bd57882c9b65362367eae648459907ebe40cd965 100644
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -127,6 +127,7 @@ jumbo_static_library("renderer") {
+@@ -129,6 +129,7 @@ jumbo_static_library("renderer") {
    defines = []
  
    deps = [
diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch
index 732566c43af1..b7e7a7c80d75 100644
--- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch
+++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
-index 42383cda5a9ccb39e64ee65d0202bee60639623f..81b57564c40c7c6fbd1ec0b2464ff3fa92460c21 100644
+index b96048aec4f7d58438a5b08d688756d8c639a6fc..2a69290a211d6d951975705122e539619c16f2ba 100644
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
 @@ -23,6 +23,7 @@
@@ -10,7 +10,7 @@ index 42383cda5a9ccb39e64ee65d0202bee60639623f..81b57564c40c7c6fbd1ec0b2464ff3fa
  #include "chrome/common/buildflags.h"
  #include "chrome/common/channel_info.h"
  #include "chrome/common/chrome_content_client.h"
-@@ -469,7 +470,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -471,7 +472,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
    bool should_whitelist_for_content_settings =
        base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kInstantProcess);
diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch
index 653a5932118a..c46923061017 100644
--- a/patches/chrome-renderer-chrome_content_renderer_client.h.patch
+++ b/patches/chrome-renderer-chrome_content_renderer_client.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
-index 8969adb44800e925c9066e51793463c09eb78622..27e189b6fb21ee994a54d520a739500a9890f2a6 100644
+index c210526bfedc468dd6ba314e337aaae46154de01..e4e2f088c187c271e669fdbc88e6725258cf96ae 100644
 --- a/chrome/renderer/chrome_content_renderer_client.h
 +++ b/chrome/renderer/chrome_content_renderer_client.h
-@@ -225,6 +225,7 @@ class ChromeContentRendererClient
+@@ -227,6 +227,7 @@ class ChromeContentRendererClient
  #endif
  
   private:
diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
index ad4ad8490a82..e187bb1cb6eb 100644
--- a/patches/chrome-test-BUILD.gn.patch
+++ b/patches/chrome-test-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 1ae616e652ba6f7cb81b5be2d07b033a80b2a7fe..dcef638e1f6e04c3e3d35fd91941c5b5707a769b 100644
+index 2bce2f66a1ec9c08ec6ae043239042c856c920db..ff609cb828f2b58436df7a8975b8ece20460527d 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -732,6 +732,7 @@ if (!is_android) {
diff --git a/patches/components-dom_distiller-content-browser-distiller_page_web_contents.cc.patch b/patches/components-dom_distiller-content-browser-distiller_page_web_contents.cc.patch
index 4d446a7fed09..dd42db981230 100644
--- a/patches/components-dom_distiller-content-browser-distiller_page_web_contents.cc.patch
+++ b/patches/components-dom_distiller-content-browser-distiller_page_web_contents.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/dom_distiller/content/browser/distiller_page_web_contents.cc b/components/dom_distiller/content/browser/distiller_page_web_contents.cc
-index c9f3501934893336d623c7df3c86b3e6bed09011..fc209c4119e70cdffa35b56f0cc59d247b025ba2 100644
+index 334896b125a156f774a9ebfe9931ba0ae53e917a..966fb47c0f8b99305a88fe725dedea48c47817c4 100644
 --- a/components/dom_distiller/content/browser/distiller_page_web_contents.cc
 +++ b/components/dom_distiller/content/browser/distiller_page_web_contents.cc
 @@ -170,7 +170,9 @@ void DistillerPageWebContents::ExecuteJavaScript() {
diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch
index 08ebebe9a912..b51bb5846ef9 100644
--- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch
+++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
-index e2070029a60a26fe536af663cceb730313cb62d7..f7adcb7fe9907787b9539f7b438bee62a8f2013c 100644
+index 08378fa7e62851fe1120fa1eccef5fed253ef92c..671a68d54255d6af34a864b007751a68337bb92e 100644
 --- a/components/omnibox/browser/autocomplete_controller.cc
 +++ b/components/omnibox/browser/autocomplete_controller.cc
 @@ -238,6 +238,7 @@ AutocompleteController::AutocompleteController(
diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
index b48076c3e7d2..08932d233c01 100644
--- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
+++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
-index 87768d8c7cc22fb5a909331e61ff4f80b6d28489..1ad724ba4ec84c653477fec6df16adc2b432e830 100644
+index 1b1277ceaf63dcd9521f1da541e02455d441b8a6..60fb9f272e8c2a2da56f455a64cb4f985527ed48 100644
 --- a/components/omnibox/browser/omnibox_edit_model.cc
 +++ b/components/omnibox/browser/omnibox_edit_model.cc
 @@ -386,6 +386,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch
index 8b7c18e2682b..4b497a008c39 100644
--- a/patches/components-page_info-page_info.cc.patch
+++ b/patches/components-page_info-page_info.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
-index 8c34cb80e20be2926d16dd1522c62ed48c3840ce..29637cef4a19b68a80a0548a7de0a0b813629404 100644
+index 8c5b787f8b34fb38b8f48a4a061dc2adf9819a38..a71b9ac1dfbdab856fe74f891532edfc71815515 100644
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -948,6 +948,7 @@ void PageInfo::PresentSitePermissions() {
+@@ -926,6 +926,7 @@ void PageInfo::PresentSitePermissions() {
  
      // TODO(crbug.com/1058597): Remove the call to |delegate_| once
      // TabSpecificContentSettings has been componentized.
diff --git a/patches/components-permissions-permission_request.h.patch b/patches/components-permissions-permission_request.h.patch
index 46ba065616ae..905505691108 100644
--- a/patches/components-permissions-permission_request.h.patch
+++ b/patches/components-permissions-permission_request.h.patch
@@ -1,5 +1,5 @@
 diff --git a/components/permissions/permission_request.h b/components/permissions/permission_request.h
-index 6e8dbb8bd7652c66b5f65361e57920586d76595e..60f4196592e690ae037a2a00faee113e3e3ac05e 100644
+index 35beab0f165d48b58ace6c0bdc4a3727c57ea7ed..7a0618c4f1a63e3a447ec772a918c41466738127 100644
 --- a/components/permissions/permission_request.h
 +++ b/components/permissions/permission_request.h
 @@ -54,6 +54,7 @@ enum class PermissionRequestType {
diff --git a/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch b/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch
index cd4e63ba84bc..86817380f9ae 100644
--- a/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch
+++ b/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/sync_bookmarks/bookmark_remote_updates_handler.cc b/components/sync_bookmarks/bookmark_remote_updates_handler.cc
-index 500e604acdf5e94883176726e029105445114b43..9c433804be2faf468f89ca337c03301c7b9f3e62 100644
+index 8d1261102edafd134480f4685a9d55a922657f8c..7774853567cea0b1e12c92fb56024bd3402236c6 100644
 --- a/components/sync_bookmarks/bookmark_remote_updates_handler.cc
 +++ b/components/sync_bookmarks/bookmark_remote_updates_handler.cc
 @@ -150,6 +150,7 @@ void ApplyRemoteUpdate(
diff --git a/patches/content-browser-frame_host-navigation_request.cc.patch b/patches/content-browser-frame_host-navigation_request.cc.patch
index 2021070a0671..0c0dd4771858 100644
--- a/patches/content-browser-frame_host-navigation_request.cc.patch
+++ b/patches/content-browser-frame_host-navigation_request.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
-index 797feb485fafc9d9c1d130e9052669ff93ab92ca..57c75ac1d41a760d3f3460a62dd662b18ef1dd34 100644
+index f0b9f9634264e9073f22560903307332986df2fe..1fc048f5f501eb5077624864baa636e20ef74fa7 100644
 --- a/content/browser/frame_host/navigation_request.cc
 +++ b/content/browser/frame_host/navigation_request.cc
-@@ -2360,6 +2360,7 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -2365,6 +2365,7 @@ void NavigationRequest::OnStartChecksComplete(
    headers.MergeFrom(TakeModifiedRequestHeaders());
    begin_params_->headers = headers.ToString();
  
diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch
index c7ca431adabd..178edf3d48a5 100644
--- a/patches/content-renderer-render_thread_impl.cc.patch
+++ b/patches/content-renderer-render_thread_impl.cc.patch
@@ -1,13 +1,12 @@
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index bb9c821d210e0ddb55c0f97f837e5d7500d17d64..3a95c718cd27f5f9c73f3731ac46e9b49c186f8f 100644
+index 76176518dfe4a04f1e96add7af49a50e6576d19d..51823083a9dc812bf172a9756bec681f3f07b13e 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1042,6 +1042,14 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) {
+@@ -1041,6 +1041,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) {
  }
  
  void RenderThreadImpl::RegisterSchemes() {
 +  REGISTER_BRAVE_SCHEMES_DISPLAY_ISOLATED_AND_NO_JS
-+
    // chrome:
    WebString chrome_scheme(WebString::FromASCII(kChromeUIScheme));
    WebSecurityPolicy::RegisterURLSchemeAsDisplayIsolated(chrome_scheme);
diff --git a/patches/devtools-frontend-src/tsconfig.base.json.patch b/patches/devtools-frontend-src/tsconfig.base.json.patch
index 60a324e1f7df..571447e042e3 100644
--- a/patches/devtools-frontend-src/tsconfig.base.json.patch
+++ b/patches/devtools-frontend-src/tsconfig.base.json.patch
@@ -1,9 +1,9 @@
 diff --git a/tsconfig.base.json b/tsconfig.base.json
-index a88f49eaa993afe3a7408bc2f34a1b3f7f3909d1..c0c4d7f2660a9d760dbd7dd17841df42fc7990cb 100644
+index 12f9d08bd723333a00e2d7c36357bbe1cf164ade..8019e1b0f586fd36c65fb993de4a6986c84b6306 100644
 --- a/tsconfig.base.json
 +++ b/tsconfig.base.json
-@@ -8,6 +8,7 @@
-     },
+@@ -5,6 +5,7 @@
+     "baseUrl": ".",
      "checkJs": true,
      "allowJs": true,
 +    "moduleResolution": "node",
diff --git a/patches/extensions-browser-BUILD.gn.patch b/patches/extensions-browser-BUILD.gn.patch
index bcccfeede6bf..00d7b79f3db2 100644
--- a/patches/extensions-browser-BUILD.gn.patch
+++ b/patches/extensions-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn
-index 33f4dd833fe9f2d2d8fb328088e5a7a79342d333..f157c69e4139653951a7d979357238efd4b6e637 100644
+index 14c3482694382b40009e2dc82eef51d3aa411885..b5b5d36646c29932495f0d32b935cc003e88c72d 100644
 --- a/extensions/browser/BUILD.gn
 +++ b/extensions/browser/BUILD.gn
-@@ -403,6 +403,7 @@ jumbo_source_set("browser_sources") {
+@@ -405,6 +405,7 @@ jumbo_source_set("browser_sources") {
      "//third_party/blink/public/mojom/frame",
      "//ui/display",
    ]
diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch
index e20b07323f5b..7757f72073de 100644
--- a/patches/net-BUILD.gn.patch
+++ b/patches/net-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/net/BUILD.gn b/net/BUILD.gn
-index 5d3272d42790c1e7c34f0dce04421d072a56f62e..e237d5718304b8ee525187a2469242cc86bdba45 100644
+index dd1fe1f4a35a9a20929baa7f948fd3bb301ad1e7..3ce48cfb7280f363d5e465208491b2918c63ed36 100644
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1178,6 +1178,7 @@ component("net") {
+@@ -1180,6 +1180,7 @@ component("net") {
          "reporting/reporting_uploader.h",
        ]
      }
diff --git a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
index 5c7d536d960b..93aa9badf5a5 100644
--- a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
+++ b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc
-index ae0a8be74bd8cca3999372b297859b0b9353fa6a..33641d7a0f8859dde5026967c37d9acdbabc1f30 100644
+index 40da0994616bf8bc1e1aa58cebc0871a6ee6f4f1..27f29b0811039f7c701b25fd25e71ddc4a051c2f 100644
 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc
 +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc
-@@ -1048,6 +1048,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously(
+@@ -1045,6 +1045,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously(
    config_->value().proxy_rules().Apply(url, result);
    result->set_traffic_annotation(
        MutableNetworkTrafficAnnotationTag(config_->traffic_annotation()));
diff --git a/patches/net-url_request-url_request_http_job.cc.patch b/patches/net-url_request-url_request_http_job.cc.patch
index f4d2e9a91ec1..72da19ccf2c9 100644
--- a/patches/net-url_request-url_request_http_job.cc.patch
+++ b/patches/net-url_request-url_request_http_job.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
-index c57348b4a12e894931f5e4aac22a3184ab0b8140..c6bd2b866aea7485c87c44007232c6cd80066fc9 100644
+index 221d7cd946d427ce66827bea58e3627371d87269..3a6b1f8bf6136f25019558c1262195dd9dd8de32 100644
 --- a/net/url_request/url_request_http_job.cc
 +++ b/net/url_request/url_request_http_job.cc
-@@ -711,6 +711,7 @@ void URLRequestHttpJob::SaveCookiesAndNotifyHeadersComplete(int result) {
+@@ -712,6 +712,7 @@ void URLRequestHttpJob::SaveCookiesAndNotifyHeadersComplete(int result) {
      num_cookie_lines_left_++;
  
      std::unique_ptr<CanonicalCookie> cookie = net::CanonicalCookie::Create(
diff --git a/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch b/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch
index 764c5eaebb70..7add450db301 100644
--- a/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch
+++ b/patches/services-service_manager-sandbox-win-sandbox_win.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/services/service_manager/sandbox/win/sandbox_win.cc b/services/service_manager/sandbox/win/sandbox_win.cc
-index a4ac5af2494529e11e5605c8cae8166e1b92900c..b1b84409f02d1c4cee65ef64b41b853650b5be3c 100644
+index c369dde347581bc2c0f4a492bf510e84dcde4f4a..af2ed58271c95da713431ba49c854f97921ba92b 100644
 --- a/services/service_manager/sandbox/win/sandbox_win.cc
 +++ b/services/service_manager/sandbox/win/sandbox_win.cc
 @@ -873,6 +873,7 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess(
diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch
index 58ea4b196b3d..41e24f90f3bc 100644
--- a/patches/third_party-blink-renderer-core-BUILD.gn.patch
+++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
-index 857287b7788431f07c6f972dfbbec96526f8491d..e32924dc327556a15485f641e79bfaad710bf9ac 100644
+index e9ef6e2aca7f9eb868b00fe4732ec10403a9a769..b53d766383485e6bb8b9b640383945de382b1fd7 100644
 --- a/third_party/blink/renderer/core/BUILD.gn
 +++ b/third_party/blink/renderer/core/BUILD.gn
 @@ -146,6 +146,7 @@ component("core") {
diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch
index 86dc0b39a2a6..6f8ac2cf002b 100644
--- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch
+++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn
-index f196baad1b8fd2b30ae05bac61f95f5d5a05bd2b..05fd1a63c8b7e63eb58ae1d38d41768397f134d2 100644
+index 054d8fe06d574b292187225821adcf05db7def1d..fbfc76daa3ec58a958036d625f82e5f9149c3fc9 100644
 --- a/third_party/blink/renderer/modules/BUILD.gn
 +++ b/third_party/blink/renderer/modules/BUILD.gn
 @@ -16,6 +16,7 @@ if (is_android) {
diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
index 1a6546fc91c3..4afe87947e27 100644
--- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
+++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-index 3eed73aeee84d6f5ea7025aa41a2358c44764ba3..9aa7479d92f73866094af68bf9e20bc9b1dd08cb 100644
+index 074bb39bb45d850993022204081d3b3e06ad64e7..dddcd8880782b903759613222ff19957228e9011 100644
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-@@ -1549,6 +1549,7 @@ ImageData* BaseRenderingContext2D::createImageData(
+@@ -1550,6 +1550,7 @@ ImageData* BaseRenderingContext2D::createImageData(
  }
  
  ImageData* BaseRenderingContext2D::getImageData(
@@ -10,7 +10,7 @@ index 3eed73aeee84d6f5ea7025aa41a2358c44764ba3..9aa7479d92f73866094af68bf9e20bc9
      int sx,
      int sy,
      int sw,
-@@ -1626,6 +1627,7 @@ ImageData* BaseRenderingContext2D::getImageData(
+@@ -1627,6 +1628,7 @@ ImageData* BaseRenderingContext2D::getImageData(
      return nullptr;
    }
  
diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch
index 820355d90fd1..10301a41f5ee 100644
--- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch
+++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h
-index dbd5ac79a3b0f5c2a5fd3a9300e26fb02db51a5f..3616da537f077cef4a5f102c306fc14ea1f70528 100644
+index 9fd5cb6cb4835b4f42ca1d8c3c90fd4a34623ac7..939dbd47fea6ebc23ac3b438aa0ad8d0c5014a91 100644
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h
 @@ -195,7 +195,7 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin,
diff --git a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
index 46064f5551c7..08cb058fcf96 100644
--- a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
+++ b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc
-index 40a9642a4160877f3d79dc55cfe5181fecb0049d..cc0e54c48722b2bbf6dc515c39db27a60580c811 100644
+index 1fc3e9ae1c57f287fb7badb80b915ba8703c6da4..d8ea07ec461d4ec20d1b5a4650789f141527f577 100644
 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
 +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
 @@ -6,6 +6,7 @@
@@ -10,7 +10,7 @@ index 40a9642a4160877f3d79dc55cfe5181fecb0049d..cc0e54c48722b2bbf6dc515c39db27a6
  #include "mojo/public/cpp/bindings/remote.h"
  #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
  #include "third_party/blink/public/platform/task_type.h"
-@@ -74,6 +75,9 @@ ScriptPromise MediaDevices::enumerateDevices(ScriptState* script_state,
+@@ -76,6 +77,9 @@ ScriptPromise MediaDevices::enumerateDevices(ScriptState* script_state,
                                        "Current frame is detached.");
      return ScriptPromise();
    }
diff --git a/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch b/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
index a1e39e8a3c43..42f259926ea6 100644
--- a/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
+++ b/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
-index 602d2ba03552486bd98df91e104491dc16d6f372..34d9ccc1b3c3ea3708be65a29ec92d86e457d693 100644
+index f48333f3b0c9a078b675c6e1881fd57656904f23..8553317f0d1ca4f1787f4f2bd9e054937d458b8b 100644
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
 @@ -837,6 +837,7 @@ void RTCPeerConnection::Dispose() {
diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch
index 66600e3ad8a6..92e2f67dea2c 100644
--- a/patches/tools-metrics-histograms-histograms.xml.patch
+++ b/patches/tools-metrics-histograms-histograms.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
-index 0f32999e3d19506893a35fc1b7c6de13a896275a..fe8fb0190c5d8ce98d05489c0b2819e8555677f4 100644
+index b547b9843e83c5c2a360a922f2bb7d2a1734e923..521fcccac256235d7d35262be8dc42d1b1a900ed 100644
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -194650,6 +194650,7 @@ regressions. -->
+@@ -196087,6 +196087,7 @@ regressions. -->
    <suffix name="ProtectedMedia" label="Protected media permission"/>
    <suffix name="PushMessaging" label="Push messaging permission"/>
    <suffix name="Quota" label="Quota permission"/>
diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch
index dbbe0f83e1c8..6baa81f0ff19 100644
--- a/patches/ui-base-BUILD.gn.patch
+++ b/patches/ui-base-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 144c55943f23294ae83db483206dd5afe23d4128..421200eea4664924bce95b27102ea966428f7f7c 100644
+index 33be56acd4411a61d666c06049c10d11fb7fd10a..d3d4f2fe590b514a46e39238d701c070340370d0 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
 @@ -447,6 +447,7 @@ jumbo_component("base") {

From b4f2b64144d18c99b03ee792eab8bdf66dfa6728 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 15 Apr 2020 16:36:49 -0400
Subject: [PATCH 074/161] Conflict-resolved patches from Chromium 83.0.4100.3
 to Chromium 83.0.4103.14.

---
 ...ble-permission_prompt_bubble_view.cc.patch |  8 +++---
 ...aller-linux-common-installer.include.patch | 26 +++++++++----------
 patches/tools-licenses.py.patch               | 22 ++++++++--------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch
index 7613a521644c..a0697ff163bf 100644
--- a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch
+++ b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
-index d27ebe2d566c0060abf558d943e18647f39326f2..1073940539d80092a153907ad121e01db4bc273a 100644
+index 2f835a9cd6a844ec4358b5f89aaa2a8734ab3bcd..b0ee2ccc60bed3ac3e90e03ba523f67f91a84c0f 100644
 --- a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
 +++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc
-@@ -72,6 +72,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
+@@ -73,6 +73,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView(
  
    for (permissions::PermissionRequest* request : delegate_->Requests())
      AddPermissionRequestLine(request);
 +  AddAdditionalWidevineViewControlsIfNeeded(this, delegate_->Requests());
+ }
  
-   Show();
- 
+ void PermissionPromptBubbleView::Show() {
diff --git a/patches/chrome-installer-linux-common-installer.include.patch b/patches/chrome-installer-linux-common-installer.include.patch
index 7901d213a89b..071e938db12e 100644
--- a/patches/chrome-installer-linux-common-installer.include.patch
+++ b/patches/chrome-installer-linux-common-installer.include.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
-index e6bc6fea7e6fb244fd01b05f1f63fb66c216b5e3..abdc0290c5497f93ea71369aaf2a63b030727b1c 100644
+index f73118e19e420f1a59248508102e005adf8d72d2..1861082212188bf3abc0d47dbf091f37ad439386 100644
 --- a/chrome/installer/linux/common/installer.include
 +++ b/chrome/installer/linux/common/installer.include
 @@ -75,6 +75,7 @@ process_template() (
@@ -7,36 +7,36 @@ index e6bc6fea7e6fb244fd01b05f1f63fb66c216b5e3..abdc0290c5497f93ea71369aaf2a63b0
      -e "s#@@PACKAGE_ORIG@@#${PACKAGE_ORIG}#g" \
      -e "s#@@PACKAGE_FILENAME@@#${PACKAGE_FILENAME}#g" \
 +    -e "s#@@PACKAGEANDCHANNEL@@#${PACKAGEANDCHANNEL}#g" \
+     -e "s#@@SNAPNAME@@#${SNAPNAME}#g" \
      -e "s#@@PROGNAME@@#${PROGNAME}#g" \
      -e "s#@@CHANNEL@@#${CHANNEL}#g" \
-     -e "s#@@COMPANY_FULLNAME@@#${COMPANY_FULLNAME}#g" \
-@@ -161,6 +162,25 @@ stage_install_common() {
-     install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
+@@ -162,6 +163,25 @@ stage_install_common() {
+     install -m 644 "${OUTPUTDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
    fi
  
 +  # brave_resources.pak, contains customization, shields
-+  install -m 644 "${BUILDDIR}/brave_resources.pak" "${STAGEDIR}/${INSTALLDIR}/"
++  install -m 644 "${OUTPUTDIR}/brave_resources.pak" "${STAGEDIR}/${INSTALLDIR}/"
 +
 +  # brave_[100|200]_resources.pak for scaled resources
-+  install -m 644 "${BUILDDIR}/brave_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
-+  install -m 644 "${BUILDDIR}/brave_200_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
++  install -m 644 "${OUTPUTDIR}/brave_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
++  install -m 644 "${OUTPUTDIR}/brave_200_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
 +
 +  # localization files for Brave extension
 +  install -d -m 755 "${STAGEDIR}/${INSTALLDIR}/resources/brave_extension/_locales"
-+  cp -a "${BUILDDIR}/resources/brave_extension/_locales" "${STAGEDIR}/${INSTALLDIR}/resources/brave_extension"
++  cp -a "${OUTPUTDIR}/resources/brave_extension/_locales" "${STAGEDIR}/${INSTALLDIR}/resources/brave_extension"
 +  find "${STAGEDIR}/${INSTALLDIR}/resources/brave_extension/_locales" -type f -exec chmod 644 '{}' \;
 +  find "${STAGEDIR}/${INSTALLDIR}/resources/brave_extension/_locales" -type d -exec chmod 755 '{}' \;
 +
 +  # localization files for Brave Rewards
 +  install -d -m 755 "${STAGEDIR}/${INSTALLDIR}/resources/brave_rewards/_locales"
-+  cp -a "${BUILDDIR}/resources/brave_rewards/_locales" "${STAGEDIR}/${INSTALLDIR}/resources/brave_rewards"
++  cp -a "${OUTPUTDIR}/resources/brave_rewards/_locales" "${STAGEDIR}/${INSTALLDIR}/resources/brave_rewards"
 +  find "${STAGEDIR}/${INSTALLDIR}/resources/brave_rewards/_locales" -type f -exec chmod 644 '{}' \;
 +  find "${STAGEDIR}/${INSTALLDIR}/resources/brave_rewards/_locales" -type d -exec chmod 755 '{}' \;
 +
    # ICU data file; Necessary when the GN icu_use_data_file flag is true.
-   install -m 644 "${BUILDDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/"
+   install -m 644 "${OUTPUTDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/"
  
-@@ -283,11 +303,13 @@ stage_install_common() {
+@@ -288,11 +308,13 @@ stage_install_common() {
  
    # app icons
    local icon_regex=".*product_logo_[0-9]\+\."
@@ -51,8 +51,8 @@ index e6bc6fea7e6fb244fd01b05f1f63fb66c216b5e3..abdc0290c5497f93ea71369aaf2a63b0
 +      icon_regex=".*product_logo_[0-9]\+_nightly\."
      fi
    fi
-   LOGO_RESOURCES_PNG=$(find "${BUILDDIR}/installer/theme/" \
-@@ -395,6 +417,8 @@ stage_install_common() {
+   LOGO_RESOURCES_PNG=$(find "${OUTPUTDIR}/installer/theme/" \
+@@ -400,6 +422,8 @@ stage_install_common() {
        local expected_perms=644
      elif [[ "${file_type}" = *"shell script"* ]]; then
        local expected_perms=755
diff --git a/patches/tools-licenses.py.patch b/patches/tools-licenses.py.patch
index aa2daffd096f..9ca6c855aafd 100644
--- a/patches/tools-licenses.py.patch
+++ b/patches/tools-licenses.py.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/licenses.py b/tools/licenses.py
-index feeaf77aaec383c8708da10c39186dc3758ca9e1..c45d66caa60ac7033314dac79f486a6ba15b469f 100755
+index b61ee97f416f564f8324bbca90bd9d9c8a67f6fa..8752a6438ab7e84cdfe59b6c8b1b6a4f8c84ef55 100755
 --- a/tools/licenses.py
 +++ b/tools/licenses.py
 @@ -35,6 +35,7 @@ else:
@@ -18,17 +18,17 @@ index feeaf77aaec383c8708da10c39186dc3758ca9e1..c45d66caa60ac7033314dac79f486a6b
  
  # Special value for 'License File' field used to indicate that the license file
  # should not be used in about:credits.
-@@ -481,7 +483,8 @@ def FindThirdPartyDirs(prune_paths, root):
-       if skip in dirs:
-         dirs.remove(skip)
+@@ -479,7 +481,8 @@ def FindThirdPartyDirs(prune_paths, root):
+             if skip in dirs:
+                 dirs.remove(skip)
  
--    if os.path.basename(path) == 'third_party':
-+    if (os.path.basename(path) == 'third_party' or
-+        os.path.basename(path) in BRAVE_THIRD_PARTY_DIRS):
-       # Add all subdirectories that are not marked for skipping.
-       for dir in dirs:
-         dirpath = os.path.join(path, dir)
-	@@ -663,7 +666,8 @@ def GenerateCredits(
+-        if os.path.basename(path) == 'third_party':
++        if (os.path.basename(path) == 'third_party' or
++            os.path.basename(path) in BRAVE_THIRD_PARTY_DIRS):
+             # Add all subdirectories that are not marked for skipping.
+             for dir in dirs:
+                 dirpath = os.path.join(path, dir)
+@@ -663,7 +666,8 @@ def GenerateCredits(
      for path in third_party_dirs:
          try:
              metadata = ParseDir(path, _REPOSITORY_ROOT)

From 484c86b0e69c4f209feafe72c80993f73ac897e8 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 15 Apr 2020 16:04:34 -0400
Subject: [PATCH 075/161] [Android] HomepageManager moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/1be6a9e57fef1601646f8528d6c466f92cb32b39

commit 1be6a9e57fef1601646f8528d6c466f92cb32b39
Author: Wenyu Fu <wenyufu@google.com>
Date:   Thu Apr 2 16:40:08 2020 +0000

    Decouple browser.homepage and browser.partnercustomizations

    Bug: 1052060
---
 .../settings/homepage/BraveHomepageSettings.java       |  2 +-
 .../chrome/browser/toolbar/BraveHomeButton.java        |  2 +-
 .../toolbar/bottom/BraveBottomToolbarCoordinator.java  |  2 +-
 ...chrome-browser-homepage-HomepageManager.java.patch} | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-partnercustomizations-HomepageManager.java.patch => chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch} (53%)

diff --git a/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java b/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java
index e6a81c124ac3..57866ed0950a 100644
--- a/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java
+++ b/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java
@@ -7,7 +7,7 @@
 
 import android.os.Bundle;
 
-import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
+import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
 import org.chromium.chrome.browser.settings.homepage.HomepageSettings;
 
diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java b/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java
index c7b4390ac83c..dc49d5b699ab 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java
@@ -12,7 +12,7 @@
 import android.util.AttributeSet;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
+import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.tab.Tab;
 
 /**
diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java
index c97fd3edd06f..0c62d0f5fde7 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java
@@ -20,7 +20,7 @@
 import org.chromium.chrome.browser.ThemeColorProvider;
 import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
-import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
+import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.toolbar.HomeButton;
 import org.chromium.chrome.browser.toolbar.IncognitoStateProvider;
 import org.chromium.chrome.browser.toolbar.TabCountProvider;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-partnercustomizations-HomepageManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch
similarity index 53%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-partnercustomizations-HomepageManager.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch
index b94f168a9c0f..c142402208ce 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-partnercustomizations-HomepageManager.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch
@@ -1,8 +1,8 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-index 8aa5832190e8a11fbcb69eb570c8e7b15544f0f6..d390de93cd81bd90a3086bdee7aa2e4032025ef4 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-@@ -104,8 +104,9 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
+index 5996580300f23c8de81558180906040980e0ac8f..65836f633a77264d0ac1af57f8dc4b59801d6e26 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
+@@ -105,8 +105,9 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
       * @return Whether to close the app when the user has zero tabs.
       */
      public static boolean shouldCloseAppWithZeroTabs() {

From 81e7b8ed12113def5fd6658a13498e6c3e56ef84 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 15 Apr 2020 16:14:47 -0400
Subject: [PATCH 076/161] [Android] Homepage Settings moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/9539c5c3af1b6e9c524db96e9cc11ab61f420ccb

commit 9539c5c3af1b6e9c524db96e9cc11ab61f420ccb
Author: Wenyu Fu <wenyufu@chromium.org>
Date:   Wed Apr 1 17:46:56 2020 +0000

    Reland "Move settings.homepage to homepage"

    This reverts commit e6de1039950b1fd5cfef266370a9d3f3989fbbf9.

    Reason for revert: The crash was caused by a xml text failure. The original change also delete one of the test file unintentionally. A fix will be update as a patch set of this CL.

    Original change's description:
    > Revert "Move settings.homepage to homepage"
    >
    > This reverts commit e2054b9b309dad3fc8b526fe7ba2a57037c2b661.
    >
    > Reason for revert: this CL cause crashing. Tracked in crbug.com/1062959
    >
    > Original change's description:
    > > Move settings.homepage to homepage
    > >
    > > Moving Homepage related settings code to homepage.settings package
    > >
    > > Change-Id: Iaf198f4a25cc03b32a1de997577d466916470437
    > > Bug: 1052060
    > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095468
    > > Commit-Queue: Wenyu Fu <wenyufu@chromium.org>
    > > Reviewed-by: Theresa  <twellington@chromium.org>
    > > Cr-Commit-Position: refs/heads/master@{#751162}
    >
    > TBR=twellington@chromium.org,wychen@chromium.org,wenyufu@chromium.org
    >
    > # Not skipping CQ checks because original CL landed > 1 day ago.
    >
    > Bug: 1052060
---
 android/brave_java_sources.gni                            | 2 +-
 .../settings}/BraveHomepageSettings.java                  | 2 +-
 .../chrome/browser/settings/BraveMainPreferencesBase.java | 2 +-
 ...browser-homepage-settings-HomepageSettings.java.patch} | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename android/java/org/chromium/chrome/browser/{settings/homepage => homepage/settings}/BraveHomepageSettings.java (96%)
 rename patches/{chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch => chrome-android-java-src-org-chromium-chrome-browser-homepage-settings-HomepageSettings.java.patch} (55%)

diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
index 75f49276e684..7652f2fa31c7 100644
--- a/android/brave_java_sources.gni
+++ b/android/brave_java_sources.gni
@@ -36,6 +36,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java",
   "../../brave/android/java/org/chromium/chrome/browser/help/BraveHelpAndFeedback.java",
+  "../../brave/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationManagerProxyImpl.java",
@@ -105,7 +106,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java",
diff --git a/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java b/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java
similarity index 96%
rename from android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java
rename to android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java
index 57866ed0950a..39995039178e 100644
--- a/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java
+++ b/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.settings.homepage;
+package org.chromium.chrome.browser.homepage.settings;
 
 import android.os.Bundle;
 
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java
index 7ed1adaac0d0..26fb4b32b681 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java
@@ -21,12 +21,12 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveFeatureList;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.homepage.settings.BraveHomepageSettings;
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
 import org.chromium.chrome.browser.preferences.BravePref;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.privacy.settings.BravePrivacySettings;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
-import org.chromium.chrome.browser.settings.homepage.BraveHomepageSettings;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil;
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-settings-HomepageSettings.java.patch
similarity index 55%
rename from patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch
rename to patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-settings-HomepageSettings.java.patch
index 22382c54a9a7..c3b25526a3b2 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-settings-homepage-HomepageSettings.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-settings-HomepageSettings.java.patch
@@ -1,7 +1,7 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
-index fadfd3159018b2be5af4d039a3559f9a03e3c391..b1e43e4096cbbb9e819f7275c7547bc390e2b813 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
+index 417aeb8fb25fab9e8518710a73f4105af502e5b4..1426d137d76a23084064b10e46791215979be73a 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 @@ -28,7 +28,7 @@ import org.chromium.components.url_formatter.UrlFormatter;
  /**
   * Fragment that allows the user to configure homepage related preferences.

From 8204645cc2a9f9844d718f368fa325e3e4c861f0 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Sun, 19 Apr 2020 19:36:43 -0400
Subject: [PATCH 077/161] Use short file names in -imsvc includes on Windows.

The compilation command line is too long (exceeds 8,192 chars) for some
compile commands. This is an attempt to shorten it.

Also, turned down the verbosity of output.
---
 .../build-toolchain-win-setup_toolchain.py.patch    | 13 +++++++++++++
 script/redirect-cc.cmd                              |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 patches/build-toolchain-win-setup_toolchain.py.patch

diff --git a/patches/build-toolchain-win-setup_toolchain.py.patch b/patches/build-toolchain-win-setup_toolchain.py.patch
new file mode 100644
index 000000000000..4e61ee105afd
--- /dev/null
+++ b/patches/build-toolchain-win-setup_toolchain.py.patch
@@ -0,0 +1,13 @@
+diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py
+index 2ab240da454821965080c82899c382a57d674d80..3d4381a30486655965aebd84ee152dce939d1801 100644
+--- a/build/toolchain/win/setup_toolchain.py
++++ b/build/toolchain/win/setup_toolchain.py
+@@ -272,7 +272,7 @@ def main():
+       def q(s):  # Quote s if it contains spaces or other weird characters.
+         return s if re.match(r'^[a-zA-Z0-9._/\\:-]*$', s) else '"' + s + '"'
+       include_I = ' '.join([q('/I' + i) for i in include])
+-      include_imsvc = ' '.join([q('-imsvc' + i) for i in include])
++      import win32api; include_imsvc = ' '.join([q('-imsvc' + win32api.GetShortPathName(i)) for i in include])
+       libpath_flags = ' '.join([q('-libpath:' + i) for i in lib])
+ 
+       if (environment_block_name != ''):
diff --git a/script/redirect-cc.cmd b/script/redirect-cc.cmd
index 92770e91bf91..5f3422177f65 100644
--- a/script/redirect-cc.cmd
+++ b/script/redirect-cc.cmd
@@ -1 +1,2 @@
-python ..\..\brave\script\redirect-cc.py %*
+@ECHO OFF
+python ..\..\brave\script\redirect-cc.py %*

From 517c3e5ae15a1235beb10cbd720b1fff6c92fbdf Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 20 Apr 2020 10:26:47 -0400
Subject: [PATCH 078/161] Updated chrome_constants and url_constants overrides.

---
 chromium_src/chrome/common/chrome_constants.cc | 6 +-----
 chromium_src/chrome/common/url_constants.cc    | 9 +++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/chromium_src/chrome/common/chrome_constants.cc b/chromium_src/chrome/common/chrome_constants.cc
index 6a55109d5828..59172b1af553 100644
--- a/chromium_src/chrome/common/chrome_constants.cc
+++ b/chromium_src/chrome/common/chrome_constants.cc
@@ -176,6 +176,7 @@ const base::FilePath::CharType kSingletonSocketFilename[] =
 const base::FilePath::CharType kSupervisedUserSettingsFilename[] =
     FPL("Managed Mode Settings");
 const base::FilePath::CharType kThemePackFilename[] = FPL("Cached Theme.pak");
+const base::FilePath::CharType kTrustTokenFilename[] = FPL("Trust Tokens");
 const base::FilePath::CharType kWebAppDirname[] = FPL("Web Applications");
 // Only use if the ENABLE_REPORTING build flag is true
 const base::FilePath::CharType kReportingAndNelStoreFilename[] =
@@ -202,11 +203,6 @@ const wchar_t kUserDataDirname[] = L"User Data";
 
 const float kMaxShareOfExtensionProcesses = 0.30f;
 
-#if defined(OS_LINUX)
-const int kLowestRendererOomScore = 300;
-const int kHighestRendererOomScore = 1000;
-#endif
-
 #if defined(OS_CHROMEOS)
 const char kProfileDirPrefix[] = "u-";
 const char kLegacyProfileDir[] = "user";
diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc
index f744083cd38c..afc506406ee5 100644
--- a/chromium_src/chrome/common/url_constants.cc
+++ b/chromium_src/chrome/common/url_constants.cc
@@ -111,6 +111,10 @@ const char kContentSettingsExceptionsLearnMoreURL[] =
     "https://support.brave.com/hc/en-us/articles/"
     "360018205431-How-do-I-change-site-permissions-";
 
+const char kCookiesSettingsHelpCenterURL[] =
+    "https://support.brave.com/hc/en-us/articles/"
+    "360018205431-How-do-I-change-site-permissions-";
+
 const char kCrashReasonURL[] =
     "https://support.brave.com/hc/en-us/articles/"
     "360018192251-How-do-I-fix-page-crashes-and-other-page-loading-errors-";
@@ -172,6 +176,8 @@ const char kPageInfoHelpCenterURL[] =
     "https://support.brave.com/hc/en-us/articles/"
     "360018185871-How-do-I-check-if-a-site-s-connection-is-secure-";
 
+const char kPasswordCheckLearnMoreURL[] = "https://support.brave.com/";
+
 const char kPasswordManagerLearnMoreURL[] =
     "https://support.brave.com/hc/en-us/articles/"
     "360018185951-How-do-I-use-the-built-in-password-manager-";
@@ -193,6 +199,9 @@ const char kResetProfileSettingsLearnMoreURL[] =
     "https://support.brave.com/hc/en-us/articles/"
     "360017903152-How-do-I-reset-Brave-settings-to-default-";
 
+const char kSafeBrowsingHelpCenterURL[] =
+    "https://support.brave.com/";
+
 const char kSafetyTipHelpCenterURL[] =
     "https://support.brave.com/";
 

From 148aeeca0511e7128d647380d8bd8471f0a98402 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 20 Apr 2020 17:55:04 -0400
Subject: [PATCH 079/161] [Unit tests]
 ConfiguredProxyResolutionService::Request moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/9d383314fa8cbde76f36e5f9b138cd8a844f956c

commit 9d383314fa8cbde76f36e5f9b138cd8a844f956c
Author: Nicolas Arciniega <niarci@microsoft.com>
Date:   Tue Feb 18 23:36:41 2020 +0000

    Refactor ConfiguredProxyResolutionService::Request

    This change moves out ConfiguredProxyResolutionService::Request into its
    own file and renames it to ProxyResolutionRequest. This will be
    necessary later on when we create a second version of the
    ConfiguredProxyResolutionService under a base ProxyResolutionService
    that relies completely on system APIs. In that second version, we will
    also want to track the status of a proxy resolution request.

    This change is intended to introduce zero functional changes. It is a
    pure refactor change.

    Bug: 1032820
---
 .../configured_proxy_resolution_service_unittest.cc            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
index bf5ee6903cfa..0424a85695a1 100644
--- a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
+++ b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
@@ -13,6 +13,7 @@
 #include "net/base/test_completion_callback.h"
 #include "net/log/test_net_log.h"
 #include "net/proxy_resolution/mock_proxy_resolver.h"
+#include "net/proxy_resolution/proxy_resolution_request.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_with_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -52,7 +53,7 @@ TEST_F(ConfiguredProxyResolutionServiceTest, TorProxy) {
   ProxyInfo info;
   TestCompletionCallback callback;
   RecordingBoundTestNetLog log;
-  std::unique_ptr<ConfiguredProxyResolutionService::Request> request;
+  std::unique_ptr<ProxyResolutionRequest> request;
   int rv =
       service->ResolveProxy(site_url, std::string(), NetworkIsolationKey(),
                             &info, callback.callback(), &request, log.bound());

From 6363f688b31fe3928b488056f422d93fb5e43f79 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 20 Apr 2020 18:17:08 -0400
Subject: [PATCH 080/161] [Unit tests] TestingPrefServiceSyncable c'tor
 signature changed.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/41b07ab53490d3aa411ebc41c49b1baf4b5015f5

commit 41b07ab53490d3aa411ebc41c49b1baf4b5015f5
Author: Toby Huang <tobyhuang@chromium.org>
Date:   Fri Mar 27 21:40:30 2020 +0000

    Unit tests for supervised users policy allowlist extensions install

    In response to the COVID-19 crisis, we launched the "extensions lite"
    feature that enables supervised users to install extensions from the
    ExtensionInstallWhitelist policy. In the hurry, we didn't add unit
    tests for the original CL. This CL adds unit tests for
    crrev.com/c/2109977.

    Bug: 1063099
---
 .../signin/account_consistency_disabled_unittest.cc       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/chromium_src/chrome/browser/signin/account_consistency_disabled_unittest.cc b/chromium_src/chrome/browser/signin/account_consistency_disabled_unittest.cc
index 8c77cfecf3d2..faa5fb585ecd 100644
--- a/chromium_src/chrome/browser/signin/account_consistency_disabled_unittest.cc
+++ b/chromium_src/chrome/browser/signin/account_consistency_disabled_unittest.cc
@@ -38,8 +38,12 @@ TEST(AccountConsistencyDisabledTest, NewProfile) {
 
     std::unique_ptr<sync_preferences::TestingPrefServiceSyncable> pref_service =
         std::make_unique<sync_preferences::TestingPrefServiceSyncable>(
-            new TestingPrefStore(), new TestingPrefStore(), user_prefs,
-            new TestingPrefStore(), new user_prefs::PrefRegistrySyncable(),
+            /*managed_prefs=*/new TestingPrefStore(),
+            /*supervised_user_prefs=*/new TestingPrefStore(),
+            /*extension_prefs=*/new TestingPrefStore(),
+            user_prefs,
+            /*recommended_prefs=*/new TestingPrefStore(),
+            new user_prefs::PrefRegistrySyncable(),
             new PrefNotifierImpl());
     RegisterUserProfilePrefs(pref_service->registry());
     profile_builder.SetPrefService(std::move(pref_service));

From c4b64e56d2e03cdcdbe2292d18ced260d514552d Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 21 Apr 2020 11:44:05 -0400
Subject: [PATCH 081/161] [Browser tests] deps fix.

---
 test/BUILD.gn | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/test/BUILD.gn b/test/BUILD.gn
index c4110f5e5647..334b00883c64 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -533,6 +533,8 @@ test("brave_installer_unittests") {
       "//chrome/install_static:install_static_util",
       "//chrome/install_static/test:test_support",
       "//chrome/installer/mini_installer:lib",
+    ]
+    public_deps = [
       "//testing/gmock",
       "//testing/gtest",
     ]
@@ -554,9 +556,7 @@ group("brave_browser_tests_deps") {
 
 static_library("browser_test_support") {
   testonly = true
-  deps = [
-    "//chrome/test:test_support",
-  ]
+  public_deps = [ "//chrome/test:test_support" ]
 
   sources = [
     "base/brave_test_launcher_delegate.cc",
@@ -567,14 +567,12 @@ static_library("browser_test_support") {
 static_library("browser_tests_runner") {
   testonly = true
 
-  deps = [
-    ":browser_test_support",
-  ]
-
   if (is_win) {
-    deps += [ "//chrome/installer/util:strings" ]
+    deps = [ "//chrome/installer/util:strings" ]
   }
 
+  public_deps = [ ":browser_test_support" ]
+
   sources = [
     "base/browser_tests_main.cc",
   ]
@@ -790,10 +788,11 @@ test("brave_browser_tests") {
     "//content/test:test_support",
     "//ppapi/buildflags",
     ":brave_browser_tests_deps",
-    ":browser_tests_runner",
-    "//testing/gmock",
     "//third_party/blink/public/common",
   ]
+
+  public_deps = [ ":browser_tests_runner" ]
+
   # enable_plugins should be used here
   if (!is_android) {
   data_deps = [

From 5882cc4312f35ae22e510a2b67f2407b60e9745e Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 21 Apr 2020 11:48:59 -0400
Subject: [PATCH 082/161] [Browser tests] Added a missing header include.

---
 browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc b/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc
index 212895738589..40c63874f09c 100644
--- a/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc
+++ b/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc
@@ -6,6 +6,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"

From 18e2373d5526218f9d9ed209642450f1ada8a0d3 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 21 Apr 2020 12:16:17 -0400
Subject: [PATCH 083/161] [Browser Tests] ContextMenuParams moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/8c4446dcf4ef6d9d58bb7f578f2946eb1638ddb8

commit 8c4446dcf4ef6d9d58bb7f578f2946eb1638ddb8
Author: Lukasz Anforowicz <lukasza@chromium.org>
Date:   Wed Mar 11 22:16:42 2020 +0000

    Splitting context_menu_params.h into separate browser VS common parts.

    This CL takes //content/public/common/context_menu_params.h and splits
    it into:

    1. //content/public/common/*untrustworthy*_context_menu_params.h
       which contains:
       - UntrustworthyContextMenuParams
       - CustomContextMenuContext (type of a field under
         UntrustworthyContextMenuParams)

    2. //content/public/*browser*/context_menu_params.h
       which contains:
       - ContextMenuParams

    Bug: 534561
---
 .../brave_spelling_menu_observer_browsertest.cc                 | 2 +-
 .../brave_spelling_options_submenu_observer_browsertest.cc      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc b/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc
index fd06ba60bdba..52de431bc92b 100644
--- a/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc
+++ b/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc
@@ -14,7 +14,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/prefs/pref_service.h"
 #include "components/spellcheck/browser/pref_names.h"
-#include "content/public/common/context_menu_params.h"
+#include "content/public/browser/context_menu_params.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc b/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc
index 733af2f6cbb9..9fb49b96c778 100644
--- a/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc
+++ b/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc
@@ -17,7 +17,7 @@
 #include "components/language/core/browser/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/spellcheck/browser/pref_names.h"
-#include "content/public/common/context_menu_params.h"
+#include "content/public/browser/context_menu_params.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

From 336c8dc6ca81978825c5231b7b5533c1c6556c87 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 21 Apr 2020 16:13:30 -0400
Subject: [PATCH 084/161] [Browser Tests]
 PermissionRequestManagerTestApi::GetPromptWindow change.

Now returns Widget*.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/3ece94e3d603017331c567f6e727c77d444dbebc

commit 3ece94e3d603017331c567f6e727c77d444dbebc
Author: Elly Fong-Jones <ellyjones@chromium.org>
Date:   Wed Feb 5 16:29:24 2020 +0000

    cbui: port PermissionBubbleInteractiveUITest to Win/Linux

    This change moves these tests from Mac-only to all Views platforms,
    although they are currently disabled on Windows & Linux because of the
    linked bug. To do this, the tests are rewritten to use Views APIs rather
    than directly using NSWindow, and PermissionRequestManagerTestApi is
    modified to deal in Widgets rather than NativeWindows.

    This change also removes PermissionBubbleViewsInteractiveUITest, which
    was an incomplete copy of PermissionBubbleInteractiveUITest dating to
    the initial MacViews secondary UI work, and also has never run on any
    non-Mac platform.

    Bug: 866878
---
 browser/widevine/widevine_permission_request_browsertest.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/browser/widevine/widevine_permission_request_browsertest.cc b/browser/widevine/widevine_permission_request_browsertest.cc
index 82aa33ffa33a..74fa3238aaaf 100644
--- a/browser/widevine/widevine_permission_request_browsertest.cc
+++ b/browser/widevine/widevine_permission_request_browsertest.cc
@@ -134,8 +134,7 @@ IN_PROC_BROWSER_TEST_F(WidevinePermissionRequestBrowserTest, BubbleTest) {
   content::RunAllTasksUntilIdle();
   EXPECT_TRUE(permission_request_manager->IsRequestInProgress());
 
-  gfx::NativeWindow window = test_api_->GetPromptWindow();
-  auto* widget = views::Widget::GetWidgetForNativeWindow(window);
+  views::Widget* widget = test_api_->GetPromptWindow();
   DCHECK(widget);
 
   auto* delegate_view =

From cfd75729616f3ebb1b2deb1bc87d6132163b634e Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 21 Apr 2020 16:55:33 -0400
Subject: [PATCH 085/161] [Browser Tests] ScopedRunLoopTimeout moved.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/9d5dd280857629d9689bb125b66ddf7ac6b3dc09

commit 9d5dd280857629d9689bb125b66ddf7ac6b3dc09
Author: Wez <wez@chromium.org>
Date:   Mon Feb 10 17:21:22 2020 +0000

    Reland "[base] Make test Run() timeouts fatal unless using GTest."

    This is a reland of
    https://chromium-review.googlesource.com/c/chromium/src/+/1932464 with
    a missing #include added to assistant_test_mixin.cc.

    The Run() timeouts set for tests now default to crashing the calling
    process. This ensures that Run() timeouts cause visible failures
    regardless of whether the calling suite uses GTest.  Suites which do use
    GTest can switch to having timeouts reported via GTEST_FAIL() by calling:

      base::test::ScopedRunLoopTimeout::SetUseGTestFailOnTimeout();

    Test suites derived from base::TestSuite will have this option set for
    them as part of the TestSuite initialization.

    The RunLoop::ScopedRunTimeoutForTest helper is moved to
    base::test::ScopedRunLoopTimeout, to allow it to have GTest dependencies.

    Bug: 1021777, 1014767
---
 browser/themes/brave_theme_service_browsertest.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/browser/themes/brave_theme_service_browsertest.cc b/browser/themes/brave_theme_service_browsertest.cc
index 08b3bc943111..8b10609dc2a4 100644
--- a/browser/themes/brave_theme_service_browsertest.cc
+++ b/browser/themes/brave_theme_service_browsertest.cc
@@ -14,11 +14,13 @@
 #include "chrome/browser/ui/browser.h"
 #include "components/prefs/pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest-spi.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/native_theme/native_theme_observer.h"
 
 #if defined(OS_WIN)
 #include "base/run_loop.h"
+#include "base/test/scoped_run_loop_timeout.h"
 #include "base/time/time.h"
 #include "base/win/registry.h"
 #endif
@@ -37,10 +39,13 @@ class TestNativeThemeObserver : public ui::NativeThemeObserver {
 
 #if defined(OS_WIN)
 void RunLoopRunWithTimeout(base::TimeDelta timeout) {
+  // ScopedRunLoopTimeout causes a FATAL failure on timeout though, but for us
+  // the timeout means success, so turn the FATAL failure into success.
   base::RunLoop run_loop;
-  base::RunLoop::ScopedRunTimeoutForTest run_timeout(timeout,
-                                                     run_loop.QuitClosure());
-  run_loop.Run();
+  base::test::ScopedRunLoopTimeout run_timeout(FROM_HERE, timeout);
+  // EXPECT_FATAL_FAILURE() can only reference globals and statics.
+  static base::RunLoop& static_loop = run_loop;
+  EXPECT_FATAL_FAILURE(static_loop.Run(), "Run() timed out.");
 }
 #endif
 

From 357902c33e525a205d5e6590ac22ed4bf9458e06 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 21 Apr 2020 18:19:53 -0400
Subject: [PATCH 086/161] Do not create global GURL instances.

GURL constructor uses scheme registry which now DCHECKs if accessed
before being initialized with schemes.

Converted BraveStatsUpdater::g_base_update_url_ to std::string.
Converted SuggestedSitesProvider::suggested_sites_ to method local
static.
Converted oauth_url in binance_service.cc to const char[].

Also, moved inside functions in several unit tests.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/2add7d44778f7be638639aeb26a3b14f0b222e09

commit 2add7d44778f7be638639aeb26a3b14f0b222e09
Author: Michael Thiessen <mthiesse@chromium.org>
Date:   Wed Feb 5 13:49:38 2020 +0000

    Lock SchemeRegistry on first use.

    This change locks the SchemeRegistry on first use, which required
    refactoring url_util.cc to differentiate between SchemeRegistry use for
    adding Schemes, and SchemeRegistry use for using Schemes.

    Tests can now only modify schemes after initialization by calling
    url::UnlockForTests(), which creates a scoped object that resets the
    schemes, so tests can't mistakenly leave global scheme state modified.

    This change required changes to browser startup to decouple scheme
    registration from ContentMain, found here:
    https://chromium-review.googlesource.com/c/chromium/src/+/1945926

    Doc: https://docs.google.com/document/d/1kDKqBaq-b6EbUm0F4ea7ARoksUcj1KUx3qxFuSXEwM4/edit

    Bug: 783819
---
 browser/brave_stats_updater.cc                |  7 +++--
 browser/brave_stats_updater.h                 |  4 +--
 browser/brave_stats_updater_browsertest.cc    |  2 +-
 ...browsing_data_remover_delegate_unittest.cc | 11 +++----
 .../brave_site_settings_counter_unittest.cc   | 11 +++----
 .../api/brave_shields_api_browsertest.cc      | 22 +++++++++-----
 ...webtorrent_navigation_throttle_unittest.cc | 29 ++++++++++++-------
 ...e_content_settings_registry_browsertest.cc | 15 ++++++----
 common/brave_content_client_unittest.cc       |  2 ++
 components/binance/browser/binance_service.cc |  2 +-
 .../browser/suggested_sites_provider.cc       |  3 +-
 .../browser/suggested_sites_provider.h        |  2 +-
 .../browser/suggested_sites_provider_data.cc  | 10 +++++--
 13 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/browser/brave_stats_updater.cc b/browser/brave_stats_updater.cc
index 232708fc28be..242dc35acaa2 100644
--- a/browser/brave_stats_updater.cc
+++ b/browser/brave_stats_updater.cc
@@ -65,7 +65,7 @@ GURL GetUpdateURL(const GURL& base_update_url,
 
 namespace brave {
 
-GURL BraveStatsUpdater::g_base_update_url_(
+std::string BraveStatsUpdater::g_base_update_url_(
     "https://laptop-updates.brave.com/1/usage/brave-core");
 
 BraveStatsUpdater::BraveStatsUpdater(PrefService* pref_service)
@@ -189,7 +189,7 @@ void BraveStatsUpdater::SendServerPing() {
   auto stats_updater_params =
       std::make_unique<brave::BraveStatsUpdaterParams>(pref_service_);
   resource_request->url =
-      GetUpdateURL(g_base_update_url_, *stats_updater_params);
+      GetUpdateURL(GURL(g_base_update_url_), *stats_updater_params);
   resource_request->load_flags =
       net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES |
       net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE |
@@ -206,7 +206,8 @@ void BraveStatsUpdater::SendServerPing() {
 }
 
 // static
-void BraveStatsUpdater::SetBaseUpdateURLForTest(const GURL& base_update_url) {
+void BraveStatsUpdater::SetBaseUpdateURLForTest(
+    const std::string& base_update_url) {
   g_base_update_url_ = base_update_url;
 }
 
diff --git a/browser/brave_stats_updater.h b/browser/brave_stats_updater.h
index 3d7bef00ba67..8f1ca7955a6f 100644
--- a/browser/brave_stats_updater.h
+++ b/browser/brave_stats_updater.h
@@ -65,8 +65,8 @@ class BraveStatsUpdater {
   void SendServerPing();
 
   friend class ::BraveStatsUpdaterBrowserTest;
-  static void SetBaseUpdateURLForTest(const GURL& base_update_url);
-  static GURL g_base_update_url_;
+  static void SetBaseUpdateURLForTest(const std::string& base_update_url);
+  static std::string g_base_update_url_;
 
   PrefService* pref_service_;
   StatsUpdatedCallback stats_updated_callback_;
diff --git a/browser/brave_stats_updater_browsertest.cc b/browser/brave_stats_updater_browsertest.cc
index bf3220908bb6..31d0187937bc 100644
--- a/browser/brave_stats_updater_browsertest.cc
+++ b/browser/brave_stats_updater_browsertest.cc
@@ -63,7 +63,7 @@ class BraveStatsUpdaterBrowserTest : public InProcessBrowserTest {
   void SetBaseUpdateURLForTest() {
     std::unique_ptr<base::Environment> env(base::Environment::Create());
     brave::BraveStatsUpdater::SetBaseUpdateURLForTest(
-        embedded_test_server()->GetURL("/1/usage/brave-core"));
+        embedded_test_server()->GetURL("/1/usage/brave-core").spec());
     env->SetVar("BRAVE_REFERRALS_SERVER",
         embedded_test_server()->host_port_pair().ToString());
     env->SetVar("BRAVE_REFERRALS_LOCAL", "1");  // use http for local testing
diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc b/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc
index 4e22ba3b6a64..9cec8b219e3b 100644
--- a/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc
+++ b/browser/browsing_data/brave_browsing_data_remover_delegate_unittest.cc
@@ -20,13 +20,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-namespace {
-const GURL kBraveURL("https://www.brave.com");
-const GURL kBatURL("https://basicattentiontoken.org");
-const GURL kGoogleURL("https://www.google.com");
-const GURL kAbcURL("https://www.abc.com");
-}  // namespace
-
 class BraveBrowsingDataRemoverDelegateTest : public testing::Test {
  public:
   void SetUp() override {
@@ -62,6 +55,10 @@ class BraveBrowsingDataRemoverDelegateTest : public testing::Test {
 };
 
 TEST_F(BraveBrowsingDataRemoverDelegateTest, ShieldsSettingsClearTest) {
+  const GURL kBraveURL("https://www.brave.com");
+  const GURL kBatURL("https://basicattentiontoken.org");
+  const GURL kGoogleURL("https://www.google.com");
+  const GURL kAbcURL("https://www.abc.com");
   // Four settings are added.
   // First two settings are shields settings in PLUGINS type.
   // Javascript is not counted as shields type because it's stored to
diff --git a/browser/browsing_data/counters/brave_site_settings_counter_unittest.cc b/browser/browsing_data/counters/brave_site_settings_counter_unittest.cc
index 632415477d23..18682bcbb2d0 100644
--- a/browser/browsing_data/counters/brave_site_settings_counter_unittest.cc
+++ b/browser/browsing_data/counters/brave_site_settings_counter_unittest.cc
@@ -30,13 +30,6 @@
 #include "content/public/browser/host_zoom_map.h"
 #endif
 
-namespace {
-const GURL kBraveURL("https://www.brave.com");
-const GURL kBatURL("https://basicattentiontoken.org");
-const GURL kGoogleURL("https://www.google.com");
-const GURL kAbcURL("https://www.abc.com");
-}  // namespace
-
 class BraveSiteSettingsCounterTest : public testing::Test {
  public:
   void SetUp() override {
@@ -92,6 +85,10 @@ class BraveSiteSettingsCounterTest : public testing::Test {
 
 // Tests that the counter correctly counts each setting.
 TEST_F(BraveSiteSettingsCounterTest, Count) {
+  const GURL kBraveURL("https://www.brave.com");
+  const GURL kBatURL("https://basicattentiontoken.org");
+  const GURL kGoogleURL("https://www.google.com");
+  const GURL kAbcURL("https://www.abc.com");
   // Check below four settings for different host are counted properly.
   map()->SetContentSettingDefaultScope(
       kBraveURL, GURL(), ContentSettingsType::PLUGINS,
diff --git a/browser/extensions/api/brave_shields_api_browsertest.cc b/browser/extensions/api/brave_shields_api_browsertest.cc
index 08ec60ab454d..261035eb9422 100644
--- a/browser/extensions/api/brave_shields_api_browsertest.cc
+++ b/browser/extensions/api/brave_shields_api_browsertest.cc
@@ -198,7 +198,11 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, AllowScriptsOnceIframe) {
 constexpr char kJavascriptSetParams[] =
     "[\"block\", \"https://www.brave.com/\"]";
 constexpr char kJavascriptGetParams[] = "[\"https://www.brave.com/\"]";
-const GURL kBraveURL("https://www.brave.com");
+
+const GURL& GetBraveURL() {
+  static const GURL kBraveURL("https://www.brave.com");
+  return kBraveURL;
+}
 
 // Test javascript content setting works properly via braveShields api.
 IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest,
@@ -225,7 +229,7 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest,
   // Check Block is set.
   ContentSetting setting =
       HostContentSettingsMapFactory::GetForProfile(browser()->profile())
-          ->GetContentSetting(kBraveURL, GURL(),
+          ->GetContentSetting(GetBraveURL(), GURL(),
                               ContentSettingsType::JAVASCRIPT, "");
   EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);
 }
@@ -235,12 +239,13 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest,
                        PRE_ShieldSettingsPersistTest) {
   HostContentSettingsMapFactory::GetForProfile(browser()->profile())
       ->SetContentSettingDefaultScope(
-          kBraveURL, GURL(), ContentSettingsType::PLUGINS,
+          GetBraveURL(), GURL(), ContentSettingsType::PLUGINS,
           brave_shields::kHTTPUpgradableResources, CONTENT_SETTING_ALLOW);
 
   ContentSetting setting =
       HostContentSettingsMapFactory::GetForProfile(browser()->profile())
-          ->GetContentSetting(kBraveURL, GURL(), ContentSettingsType::PLUGINS,
+          ->GetContentSetting(GetBraveURL(), GURL(),
+                              ContentSettingsType::PLUGINS,
                               brave_shields::kHTTPUpgradableResources);
   EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
 }
@@ -248,7 +253,8 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest,
 IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, ShieldSettingsPersistTest) {
   ContentSetting setting =
       HostContentSettingsMapFactory::GetForProfile(browser()->profile())
-          ->GetContentSetting(kBraveURL, GURL(), ContentSettingsType::PLUGINS,
+          ->GetContentSetting(GetBraveURL(), GURL(),
+                              ContentSettingsType::PLUGINS,
                               brave_shields::kHTTPUpgradableResources);
   EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
 }
@@ -256,13 +262,13 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, ShieldSettingsPersistTest) {
 // Checks flash configuration isn't persisted across the sessions.
 IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, PRE_FlashPersistTest) {
   HostContentSettingsMapFactory::GetForProfile(browser()->profile())
-      ->SetContentSettingDefaultScope(kBraveURL, GURL(),
+      ->SetContentSettingDefaultScope(GetBraveURL(), GURL(),
                                       ContentSettingsType::PLUGINS,
                                       std::string(), CONTENT_SETTING_ALLOW);
 
   ContentSetting setting =
       HostContentSettingsMapFactory::GetForProfile(browser()->profile())
-          ->GetContentSetting(kBraveURL, GURL(),
+          ->GetContentSetting(GetBraveURL(), GURL(),
                               ContentSettingsType::PLUGINS, std::string());
   EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
 }
@@ -270,7 +276,7 @@ IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, PRE_FlashPersistTest) {
 IN_PROC_BROWSER_TEST_F(BraveShieldsAPIBrowserTest, FlashPersistTest) {
   ContentSetting setting =
       HostContentSettingsMapFactory::GetForProfile(browser()->profile())
-          ->GetContentSetting(kBraveURL, GURL(),
+          ->GetContentSetting(GetBraveURL(), GURL(),
                               ContentSettingsType::PLUGINS, std::string());
   EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);
 }
diff --git a/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc b/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc
index a8616a1bfcb8..5a69ffd40695 100644
--- a/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc
+++ b/browser/extensions/brave_webtorrent_navigation_throttle_unittest.cc
@@ -53,8 +53,17 @@ class MockBrowserClient : public content::ContentBrowserClient {
   }
 };
 
-GURL magnet_url("magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c&dn=Big+Buck+Bunny&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fbig-buck-bunny.torrent");  // NOLINT
-GURL torrent_url("https://webtorrent.io/torrents/big-buck-bunny.torrent");
+const GURL& GetMagnetUrl() {
+  static const GURL magnet_url(
+    "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c&dn=Big+Buck+Bunny&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fbig-buck-bunny.torrent");  // NOLINT
+  return magnet_url;
+}
+
+const GURL& GetTorrentUrl() {
+  static const GURL torrent_url(
+      "https://webtorrent.io/torrents/big-buck-bunny.torrent");
+  return torrent_url;
+}
 
 }  // namespace
 
@@ -141,12 +150,12 @@ TEST_F(BraveWebTorrentNavigationThrottleUnitTest,
   web_contents_tester()->NavigateAndCommit(GURL("http://example.com"));
   content::RenderFrameHost* host =
       render_frame_host_tester(main_rfh())->AppendChild("child");
-  content::MockNavigationHandle test_handle(torrent_url, host);
+  content::MockNavigationHandle test_handle(GetTorrentUrl(), host);
   test_handle.set_starting_site_instance(host->GetSiteInstance());
   auto throttle =
       std::make_unique<BraveWebTorrentNavigationThrottle>(&test_handle);
   EXPECT_EQ(NavigationThrottle::DEFER, throttle->WillStartRequest().action())
-      << torrent_url;
+      << GetTorrentUrl();
 }
 
 // Tests the case of loading a torrent without having the extension
@@ -156,12 +165,12 @@ TEST_F(BraveWebTorrentNavigationThrottleUnitTest,
   web_contents_tester()->NavigateAndCommit(GURL("http://example.com"));
   content::RenderFrameHost* host =
       render_frame_host_tester(main_rfh())->AppendChild("child");
-  content::MockNavigationHandle test_handle(magnet_url, host);
+  content::MockNavigationHandle test_handle(GetMagnetUrl(), host);
   test_handle.set_starting_site_instance(host->GetSiteInstance());
   auto throttle =
       std::make_unique<BraveWebTorrentNavigationThrottle>(&test_handle);
   EXPECT_EQ(NavigationThrottle::DEFER, throttle->WillStartRequest().action())
-      << magnet_url;
+      << GetMagnetUrl();
 }
 
 
@@ -172,12 +181,12 @@ TEST_F(BraveWebTorrentNavigationThrottleUnitTest, WebTorrentUrlInstalled) {
   web_contents_tester()->NavigateAndCommit(GURL("http://example.com"));
   content::RenderFrameHost* host =
       render_frame_host_tester(main_rfh())->AppendChild("child");
-  content::MockNavigationHandle test_handle(magnet_url, host);
+  content::MockNavigationHandle test_handle(GetMagnetUrl(), host);
   test_handle.set_starting_site_instance(host->GetSiteInstance());
   auto throttle =
       std::make_unique<BraveWebTorrentNavigationThrottle>(&test_handle);
   EXPECT_EQ(NavigationThrottle::PROCEED, throttle->WillStartRequest().action())
-      << magnet_url;
+      << GetMagnetUrl();
 }
 
 // Tests the case of loading a torrent when the WebTorrent is explicitly
@@ -187,12 +196,12 @@ TEST_F(BraveWebTorrentNavigationThrottleUnitTest, WebTorrentDisabledByPref) {
   web_contents_tester()->NavigateAndCommit(GURL("http://example.com"));
   content::RenderFrameHost* host =
       render_frame_host_tester(main_rfh())->AppendChild("child");
-  content::MockNavigationHandle test_handle(magnet_url, host);
+  content::MockNavigationHandle test_handle(GetMagnetUrl(), host);
   test_handle.set_starting_site_instance(host->GetSiteInstance());
   auto throttle =
       std::make_unique<BraveWebTorrentNavigationThrottle>(&test_handle);
   EXPECT_EQ(NavigationThrottle::PROCEED,
-      throttle->WillStartRequest().action()) << magnet_url;
+      throttle->WillStartRequest().action()) << GetMagnetUrl();
 }
 
 }  // namespace extensions
diff --git a/chromium_src/components/content_settings/core/browser/brave_content_settings_registry_browsertest.cc b/chromium_src/components/content_settings/core/browser/brave_content_settings_registry_browsertest.cc
index 53ad74ea77d8..4a999d2132ad 100644
--- a/chromium_src/components/content_settings/core/browser/brave_content_settings_registry_browsertest.cc
+++ b/chromium_src/components/content_settings/core/browser/brave_content_settings_registry_browsertest.cc
@@ -11,7 +11,10 @@
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 
-const GURL kBraveURL("https://www.brave.com");
+const GURL& GetBraveURL() {
+  static const GURL kBraveURL("https://www.brave.com");
+  return kBraveURL;
+}
 
 class BraveContentSettingsRegistryBrowserTest : public InProcessBrowserTest {
  public:
@@ -34,13 +37,13 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsRegistryBrowserTest,
                        WithoutWildcardContentSetting) {
   ContentSetting brave_url_shields_setting =
       content_settings()->GetContentSetting(
-          kBraveURL, kBraveURL, ContentSettingsType::PLUGINS,
+          GetBraveURL(), GetBraveURL(), ContentSettingsType::PLUGINS,
           brave_shields::kBraveShields);
   EXPECT_EQ(CONTENT_SETTING_DEFAULT, brave_url_shields_setting);
 
   ContentSetting brave_url_shields_setting_private =
       private_content_settings()->GetContentSetting(
-          kBraveURL, kBraveURL, ContentSettingsType::PLUGINS,
+          GetBraveURL(), GetBraveURL(), ContentSettingsType::PLUGINS,
           brave_shields::kBraveShields);
   EXPECT_EQ(CONTENT_SETTING_DEFAULT, brave_url_shields_setting_private);
 }
@@ -48,7 +51,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsRegistryBrowserTest,
 IN_PROC_BROWSER_TEST_F(BraveContentSettingsRegistryBrowserTest,
                        WithBraveShieldsContentSetting) {
   ContentSettingsPattern brave_url_pattern =
-      ContentSettingsPattern::FromURL(kBraveURL);
+      ContentSettingsPattern::FromURL(GetBraveURL());
 
   content_settings()->SetContentSettingCustomScope(
       brave_url_pattern,
@@ -59,13 +62,13 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsRegistryBrowserTest,
 
   ContentSetting brave_url_shields_setting =
       content_settings()->GetContentSetting(
-          kBraveURL, kBraveURL, ContentSettingsType::PLUGINS,
+          GetBraveURL(), GetBraveURL(), ContentSettingsType::PLUGINS,
           brave_shields::kBraveShields);
   EXPECT_EQ(CONTENT_SETTING_ALLOW, brave_url_shields_setting);
 
   ContentSetting brave_url_shields_setting_private =
       private_content_settings()->GetContentSetting(
-          kBraveURL, kBraveURL, ContentSettingsType::PLUGINS,
+          GetBraveURL(), GetBraveURL(), ContentSettingsType::PLUGINS,
           brave_shields::kBraveShields);
   EXPECT_EQ(CONTENT_SETTING_ALLOW, brave_url_shields_setting_private);
 }
diff --git a/common/brave_content_client_unittest.cc b/common/brave_content_client_unittest.cc
index 282b6a20540b..758fbaa129eb 100644
--- a/common/brave_content_client_unittest.cc
+++ b/common/brave_content_client_unittest.cc
@@ -9,8 +9,10 @@
 #include "content/public/common/url_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
+#include "url/url_util.h"
 
 TEST(BraveContentClientTest, AdditionalSchemesTest) {
+  url::ScopedSchemeRegistryForTests scoped_registry;
   BraveContentClient content_client;
   content::SetContentClient(&content_client);
   content::ReRegisterContentSchemesForTests();
diff --git a/components/binance/browser/binance_service.cc b/components/binance/browser/binance_service.cc
index 712864ad59ba..8fc3d4bc78b0 100644
--- a/components/binance/browser/binance_service.cc
+++ b/components/binance/browser/binance_service.cc
@@ -42,7 +42,7 @@ const char gateway_host[] = "www.binance.com";
 const char oauth_callback[] = "com.brave.binance://authorization";
 const char oauth_scope[] =
     "user:email,user:address,asset:balance,asset:ocbs";
-const GURL oauth_url("https://accounts.binance.com/en/oauth/authorize");
+const char oauth_url[] = "https://accounts.binance.com/en/oauth/authorize";
 const unsigned int kRetriesCountOnNetworkChange = 1;
 
 net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotationTag() {
diff --git a/components/omnibox/browser/suggested_sites_provider.cc b/components/omnibox/browser/suggested_sites_provider.cc
index 5d685e9447b4..dd070997bfa6 100644
--- a/components/omnibox/browser/suggested_sites_provider.cc
+++ b/components/omnibox/browser/suggested_sites_provider.cc
@@ -69,7 +69,8 @@ void SuggestedSitesProvider::Start(const AutocompleteInput& input,
     }
   };
 
-  std::for_each(suggested_sites_.begin(), suggested_sites_.end(),
+  const auto& suggested_sites = GetSuggestedSites();
+  std::for_each(suggested_sites.begin(), suggested_sites.end(),
       check_add_match);
 }
 
diff --git a/components/omnibox/browser/suggested_sites_provider.h b/components/omnibox/browser/suggested_sites_provider.h
index c32da987c3d4..f62dc2a418bd 100644
--- a/components/omnibox/browser/suggested_sites_provider.h
+++ b/components/omnibox/browser/suggested_sites_provider.h
@@ -28,10 +28,10 @@ class SuggestedSitesProvider : public AutocompleteProvider {
 
  private:
   ~SuggestedSitesProvider() override;
-  static std::vector<SuggestedSitesMatch> suggested_sites_;
 
   static const int kRelevance;
 
+  const std::vector<SuggestedSitesMatch>& GetSuggestedSites();
   void AddMatch(const SuggestedSitesMatch& match,
                 const ACMatchClassifications& styles);
 
diff --git a/components/omnibox/browser/suggested_sites_provider_data.cc b/components/omnibox/browser/suggested_sites_provider_data.cc
index 049495012906..3dafc5e655ab 100644
--- a/components/omnibox/browser/suggested_sites_provider_data.cc
+++ b/components/omnibox/browser/suggested_sites_provider_data.cc
@@ -7,8 +7,9 @@
 
 #include "base/strings/utf_string_conversions.h"
 
-std::vector<SuggestedSitesMatch>
-SuggestedSitesProvider::suggested_sites_ = {
+const std::vector<SuggestedSitesMatch>&
+SuggestedSitesProvider::GetSuggestedSites() {
+  static const std::vector<SuggestedSitesMatch> suggested_sites = {
   {
     SuggestedSitesMatch(
       "binance.com",
@@ -143,4 +144,7 @@ SuggestedSitesProvider::suggested_sites_ = {
                          "?offer_id=24&aff_id=3494"),
       true)
   },
-};
+  };
+
+  return suggested_sites;
+}

From 116cb61a0328ded88cae1c187005598e7941e553 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 22 Apr 2020 17:36:33 -0400
Subject: [PATCH 087/161] Deleted chromium_src override that was renamed.

This file was renamed to import_data_handler.cc, but the copy with the
old name wasn't removed.
---
 .../settings/settings_import_data_handler.cc  | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 chromium_src/chrome/browser/ui/webui/settings/settings_import_data_handler.cc

diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_import_data_handler.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_import_data_handler.cc
deleted file mode 100644
index 162d001c765d..000000000000
--- a/chromium_src/chrome/browser/ui/webui/settings/settings_import_data_handler.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "brave/browser/importer/brave_external_process_importer_host.h"
-#include "brave/common/pref_names.h"
-
-#define ExternalProcessImporterHost BraveExternalProcessImporterHost
-
-#define BRAVE_IMPORT_DATA \
-  if (prefs->GetBoolean(kImportDialogExtensions)) \
-    selected_items |= importer::EXTENSIONS;
-
-#define BRAVE_SEND_BROWSER_PROFILE_DATA \
-  browser_profile->SetBoolean("extensions", \
-      (browser_services & importer::EXTENSIONS) != 0);
-
-#include "../../../../../../../chrome/browser/ui/webui/settings/settings_import_data_handler.cc"  // NOLINT
-#undef ExternalProcessImporterHost
-#undef BRAVE_IMPORT_DATA
-#undef BRAVE_SEND_BROWSER_PROFILE_DATA

From 34c98e306abae291acda46cb811384e3f9718a12 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 24 Apr 2020 09:51:42 -0400
Subject: [PATCH 088/161] Upgrade patches from Chromium 83.0.4103.14 to
 Chromium 83.0.4103.24.

---
 .../build-android-gyp-util-resource_utils.py.patch |  2 +-
 patches/build-util-android_chrome_version.py.patch |  2 +-
 patches/chrome-BUILD.gn.patch                      |  2 +-
 patches/chrome-VERSION.patch                       |  4 ++--
 patches/chrome-android-BUILD.gn.patch              |  2 +-
 .../chrome-android-java-AndroidManifest.xml.patch  |  4 ++--
 ...romium-chrome-browser-ChromeActivity.java.patch |  4 ++--
 ...browser-TabbedModeTabDelegateFactory.java.patch |  8 ++++----
 patches/chrome-browser-about_flags.cc.patch        |  4 ++--
 ...s-settings-privacy_page-privacy_page.html.patch | 14 ++++++++------
 ...sions-extension_action_view_controller.cc.patch |  2 +-
 ...-components-sync-AndroidSyncSettings.java.patch |  2 +-
 ...les-peerconnection-rtc_peer_connection.cc.patch |  2 +-
 .../tools-metrics-histograms-histograms.xml.patch  |  4 ++--
 14 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/patches/build-android-gyp-util-resource_utils.py.patch b/patches/build-android-gyp-util-resource_utils.py.patch
index b017aeb5e810..9a8754cb6fcc 100644
--- a/patches/build-android-gyp-util-resource_utils.py.patch
+++ b/patches/build-android-gyp-util-resource_utils.py.patch
@@ -1,5 +1,5 @@
 diff --git a/build/android/gyp/util/resource_utils.py b/build/android/gyp/util/resource_utils.py
-index 8105801deb1009614d0d18470b14d531557933b6..7ea52e603be06458fbf74aadd67ab722ea2c0587 100644
+index ea4696c41c4ac21797e0b43a8658fe5d096cc363..a046b2d20e2d265f0977bf2f0ec9225598a05917 100644
 --- a/build/android/gyp/util/resource_utils.py
 +++ b/build/android/gyp/util/resource_utils.py
 @@ -235,6 +235,7 @@ class ResourceInfoFile(object):
diff --git a/patches/build-util-android_chrome_version.py.patch b/patches/build-util-android_chrome_version.py.patch
index 36c091a5c90d..80d0184c71d2 100644
--- a/patches/build-util-android_chrome_version.py.patch
+++ b/patches/build-util-android_chrome_version.py.patch
@@ -1,5 +1,5 @@
 diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py
-index 91d31e97ad6b5fdc55128a3a5104092323d84c9c..c92067f369c32cfe46cdc6c365661cc19af51a49 100644
+index 586b5a62a63bceb068d614070a820df0a55b3c61..580f6e0c74886b4da8fac9e98a2674f60d3200f4 100644
 --- a/build/util/android_chrome_version.py
 +++ b/build/util/android_chrome_version.py
 @@ -191,7 +191,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build):
diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch
index b0d9ce59551d..85ccc08ffac8 100644
--- a/patches/chrome-BUILD.gn.patch
+++ b/patches/chrome-BUILD.gn.patch
@@ -110,4 +110,4 @@ index d113eedf7afc704b0c2e8d112413e3bd7c58d8c7..c9a0b1ab122b25a92f414f6f6880ae9f
 +    "//brave:resources",
    ]
  }
- 
\ No newline at end of file
+ 
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index 79768986505f..1d72098716e4 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index f7693b18d4c1776c03bd27bae8d7bf2127cfb555..074a8f25c9a0607f9b39303d5395a290b4e0fa37 100644
+index e3aa452220e68d45f0a317008df8dd27e44bff60..7eb979ba4d18937e1e482e848b078959ef6d1143 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=83
 -MINOR=0
 -BUILD=4103
--PATCH=14
+-PATCH=24
 +MINOR=1
 +BUILD=11
 +PATCH=28
diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch
index c7afe610957a..e819c1dbb18e 100644
--- a/patches/chrome-android-BUILD.gn.patch
+++ b/patches/chrome-android-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index de0b8bbe9c6751033b6ddac36a4e25f94c0937b4..da685af5d8dd5919e23177a13c945e584e4a91a5 100644
+index de0b8bbe9c6751033b6ddac36a4e25f94c0937b4..eea94a3e16b7c2fb3f0b4f0ab2d6bcaf1ca99ce7 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -196,6 +196,7 @@ android_resources("chrome_app_java_resources") {
diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch
index c6bb5514ec8a..bd66212d5d03 100644
--- a/patches/chrome-android-java-AndroidManifest.xml.patch
+++ b/patches/chrome-android-java-AndroidManifest.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index 0fe966536d28f654dbdb3fddd1657478bf9caeb8..2fdc3ee302a02a9376682c37187b4239a412a284 100644
+index 6f50b67787561c523330b2eaa6522c517cb13eee..b5248da5b084206b6f15687abf89316c9333bc2c 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
 @@ -34,7 +34,9 @@ by a child template that "extends" this file.
@@ -72,7 +72,7 @@ index 0fe966536d28f654dbdb3fddd1657478bf9caeb8..2fdc3ee302a02a9376682c37187b4239
          {% endif %}
  
          <!-- Cast support -->
-@@ -1299,6 +1315,7 @@ android:value="true" />
+@@ -1295,6 +1311,7 @@ android:value="true" />
          </activity>
          {% endif %}
  
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeActivity.java.patch
index fa64ab070ffd..cd22371acd28 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeActivity.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeActivity.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-index 82013027db1886b618fd9ee9f035fee0fb0d0e79..9eba70001b1456b2523abdd6d2b9e03c6d5e8bff 100644
+index 5c4a38621d16f5ed413b3fd7011e2f4272412e56..ba7cd1e1bcaeaf35d69917ce8523ed4fe0a26b39 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -327,7 +327,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -311,7 +311,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      NightModeReparentingController mNightModeReparentingController;
  
      protected ChromeActivity() {
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch
index db08e31d0a60..522be28d33df 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch
@@ -1,13 +1,13 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
-index 5508b5cf92dcdc1d1de36bcfe57fb83202dc7f26..f4397cc0a145f9762db91ccb70e63582284bc2af 100644
+index 72bf933fcf8f4357ca243b18899686b65ec4817c..317f1a780647a8b20170b501148d6fd7511a05d2 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
-@@ -42,7 +42,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
+@@ -48,7 +48,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
  
      @Override
      public ExternalNavigationHandler createExternalNavigationHandler(Tab tab) {
--        return new ExternalNavigationHandler(tab);
-+        return new org.chromium.chrome.browser.externalnav.BraveExternalNavigationHandler(tab);
+-        return new ExternalNavigationHandler(new ExternalNavigationDelegateImpl(tab));
++        return new org.chromium.chrome.browser.externalnav.BraveExternalNavigationHandler(new ExternalNavigationDelegateImpl(tab));
      }
  
      @Override
diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
index 727292908927..362e3d437575 100644
--- a/patches/chrome-browser-about_flags.cc.patch
+++ b/patches/chrome-browser-about_flags.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 18289552dc9d7a5246cbb734d481cf897191e869..25a009c166b871303e181ef1a3bd093ece162424 100644
+index 65f76461ec12e565bdd15847d86bc542b81c68ad..6323b187e1b37dd424dfad85f197a76aeb785993 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -290,14 +290,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
@@ -21,7 +21,7 @@ index 18289552dc9d7a5246cbb734d481cf897191e869..25a009c166b871303e181ef1a3bd093e
  
  const FeatureEntry::Choice kPassiveListenersChoices[] = {
      {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -5208,6 +5208,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5222,6 +5222,7 @@ const FeatureEntry kFeatureEntries[] = {
      // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
      // Histograms" in tools/metrics/histograms/README.md (run the
      // AboutFlagsHistogramTest unit test to verify this process).
diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
index 504a7bd10b3e..20377b190ce9 100644
--- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
+++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-index cde7a3097bebddbe4b68ebbb2960c65130b30392..c68104dde38cc9f1608739c5b1efdca0ec476394 100644
+index 956a14ebe0462977504197a1bec7ba3362418f05..baaa473e57f8bc1690aba8bfe5a48453ce772e0d 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
 @@ -29,6 +29,7 @@
@@ -76,21 +76,23 @@ index cde7a3097bebddbe4b68ebbb2960c65130b30392..c68104dde38cc9f1608739c5b1efdca0
        <template is="dom-if" route-path="/content/camera" no-search>
          <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
-@@ -272,11 +282,13 @@
+@@ -272,6 +282,7 @@
                sub-option-label="$i18n{deleteDataPostSession}"
                sub-option-mode="cookies-session-only">
            </category-default-setting>
 +<if expr="_google_chrome">
            <settings-toggle-button
+               id="blockThirdPartyCookies"
                pref="{{prefs.profile.block_third_party_cookies}}"
-               label="$i18n{thirdPartyCookie}"
-               sub-label="$i18n{thirdPartyCookieSublabel}">
+@@ -281,6 +292,7 @@
+                   "onBlockThirdPartyCookiesToggleChange_"
+               no-set-pref>
            </settings-toggle-button>
 +</if>
            <cr-link-row id="site-data-trigger" class="hr"
                on-click="onSiteDataTap_" label="$i18n{siteSettingsCookieLink}">
            </cr-link-row>
-@@ -366,11 +378,13 @@
+@@ -370,11 +382,13 @@
          <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}"
              search-label="$i18n{siteSettingsAllSitesSearch}"
              search-term="{{searchFilter_}}">
@@ -104,7 +106,7 @@ index cde7a3097bebddbe4b68ebbb2960c65130b30392..c68104dde38cc9f1608739c5b1efdca0
            <category-setting-exceptions
                category="{{ContentSettingsTypes.JAVASCRIPT}}"
                block-header="$i18n{siteSettingsBlock}"
-@@ -469,6 +483,19 @@
+@@ -473,6 +487,19 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
index 91cb6eb7b534..0e96e1bbebdd 100644
--- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
+++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc
-index 41ca2bb913aaa2945d11e197554f2c2547f46f67..2f18a404abcea168b9dd5f23d3de9f383936c1f6 100644
+index ea575404f9369bbcaa1bfa786b0ddabfd09409b6..354d1612c3f0d945ddbe68b92e64cd1e81bfd7d4 100644
 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc
 +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc
 @@ -58,7 +58,6 @@ ExtensionActionViewController::ExtensionActionViewController(
diff --git a/patches/components-sync-android-java-src-org-chromium-components-sync-AndroidSyncSettings.java.patch b/patches/components-sync-android-java-src-org-chromium-components-sync-AndroidSyncSettings.java.patch
index 507828227742..6e1c4ca82fcb 100644
--- a/patches/components-sync-android-java-src-org-chromium-components-sync-AndroidSyncSettings.java.patch
+++ b/patches/components-sync-android-java-src-org-chromium-components-sync-AndroidSyncSettings.java.patch
@@ -1,5 +1,5 @@
 diff --git a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
-index 84a8b66912a2f6847771486e62556b772c192fd2..b66f68589fb11cda455a86d8400feb3ac2a0f083 100644
+index 0916e619f58d9146367a62c101ef9fdec0f5c0ad..75a77fca11887887e205c19ababab33b326a09d9 100644
 --- a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
 +++ b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
 @@ -77,7 +77,7 @@ public class AndroidSyncSettings {
diff --git a/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch b/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
index 42f259926ea6..ceb8ddadbf5c 100644
--- a/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
+++ b/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
-index f48333f3b0c9a078b675c6e1881fd57656904f23..8553317f0d1ca4f1787f4f2bd9e054937d458b8b 100644
+index 3484f28cf16bc288dd834f9da07a7c76e057c38c..42f3e43f3be7ed15482c4d2494b40e8e8d7d61a1 100644
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
 @@ -837,6 +837,7 @@ void RTCPeerConnection::Dispose() {
diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch
index 92e2f67dea2c..fbc44807c22c 100644
--- a/patches/tools-metrics-histograms-histograms.xml.patch
+++ b/patches/tools-metrics-histograms-histograms.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
-index b547b9843e83c5c2a360a922f2bb7d2a1734e923..521fcccac256235d7d35262be8dc42d1b1a900ed 100644
+index ceb7d3a4d51388ad0d47ddd5435b2403a6aa97bb..3e7aabaee68c8f19cbc316e03fba53bafc095cda 100644
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -196087,6 +196087,7 @@ regressions. -->
+@@ -196181,6 +196181,7 @@ regressions. -->
    <suffix name="ProtectedMedia" label="Protected media permission"/>
    <suffix name="PushMessaging" label="Push messaging permission"/>
    <suffix name="Quota" label="Quota permission"/>

From b4aeecada231d5cc102788206040b15e5350fbd3 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 24 Apr 2020 11:48:51 -0400
Subject: [PATCH 089/161] Fixes
 BraveActionsContainer::EmptyExtensionsContainer.

Added new method implementation.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/82e2f8dbfd7ab938e6cb0741f5033d056efe72bd

commit 82e2f8dbfd7ab938e6cb0741f5033d056efe72bd
Author: Caroline Rising <corising@chromium.org>
Date:   Tue Apr 7 00:40:25 2020 +0000

    Fix bug in extension context menu pinning options.

    This cl fixes a bug where pinned extensions where stored as the popped
    out extension when a popup was showing. This change also forces
    extension popups to close when an extension context menu is triggered,
    doing this makes behavior the same across all platforms and fixes a
    crash where the user could try to pin a popped out extension twice.

    Bug: 1056597
---
 browser/ui/views/brave_actions/brave_actions_container.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/browser/ui/views/brave_actions/brave_actions_container.cc b/browser/ui/views/brave_actions/brave_actions_container.cc
index 2783314123b0..7c998dca447f 100644
--- a/browser/ui/views/brave_actions/brave_actions_container.cc
+++ b/browser/ui/views/brave_actions/brave_actions_container.cc
@@ -55,6 +55,11 @@ class BraveActionsContainer::EmptyExtensionsContainer
   bool IsActionVisibleOnToolbar(
     const ToolbarActionViewController* action) const override { return false; }
 
+  extensions::ExtensionContextMenuModel::ButtonVisibility GetActionVisibility(
+      const ToolbarActionViewController* action) const override {
+    return extensions::ExtensionContextMenuModel::VISIBLE;
+  }
+
   void UndoPopOut() override {}
 
   void SetPopupOwner(ToolbarActionViewController* popup_owner) override {}

From f118e0518af03d7dbccc70499be92acbf220a7d2 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 24 Apr 2020 21:19:32 -0400
Subject: [PATCH 090/161] [Android] Dark mode build flag was removed.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/e66c244ff77a19c82e2c93332aae310506296a7e

commit e66c244ff77a19c82e2c93332aae310506296a7e
Author: Theresa Wellington <twellington@chromium.org>
Date:   Fri Feb 7 01:17:26 2020 +0000

    [Android] Remove dark mode build flag

    Remove the dark mode build flag and merge res_night/ into normal res/
    directory. Also removes the dark mode flag from about://flags.

    BUG=936275
---
 build/android/config.gni | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build/android/config.gni b/build/android/config.gni
index b9584a1d50d6..7fcb6963fa4c 100644
--- a/build/android/config.gni
+++ b/build/android/config.gni
@@ -1,7 +1,6 @@
 import("//brave/android/brave_java_sources.gni")
 import("//brave/build/android/bytecode/java_sources.gni")
 import("//brave/components/sync/android/java_sources.gni")
-import("//ui/android/features.gni")
 
 declare_args() {
   brave_android_manifest_includes = []
@@ -34,7 +33,3 @@ brave_chrome_app_java_resources_deps = [
 brave_chrome_app_java_resources_dirs = [
   "//brave/android/java/res",
 ]
-
-if (enable_android_night_mode) {
-  brave_chrome_app_java_resources_dirs += [ "//brave/android/java/res_night" ]
-}

From ee19e43a31d162601d4e73d95a85696ef134ad83 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Sat, 25 Apr 2020 01:27:45 -0400
Subject: [PATCH 091/161] Added a missing reference.

---
 common/shield_exceptions.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shield_exceptions.cc b/common/shield_exceptions.cc
index d4f0b3cce0ef..0810296f4028 100644
--- a/common/shield_exceptions.cc
+++ b/common/shield_exceptions.cc
@@ -46,7 +46,7 @@ bool IsWhitelistedFingerprintingException(const GURL& firstPartyOrigin,
     URLPattern(URLPattern::SCHEME_ALL, "https://public.tableau.com/*"),
     URLPattern(URLPattern::SCHEME_ALL, "https://www.arcgis.com/*"),
   };
-  for (const auto exception : embed_exceptions) {
+  for (const auto& exception : embed_exceptions) {
     if (exception.MatchesURL(subresourceUrl)) {
       return true;
     }

From 76fd90619fe5078f1c1a3002e54b641526c57d86 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 17 Apr 2020 11:45:27 -0400
Subject: [PATCH 092/161] BlinkTestMsgStart has been removed.

BlinkTestHostMsg has been converted to Mojo. We used that IPC method
for
  BraveViewHostMsg_JavaScriptBlocked,
  BraveViewHostMsg_FingerprintingBlocked, and
  BraveFrameMsg_AllowScriptsOnce
messages.

Changed our code to use ChromeMsgStart and FrameMsgStart.

Chromium change:

https://chromium.googlesource.com/chromium/src.git/+/31755f407c3da7280224c677ce62768d8c858a50

commit 31755f407c3da7280224c677ce62768d8c858a50
Author: Gyuyoung Kim <gyuyoung@igalia.com>
Date:   Thu Mar 12 10:27:02 2020 +0000

    Convert BlinkTestHostMsg_PrintMessage to Mojo

    This CL converts BlinkTestHostMsg_PrintMessage to BlinkTestClient
    interface. But, BlinkTestRunner::PrintMessage needs to send a message
    only when it's on the mainframe in order to sync with the existing
    behavior. Like BlinkTestHostMsg_ResetDone conversion, this message
    has been sent to the main frame. So, this CL moves |is_secondary_window|
    from WebTestRenderFrameObserver to BlinkTestRunner.

    Additionally, this CL removes blink_test_messages.h/cc files and related
    things(e.g. BlinkTestMsgStart) finally.

    Bug: 1039247, 1059322
---
 common/render_messages.h        | 2 +-
 content/common/frame_messages.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/render_messages.h b/common/render_messages.h
index 733bf2c22586..e730a2136c3c 100644
--- a/common/render_messages.h
+++ b/common/render_messages.h
@@ -11,7 +11,7 @@
 // The message starter should be declared in ipc/ipc_message_start.h. Since
 // we don't want to patch Chromium, we just pretend to be Content Shell.
 
-#define IPC_MESSAGE_START BlinkTestMsgStart
+#define IPC_MESSAGE_START ChromeMsgStart
 
 // Tells the browser that content in the current page was blocked due to the
 // user's content settings.
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index bfd4a2cf349b..ff115f9bac03 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h
@@ -13,7 +13,7 @@
 // The message starter should be declared in ipc/ipc_message_start.h. Since
 // we don't want to patch Chromium, we just pretend to be Content Shell.
 
-#define IPC_MESSAGE_START BlinkTestMsgStart
+#define IPC_MESSAGE_START FrameMsgStart
 
 // Tell RenderFrame(s) to temporary allow scripts from a list of origins once.
 IPC_MESSAGE_ROUTED1(

From cab9236faabaed24e49d96deea3e9d7ad72d52ec Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 29 Apr 2020 15:53:47 -0400
Subject: [PATCH 093/161] Upgrade patches from Chromium 83.0.4103.24 to
 Chromium 83.0.4103.34.

---
 patches/chrome-VERSION.patch                           |  4 ++--
 ...id-java-res-menu-website_preferences_menu.xml.patch |  2 +-
 patches/chrome-browser-BUILD.gn.patch                  |  2 +-
 patches/chrome-browser-prefs-browser_prefs.cc.patch    |  6 +++---
 patches/chrome-test-BUILD.gn.patch                     |  2 +-
 ..._bookmarks-bookmark_remote_updates_handler.cc.patch |  6 +++---
 .../third_party-blink-renderer-modules-BUILD.gn.patch  |  2 +-
 ...-blink-renderer-modules-modules_idl_files.gni.patch |  2 +-
 ...modules-peerconnection-rtc_peer_connection.cc.patch | 10 +++++-----
 patches/tools-metrics-histograms-histograms.xml.patch  |  4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index 1d72098716e4..3e1b6f8844ec 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index e3aa452220e68d45f0a317008df8dd27e44bff60..7eb979ba4d18937e1e482e848b078959ef6d1143 100644
+index e3da50bf97ece26c3801e37b6c30aa0d0caf49b6..9ce40941eb9f4c12af1e4d9391a4c479e473f31d 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=83
 -MINOR=0
 -BUILD=4103
--PATCH=24
+-PATCH=34
 +MINOR=1
 +BUILD=11
 +PATCH=28
diff --git a/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch b/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch
index ebb4a88f8b32..f6d2a00b22fa 100644
--- a/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch
+++ b/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/res/menu/website_preferences_menu.xml b/chrome/android/java/res/menu/website_preferences_menu.xml
-index 6371709bb96312fe31a1f4e48eee546e4e8bd746..e6c35c0b4398d43727137bb172b1c3f23fc9d316 100644
+index 6371709bb96312fe31a1f4e48eee546e4e8bd746..e1a88694bc1d273cc1975af4731c671aff3e2354 100644
 --- a/chrome/android/java/res/menu/website_preferences_menu.xml
 +++ b/chrome/android/java/res/menu/website_preferences_menu.xml
 @@ -9,4 +9,5 @@
diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
index 22d15d0d0090..a756d2b2257f 100644
--- a/patches/chrome-browser-BUILD.gn.patch
+++ b/patches/chrome-browser-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 023024e81c99d09efc0d1530a6c9ae3f1acf3abe..4554a8aa717ba00fc585f58c63e04cf229535f5c 100644
+index b3f8ac152722daf79878d83f14d2ee0bf625004c..242dd69159bea49f1933ff737929c3334ba9f594 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -2295,6 +2295,7 @@ jumbo_static_library("browser") {
diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch
index e8d05f126981..cf3d8680dd18 100644
--- a/patches/chrome-browser-prefs-browser_prefs.cc.patch
+++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 7d01e4acda839de52694d139584991a5922bbe8a..331f9f77eee3594899a565bb221dc338a273557c 100644
+index b40d5bc7482dd5890cf4ee0e74b228a0358596c8..f84eabd4b25f44fc4de74bfde1d128e6ba44f4e4 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -828,6 +828,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -829,6 +829,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
  #if defined(TOOLKIT_VIEWS)
    RegisterBrowserViewLocalPrefs(registry);
  #endif
@@ -10,7 +10,7 @@ index 7d01e4acda839de52694d139584991a5922bbe8a..331f9f77eee3594899a565bb221dc338
  
    // Obsolete. See MigrateObsoleteBrowserPrefs().
    registry->RegisterBooleanPref(kGCMChannelStatus, true);
-@@ -1094,6 +1095,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1096,6 +1097,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
  #endif
  
    RegisterProfilePrefsForMigration(registry);
diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
index e187bb1cb6eb..d71cf5908508 100644
--- a/patches/chrome-test-BUILD.gn.patch
+++ b/patches/chrome-test-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 2bce2f66a1ec9c08ec6ae043239042c856c920db..ff609cb828f2b58436df7a8975b8ece20460527d 100644
+index fc952779121dd645e061a44366ab6c1f04681f60..b73ffc395bf77df23fb9b4273864d36713d1b142 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -732,6 +732,7 @@ if (!is_android) {
diff --git a/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch b/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch
index 86817380f9ae..46e683557bce 100644
--- a/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch
+++ b/patches/components-sync_bookmarks-bookmark_remote_updates_handler.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/sync_bookmarks/bookmark_remote_updates_handler.cc b/components/sync_bookmarks/bookmark_remote_updates_handler.cc
-index 8d1261102edafd134480f4685a9d55a922657f8c..7774853567cea0b1e12c92fb56024bd3402236c6 100644
+index 30a54904dfff162acef31ce5ea160740d299e617..e1342f9302b5761028bd1d29352cde3e7afb7d03 100644
 --- a/components/sync_bookmarks/bookmark_remote_updates_handler.cc
 +++ b/components/sync_bookmarks/bookmark_remote_updates_handler.cc
-@@ -150,6 +150,7 @@ void ApplyRemoteUpdate(
+@@ -158,6 +158,7 @@ void ApplyRemoteUpdate(
    // Compute index information before updating the |tracker|.
    const size_t old_index = size_t{old_parent->GetIndexOf(node)};
    const size_t new_index =
@@ -10,7 +10,7 @@ index 8d1261102edafd134480f4685a9d55a922657f8c..7774853567cea0b1e12c92fb56024bd3
        ComputeChildNodeIndex(new_parent, update_entity.unique_position, tracker);
    tracker->Update(tracked_entity, update.response_version,
                    update_entity.modification_time,
-@@ -494,9 +495,11 @@ BookmarkRemoteUpdatesHandler::ProcessCreate(
+@@ -532,9 +533,11 @@ BookmarkRemoteUpdatesHandler::ProcessCreate(
      LogProblematicBookmark(RemoteBookmarkUpdateError::kParentNotFolder);
      return nullptr;
    }
diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch
index 6f8ac2cf002b..450155609c08 100644
--- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch
+++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn
-index 054d8fe06d574b292187225821adcf05db7def1d..fbfc76daa3ec58a958036d625f82e5f9149c3fc9 100644
+index 762f66ac93801aef52abb289fd45b4545eed3984..9c71f67562ef108cb100e370531e734024d494eb 100644
 --- a/third_party/blink/renderer/modules/BUILD.gn
 +++ b/third_party/blink/renderer/modules/BUILD.gn
 @@ -16,6 +16,7 @@ if (is_android) {
diff --git a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch
index 3ffc7e859593..283cf41b3ee7 100644
--- a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch
+++ b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/modules_idl_files.gni b/third_party/blink/renderer/modules/modules_idl_files.gni
-index 4050c62353344b0b019905ecd32bd4f985369642..385d0f34f18f48193d52718e9ce0b11c8fb66328 100644
+index 8b95cf952733cde24a84949993355893edb9d9d7..4d585f5418514b4e9f35ce54f1f1eb2b0fed6a28 100644
 --- a/third_party/blink/renderer/modules/modules_idl_files.gni
 +++ b/third_party/blink/renderer/modules/modules_idl_files.gni
 @@ -133,6 +133,7 @@ _idl_imports = [
diff --git a/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch b/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
index ceb8ddadbf5c..90b6a2ef9a4b 100644
--- a/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
+++ b/patches/third_party-blink-renderer-modules-peerconnection-rtc_peer_connection.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
-index 3484f28cf16bc288dd834f9da07a7c76e057c38c..42f3e43f3be7ed15482c4d2494b40e8e8d7d61a1 100644
+index 35aa9094e41e95f121a71b3b762d3e8b443b2280..7a95bdbf3174743b96dd436b8d326388708b56fd 100644
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
 @@ -837,6 +837,7 @@ void RTCPeerConnection::Dispose() {
@@ -34,7 +34,7 @@ index 3484f28cf16bc288dd834f9da07a7c76e057c38c..42f3e43f3be7ed15482c4d2494b40e8e
    if (CallErrorCallbackIfSignalingStateClosed(signaling_state_, error_callback))
      return ScriptPromise::CastUndefined(script_state);
  
-@@ -1335,6 +1339,7 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
+@@ -1337,6 +1341,7 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
      ScriptState* script_state,
      const RTCSessionDescriptionInit* session_description_init,
      ExceptionState& exception_state) {
@@ -42,7 +42,7 @@ index 3484f28cf16bc288dd834f9da07a7c76e057c38c..42f3e43f3be7ed15482c4d2494b40e8e
    if (session_description_init->type().IsNull() &&
        session_description_init->sdp().IsNull()) {
      return setLocalDescription(script_state);
-@@ -1395,6 +1400,7 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
+@@ -1397,6 +1402,7 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
            WebFeature::
                kRTCPeerConnectionSetLocalDescriptionLegacyNoFailureCallback);
    }
@@ -50,7 +50,7 @@ index 3484f28cf16bc288dd834f9da07a7c76e057c38c..42f3e43f3be7ed15482c4d2494b40e8e
    String sdp;
    if (session_description_init->type() != "rollback") {
      DOMException* exception =
-@@ -1447,6 +1453,7 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
+@@ -1449,6 +1455,7 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
      ScriptState* script_state,
      const RTCSessionDescriptionInit* session_description_init,
      ExceptionState& exception_state) {
@@ -58,7 +58,7 @@ index 3484f28cf16bc288dd834f9da07a7c76e057c38c..42f3e43f3be7ed15482c4d2494b40e8e
    if (session_description_init->type() != "rollback") {
      MaybeWarnAboutUnsafeSdp(session_description_init);
      ReportSetSdpUsage(SetSdpOperationType::kSetRemoteDescription,
-@@ -1501,6 +1508,7 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
+@@ -1503,6 +1510,7 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
            WebFeature::
                kRTCPeerConnectionSetRemoteDescriptionLegacyNoFailureCallback);
    }
diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch
index fbc44807c22c..c4356bfd7852 100644
--- a/patches/tools-metrics-histograms-histograms.xml.patch
+++ b/patches/tools-metrics-histograms-histograms.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
-index ceb7d3a4d51388ad0d47ddd5435b2403a6aa97bb..3e7aabaee68c8f19cbc316e03fba53bafc095cda 100644
+index 133828e2a0dffb3d57263b22da887763f9a52b55..b8b31996c34eebfcf136de540bc231f13e72bae9 100644
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -196181,6 +196181,7 @@ regressions. -->
+@@ -196224,6 +196224,7 @@ regressions. -->
    <suffix name="ProtectedMedia" label="Protected media permission"/>
    <suffix name="PushMessaging" label="Push messaging permission"/>
    <suffix name="Quota" label="Quota permission"/>

From d188fae958ee9f75df3d4644365c9837f90a1123 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 29 Apr 2020 17:34:55 -0400
Subject: [PATCH 094/161] [Browser Tests] Initialize BraveMainDelegate with
 time.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/f7db9c2bbd0cd5108a93fd77e2c68c464062826b

commit f7db9c2bbd0cd5108a93fd77e2c68c464062826b
Author: Etienne Pierre-doray <etiennep@chromium.org>
Date:   Thu Mar 19 18:54:05 2020 +0000

    [Startup metrics]: new NonEmptyPaint3 uses application start.

    NonEmptyPaint3 now compares to application start time instead of process
    creation time.

    This CL refactors startup.LoadTime steps to be cross-platform, with:
    - process creation
    - application start time
    - ChromeMain() time

    This CL also updates a histograms that measure delta between these for
    validation.

    The metric is behaving weird on mac. It's less error prone to use TimeTicks
    sampled early than aligning clocks.

    Context: https://groups.google.com/a/google.com/g/chrome-catan/c/BhJOc7JIYeY
---
 test/base/brave_test_launcher_delegate.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/base/brave_test_launcher_delegate.cc b/test/base/brave_test_launcher_delegate.cc
index f7f9b2450411..0005abf93aaa 100644
--- a/test/base/brave_test_launcher_delegate.cc
+++ b/test/base/brave_test_launcher_delegate.cc
@@ -14,5 +14,5 @@ BraveTestLauncherDelegate::~BraveTestLauncherDelegate() = default;
 
 content::ContentMainDelegate*
 BraveTestLauncherDelegate::CreateContentMainDelegate() {
-  return new BraveMainDelegate();
+  return new BraveMainDelegate(base::TimeTicks::Now());
 }

From 2508a75a42236e43dc9792cfcd2de71817fff50b Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 4 May 2020 13:19:46 -0400
Subject: [PATCH 095/161] Use auto in range-based for loop over map.

The original code resulted in an error:

contribution.cc(206,48): error: loop variable 'value' of type 'const std::pair<std::string, uint32_t> &' (aka 'const pair<basic_string<char, char_traits<char>, allocator<char>>, unsigned int> &') binds to a temporary constructed from type 'std::__1::__map_iterator<std::__1::__tree_iterator<std::__1::__value_type<std::__1::basic_string<char>, unsigned int>, std::__1::__tree_node<std::__1::__value_type<std::__1::basic_string<char>, unsigned int>, void *> *, long long>>::reference' (aka 'pair<const std::__1::basic_string<char>, unsigned int> &') [-Werror,-Wrange-loop-construct]
  for (std::pair<std::string, uint32_t> const& value : retry_timers_) {
                                               ^
../../brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc(206,8): note: use non-reference type 'std::pair<std::string, uint32_t>' (aka 'pair<basic_string<char, char_traits<char>, allocator<char>>, unsigned int>') to make construction explicit or type 'const std::__1::__map_iterator<std::__1::__tree_iterator<std::__1::__value_type<std::__1::basic_string<char>, unsigned int>, std::__1::__tree_node<std::__1::__value_type<std::__1::basic_string<char>, unsigned int>, void *> *, long long>>::value_type &' (aka 'const pair<const std::__1::basic_string<char>, unsigned int> &') to prevent copying
  for (std::pair<std::string, uint32_t> const& value : retry_timers_) {
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
---
 .../src/bat/ledger/internal/contribution/contribution.cc        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc
index 4750714f3d58..091cbe771177 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution.cc
@@ -202,7 +202,7 @@ void Contribution::OnTimer(uint32_t timer_id) {
   unverified_->OnTimer(timer_id);
   uphold_->OnTimer(timer_id);
 
-  for (std::pair<std::string, uint32_t> const& value : retry_timers_) {
+  for (const auto& value : retry_timers_) {
     if (value.second != timer_id) {
       continue;
     }

From c07072d44c14fb297686ff140189803a1bd06f04 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 22 Apr 2020 17:26:56 -0400
Subject: [PATCH 096/161] Get around profile location constraint for Tor.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/5674a41893ed2979bceb8a2cd444b7616706f58e

commit 5674a41893ed2979bceb8a2cd444b7616706f58e
Author: Alex Ilin <alexilin@chromium.org>
Date:   Tue Feb 25 18:03:25 2020 +0000

    [profiles] Do not create profiles outside of user data directory

    Chrome profiles must always be located inside the user data directory.
    Using "profile-directory" command line flag, the user can violate this
    requirement. Initialization of a profile outside of the user data
    directory would eventually fail. But it would happen after a profile
    object and all files inside of the profile are created.

    This CL adds a check to profile creation functions that will return
    nullptr if a profile directory is disallowed. A profile directory is
    allowed if its direct parent is the user data directory.

    This CL also extends the expiration date of
    Profile.InitProfileUserPrefs.OutsideUserDir and
    Profile.GetProfileInfoPath.OutsideUserDir histograms to verify that they
    are no longer recorded after this fix.

    Bug: 981374, 1053107
---
 browser/profiles/brave_profile_manager.cc     | 36 +++++++++++----
 browser/profiles/brave_profile_manager.h      | 10 +++++
 .../profiles/tor_unittest_profile_manager.h   |  6 +--
 .../chrome/browser/profiles/profile_manager.h | 23 ++++++++++
 ...e-browser-profiles-profile_manager.h.patch | 45 +++----------------
 5 files changed, 68 insertions(+), 52 deletions(-)
 create mode 100644 chromium_src/chrome/browser/profiles/profile_manager.h

diff --git a/browser/profiles/brave_profile_manager.cc b/browser/profiles/brave_profile_manager.cc
index 8fc5f59739ff..0f4f7ac55ed4 100644
--- a/browser/profiles/brave_profile_manager.cc
+++ b/browser/profiles/brave_profile_manager.cc
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
+#include "brave/browser/brave_rewards/rewards_service_factory.h"
 #include "brave/browser/profiles/profile_util.h"
 #include "brave/browser/tor/buildflags.h"
 #include "brave/browser/tor/tor_profile_service.h"
@@ -19,7 +20,6 @@
 #include "brave/common/tor/pref_names.h"
 #include "brave/common/tor/tor_constants.h"
 #include "brave/components/brave_ads/browser/ads_service_factory.h"
-#include "brave/browser/brave_rewards/rewards_service_factory.h"
 #include "brave/components/brave_shields/browser/ad_block_regional_service.h"
 #include "brave/components/brave_shields/browser/ad_block_service.h"
 #include "brave/components/brave_shields/browser/brave_shields_util.h"
@@ -141,6 +141,8 @@ std::string BraveProfileManager::GetLastUsedProfileName() {
 void BraveProfileManager::DoFinalInitForServices(Profile* profile,
                                                  bool go_off_the_record) {
   ProfileManager::DoFinalInitForServices(profile, go_off_the_record);
+  if (!do_final_services_init_)
+    return;
   brave_ads::AdsServiceFactory::GetForProfile(profile);
   brave_rewards::RewardsServiceFactory::GetForProfile(profile);
 #if BUILDFLAG(BRAVE_WALLET_ENABLED)
@@ -154,6 +156,20 @@ void BraveProfileManager::DoFinalInitForServices(Profile* profile,
 #endif
 }
 
+bool BraveProfileManager::IsAllowedProfilePath(
+    const base::FilePath& path) const {
+  // Chromium only allows profiles to be created in the user_data_dir, but we
+  // want to also be able to create profile in subfolders of user_data_dir.
+  return ProfileManager::IsAllowedProfilePath(path) ||
+         user_data_dir().IsParent(path.DirName());
+}
+
+void BraveProfileManager::AddProfileToStorage(Profile* profile) {
+  if (brave::IsTorProfile(profile))
+    return;
+  ProfileManager::AddProfileToStorage(profile);
+}
+
 void BraveProfileManager::OnProfileCreated(Profile* profile,
                                            bool success,
                                            bool is_new_profile) {
@@ -164,13 +180,6 @@ void BraveProfileManager::OnProfileCreated(Profile* profile,
 
 #if BUILDFLAG(ENABLE_TOR)
   if (brave::IsTorProfile(profile)) {
-    ProfileAttributesEntry* entry;
-    ProfileAttributesStorage& storage = GetProfileAttributesStorage();
-    if (storage.GetProfileAttributesWithPath(profile->GetPath(), &entry)) {
-      profile->GetPrefs()->SetBoolean(prefs::kForceEphemeralProfiles, true);
-      entry->SetIsEphemeral(true);
-    }
-
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     // This is added in addition to our AreExtensionsDisabled override in
     // brave_extensions_browser_client_impl because there were extension
@@ -178,7 +187,10 @@ void BraveProfileManager::OnProfileCreated(Profile* profile,
     // only.
     extensions::ExtensionService* extension_service =
         extensions::ExtensionSystem::Get(profile)->extension_service();
-    extension_service->BlockAllExtensions();
+    // In tests, BraveProfileManagerWithoutInit is used, so extension_service
+    // won't be there.
+    if (extension_service)
+      extension_service->BlockAllExtensions();
 #endif
 
     // We need to wait until OnProfileCreated to
@@ -239,3 +251,9 @@ void BraveProfileManager::Observe(int type,
     }
   }
 }
+
+BraveProfileManagerWithoutInit::BraveProfileManagerWithoutInit(
+    const base::FilePath& user_data_dir)
+    : BraveProfileManager(user_data_dir) {
+  set_do_final_services_init(false);
+}
diff --git a/browser/profiles/brave_profile_manager.h b/browser/profiles/brave_profile_manager.h
index 934676e571cf..eee16185fa7d 100644
--- a/browser/profiles/brave_profile_manager.h
+++ b/browser/profiles/brave_profile_manager.h
@@ -23,6 +23,8 @@ class BraveProfileManager : public ProfileManager {
   void InitProfileUserPrefs(Profile* profile) override;
   std::string GetLastUsedProfileName() override;
   void SetNonPersonalProfilePrefs(Profile* profile) override;
+  bool IsAllowedProfilePath(const base::FilePath& path) const override;
+  void AddProfileToStorage(Profile* profile) override;
 
   void OnProfileCreated(Profile* profile,
                         bool success,
@@ -41,4 +43,12 @@ class BraveProfileManager : public ProfileManager {
   DISALLOW_COPY_AND_ASSIGN(BraveProfileManager);
 };
 
+class BraveProfileManagerWithoutInit : public BraveProfileManager {
+ public:
+  explicit BraveProfileManagerWithoutInit(const base::FilePath& user_data_dir);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BraveProfileManagerWithoutInit);
+};
+
 #endif  // BRAVE_BROWSER_PROFILES_BRAVE_PROFILE_MANAGER_H_
diff --git a/browser/profiles/tor_unittest_profile_manager.h b/browser/profiles/tor_unittest_profile_manager.h
index 0c77e4214c2a..1a8d8161688c 100644
--- a/browser/profiles/tor_unittest_profile_manager.h
+++ b/browser/profiles/tor_unittest_profile_manager.h
@@ -8,12 +8,12 @@
 
 #include <memory>
 
-#include "chrome/browser/profiles/profile_manager.h"
+#include "brave/browser/profiles/brave_profile_manager.h"
 
-class TorUnittestProfileManager : public ProfileManagerWithoutInit {
+class TorUnittestProfileManager : public BraveProfileManagerWithoutInit {
  public:
   explicit TorUnittestProfileManager(const base::FilePath& user_data_dir)
-      : ProfileManagerWithoutInit(user_data_dir) {}
+      : BraveProfileManagerWithoutInit(user_data_dir) {}
   ~TorUnittestProfileManager() override = default;
 
  protected:
diff --git a/chromium_src/chrome/browser/profiles/profile_manager.h b/chromium_src/chrome/browser/profiles/profile_manager.h
new file mode 100644
index 000000000000..9f243297c169
--- /dev/null
+++ b/chromium_src/chrome/browser/profiles/profile_manager.h
@@ -0,0 +1,23 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#define GetLastUsedProfileName virtual GetLastUsedProfileName
+#define InitProfileUserPrefs virtual InitProfileUserPrefs
+#define DoFinalInitForServices virtual DoFinalInitForServices
+#define SetNonPersonalProfilePrefs virtual SetNonPersonalProfilePrefs
+#define IsAllowedProfilePath virtual IsAllowedProfilePath
+#define AddProfileToStorage virtual AddProfileToStorage
+#define BRAVE_PROFILE_MANAGER_H     \
+ private:                           \
+  friend class BraveProfileManager; \
+                                    \
+ public:
+#include "../../../../../../chrome/browser/profiles/profile_manager.h"
+#undef AddProfileToStorage
+#undef IsAllowedProfilePath
+#undef SetNonPersonalProfilePrefs
+#undef DoFinalInitForServices
+#undef InitProfileUserPrefs
+#undef GetLastUsedProfileName
diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch
index 334679c04e34..f60745444eba 100644
--- a/patches/chrome-browser-profiles-profile_manager.h.patch
+++ b/patches/chrome-browser-profiles-profile_manager.h.patch
@@ -1,47 +1,12 @@
 diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
-index 3e1e28ea7d0e9c90d0c2189dae6ba6a394582aac..e67f1e0d57cfd01f56a0291fd2d3cff8c86b1180 100644
+index 3e1e28ea7d0e9c90d0c2189dae6ba6a394582aac..7a7746905e152dcdabaf7c3de24a31f8528fd662 100644
 --- a/chrome/browser/profiles/profile_manager.h
 +++ b/chrome/browser/profiles/profile_manager.h
-@@ -148,7 +148,7 @@ class ProfileManager : public content::NotificationObserver,
- 
-   // Get the name of the last used profile, or if that's undefined, the default
-   // profile.
--  std::string GetLastUsedProfileName();
-+  virtual std::string GetLastUsedProfileName();
- 
-   // Get the Profiles which are currently open, i.e. have open browsers or were
-   // open the last time Chrome was running. Profiles that fail to initialize are
-@@ -229,7 +229,7 @@ class ProfileManager : public content::NotificationObserver,
- 
-   // Initializes user prefs of |profile|. This includes profile name and
-   // avatar values.
--  void InitProfileUserPrefs(Profile* profile);
-+  virtual void InitProfileUserPrefs(Profile* profile);
- 
-   // Register and add testing profile to the ProfileManager. Use ONLY in tests.
-   // This allows the creation of Profiles outside of the standard creation path
-@@ -271,6 +271,7 @@ class ProfileManager : public content::NotificationObserver,
+@@ -269,6 +269,7 @@ class ProfileManager : public content::NotificationObserver,
+   void set_do_final_services_init(bool do_final_services_init) {
+     do_final_services_init_ = do_final_services_init;
    }
++  BRAVE_PROFILE_MANAGER_H
  
   private:
-+  friend class BraveProfileManager;
    friend class TestingProfileManager;
-   FRIEND_TEST_ALL_PREFIXES(ProfileManagerBrowserTest, DeleteAllProfiles);
-   FRIEND_TEST_ALL_PREFIXES(ProfileManagerBrowserTest, SwitchToProfile);
-@@ -295,6 +296,7 @@ class ProfileManager : public content::NotificationObserver,
- 
-   // Does final initial actions.
-   void DoFinalInit(ProfileInfo* profile_info, bool go_off_the_record);
-+  virtual
-   void DoFinalInitForServices(Profile* profile, bool go_off_the_record);
-   void DoFinalInitLogging(Profile* profile);
- 
-@@ -361,7 +363,7 @@ class ProfileManager : public content::NotificationObserver,
- 
-   // Apply settings for profiles created by the system rather than users: The
-   // (desktop) Guest User profile and (desktop) System Profile.
--  void SetNonPersonalProfilePrefs(Profile* profile);
-+  virtual void SetNonPersonalProfilePrefs(Profile* profile);
- 
-   // Determines if profile should be OTR.
-   bool ShouldGoOffTheRecord(Profile* profile);

From 143e2e333c5abac1777bee4edbce6f05cb0e12b9 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 4 May 2020 16:13:10 -0400
Subject: [PATCH 097/161] Commented out DCHECK in profile_sync_service.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/aa27e241dca7395adb048620f9c5685798161c96

commit aa27e241dca7395adb048620f9c5685798161c96
Author: Rushan Suleymanov <rushans@google.com>
Date:   Fri Feb 28 11:28:36 2020 +0000

    Reland "Verify consistency between sync and sign-in account IDs"

    This reverts commit 9f5f561e4b2b6cb5a11813bc47d7d08f08a223ea.

    Reason for revert: reland this patch after fixing of DCHECK failures at crrev.com/c/2061751.

    Original change's description:
    > Revert "Verify consistency between sync and sign-in account IDs"
    >
    > This reverts commit caf8eebf99fa96125a1b0ae48392e68b7dc2ce0b.
    >
    > Reason for revert: suspect of running into sync protocol violations and
    > the corresponding DCHECK failures.
    >
    > This CL reverts a preference being introduced without the corresponding
    > cleanup logic; but we intend to reland this patch anyway.
    >
    > Original change's description:
    > > Verify consistency between sync and sign-in account IDs
    > >
    > > Local sync metadata belongs to one user account. Due to the distributed
    > > nature of the locally persisted sync metadata, the cache GUID is used
    > > as "epoch" to detect mismatched in edge cases like the browser crashing
    > > during shutdown and before I/O gets flushed.
    > >
    > > However, prior to this patch, the cache GUID itself has no safety
    > > mechanism to detect it maps to the intended account ID. In this patch,
    > > a new SyncPref is introduced to achieve that, in away that both prefs
    > > (cache GUID and account ID) are stored atomically.
    > >
    > > Because the pref is newly-introduced, migration logic is introduced to
    > > populate it for the first time if initially empty.
    > >
    >
    > Bug: 1046237, 1021527, 1048771
---
 .../components/sync/driver/profile_sync_service.cc   |  2 ++
 ...ponents-sync-driver-profile_sync_service.cc.patch | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/chromium_src/components/sync/driver/profile_sync_service.cc b/chromium_src/components/sync/driver/profile_sync_service.cc
index 5b995a855e87..921141d18a80 100644
--- a/chromium_src/components/sync/driver/profile_sync_service.cc
+++ b/chromium_src/components/sync/driver/profile_sync_service.cc
@@ -71,6 +71,8 @@ void BraveInit(base::WeakPtr<ProfileSyncService> profile_sync_service,
 #if BUILDFLAG(ENABLE_BRAVE_SYNC)
 #define IsSyncFeatureEnabled() IsBraveSyncEnabled(this)
 #endif
+#define BRAVE_PROFILE_SYNC_SERVICE_START_UP_SLOW_ENGINE_COMPONENTS_IF_FALSE \
+  if (false)
 #define BRAVE_PROFILE_SYNC_SERVICE_START_UP_SLOW_ENGINE_COMPONENTS \
   BraveInit(sync_enabled_weak_factory_.GetWeakPtr(), &sync_prefs_, &params);
 
diff --git a/patches/components-sync-driver-profile_sync_service.cc.patch b/patches/components-sync-driver-profile_sync_service.cc.patch
index 11f59b29f954..9e7455bcbf5f 100644
--- a/patches/components-sync-driver-profile_sync_service.cc.patch
+++ b/patches/components-sync-driver-profile_sync_service.cc.patch
@@ -1,8 +1,16 @@
 diff --git a/components/sync/driver/profile_sync_service.cc b/components/sync/driver/profile_sync_service.cc
-index 44a6eb15256323c76a10dcd6c412e228ae822e60..c76f70ddc3ad115051eb1f30c6bd84b7edd97319 100644
+index 44a6eb15256323c76a10dcd6c412e228ae822e60..0b21c447f9a80295d4a38b948904fa8e5d7904b8 100644
 --- a/components/sync/driver/profile_sync_service.cc
 +++ b/components/sync/driver/profile_sync_service.cc
-@@ -617,6 +617,7 @@ void ProfileSyncService::StartUpSlowEngineComponents() {
+@@ -568,6 +568,7 @@ void ProfileSyncService::StartUpSlowEngineComponents() {
+   } else {
+     // Except for local sync (roaming profiles), the user must be signed in for
+     // sync to start.
++    BRAVE_PROFILE_SYNC_SERVICE_START_UP_SLOW_ENGINE_COMPONENTS_IF_FALSE
+     DCHECK(!authenticated_account_info.gaia.empty());
+     DCHECK(!authenticated_account_info.account_id.empty());
+   }
+@@ -617,6 +618,7 @@ void ProfileSyncService::StartUpSlowEngineComponents() {
        create_http_post_provider_factory_cb_, MakeUserAgentForSync(channel_),
        url_loader_factory_->Clone(), network_time_update_callback_);
    params.authenticated_account_id = authenticated_account_info.account_id;

From 18dc48521921bc21b90e9231a1e6f2bbc8057581 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Thu, 30 Apr 2020 16:09:02 -0400
Subject: [PATCH 098/161] [Android] Fixed configuration files for build

---
 android/brave_java_resources.gni              | 682 ++++++++++++++++++
 android/brave_java_sources.gni                |   1 -
 ...eClearBrowsingDataPreferencesAdvanced.java |  67 --
 build/android/config.gni                      |   5 +-
 4 files changed, 683 insertions(+), 72 deletions(-)
 create mode 100644 android/brave_java_resources.gni
 delete mode 100644 android/java/org/chromium/chrome/browser/browsing_data/BraveClearBrowsingDataPreferencesAdvanced.java

diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni
new file mode 100644
index 000000000000..2c226294969b
--- /dev/null
+++ b/android/brave_java_resources.gni
@@ -0,0 +1,682 @@
+# Copyright 2020 The Brave Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# See 'chrome/android/chrome_java_resources.gni' on how to generate this list
+brave_java_resources = [
+  "java/res/anim/activity_fade_in.xml",
+  "java/res/anim/activity_fade_out.xml",
+  "java/res/drawable/radio_button_selected_bg.xml",
+  "java/res/drawable/bat_panel_gradient.xml",
+  "java/res/drawable/brave_sync_btn.xml",
+  "java/res/drawable/brave_sync_cover_general.xml",
+  "java/res/drawable/rewards_button_summary.xml",
+  "java/res/drawable/brave_rewards_not_verified_rectangle.xml",
+  "java/res/drawable/blue_rounded_button.xml",
+  "java/res/drawable/rewards_button.xml",
+  "java/res/drawable/brave_sync_qr_rounded.xml",
+  "java/res/drawable/brave_sync_image_btn.xml",
+  "java/res/drawable/brave_sync_toggle_off_btn_right.xml",
+  "java/res/drawable/rewards_image_button.xml",
+  "java/res/drawable/rewards_button_purple_border.xml",
+  "java/res/drawable/rounded_shape.xml",
+  "java/res/drawable/brave_badge_rewards_background_large.xml",
+  "java/res/drawable/rewards_button_orange.xml",
+  "java/res/drawable/progress_indeterminate_orange.xml",
+  "java/res/drawable/radiobutton_background.xml",
+  "java/res/drawable/brave_badge_shields_background_large.xml",
+  "java/res/drawable/brave_sync_toggle_off_btn_left.xml",
+  "java/res/drawable/brave_gradient_shadow.xml",
+  "java/res/drawable/brave_modern_toolbar_text_box_background.xml",
+  "java/res/drawable/brave_rewards_circle.xml",
+  "java/res/drawable/tip_amount.xml",
+  "java/res/drawable/brave_sync_toggle_on_btn_right.xml",
+  "java/res/drawable/brave_rewards_rectangle.xml",
+  "java/res/drawable/brave_rewards_loader.xml",
+  "java/res/drawable/brave_badge_shields_background_small.xml",
+  "java/res/drawable/modern_toolbar_background_grey_end_segment.xml",
+  "java/res/drawable/orange_rounded_button.xml",
+  "java/res/drawable/wallet_disconnected_button.xml",
+  "java/res/drawable/publisher_favicon_background.xml",
+  "java/res/drawable/brave_sync_toggle_on_btn_left.xml",
+  "java/res/drawable/brave_sync_top_rounded.xml",
+  "java/res/drawable/brave_badge_rewards_background_small.xml",
+  "java/res/drawable/circular_progress.xml",
+  "java/res/drawable/rounded_corners.xml",
+  "java/res/drawable/bat_rewards_summary_gradient.xml",
+  "java/res/drawable/wallet_verify_button.xml",
+  "java/res/drawable/plain_checkbox.xml",
+  "java/res/drawable/rect_round_corners_12.xml",
+  "java/res/drawable/progress_indeterminate.xml",
+  "java/res/drawable/image_credit_rounded_shape.xml",
+  "java/res/drawable/rect_up_round_corners_12.xml",
+  "java/res/drawable/enable_rewards_button.xml",
+  "java/res/drawable-hdpi/check.png",
+  "java/res/drawable-hdpi/btn_bookmark.png",
+  "java/res/drawable-hdpi/arrow_forward.png",
+  "java/res/drawable-hdpi/camera.png",
+  "java/res/drawable-hdpi/slide_up.png",
+  "java/res/drawable-hdpi/brave_ads_launch_graphic.png",
+  "java/res/drawable-hdpi/shortcut_incognito.png",
+  "java/res/drawable-hdpi/header.png",
+  "java/res/drawable-hdpi/changetip_icon.png",
+  "java/res/drawable-hdpi/uphold_white.png",
+  "java/res/drawable-hdpi/down_icon.png",
+  "java/res/drawable-hdpi/btn_toolbar_reload.png",
+  "java/res/drawable-hdpi/plus.png",
+  "java/res/drawable-hdpi/cover_photo.png",
+  "java/res/drawable-hdpi/icn_unverified_alert.png",
+  "java/res/drawable-hdpi/slide_down.png",
+  "java/res/drawable-hdpi/ic_expand_less_black_24dp.png",
+  "java/res/drawable-hdpi/chromelogo16.png",
+  "java/res/drawable-hdpi/settings_play_yt_video_in_browser.png",
+  "java/res/drawable-hdpi/disclosure.png",
+  "java/res/drawable-hdpi/plane_small.png",
+  "java/res/drawable-hdpi/location_bar_incognito_badge.png",
+  "java/res/drawable-hdpi/up_icon.png",
+  "java/res/drawable-hdpi/checkbox.png",
+  "java/res/drawable-hdpi/android_onboarding_4.png",
+  "java/res/drawable-hdpi/icon_error_notification.png",
+  "java/res/drawable-hdpi/ic_delete_white_24dp.png",
+  "java/res/drawable-hdpi/checkbox_checked.png",
+  "java/res/drawable-hdpi/btn_info.png",
+  "java/res/drawable-hdpi/bat_logo.png",
+  "java/res/drawable-hdpi/chevron_right.png",
+  "java/res/drawable-hdpi/search_engine_duckduckgo_lite.png",
+  "java/res/drawable-hdpi/brave_sync.png",
+  "java/res/drawable-hdpi/wallet_add.png",
+  "java/res/drawable-hdpi/btn_suggestion_refine.png",
+  "java/res/drawable-hdpi/notification_icon.png",
+  "java/res/drawable-hdpi/icon_warning_notification.png",
+  "java/res/drawable-hdpi/verified_disclosure.png",
+  "java/res/drawable-hdpi/search_engine_qwant.png",
+  "java/res/drawable-hdpi/notification_header_error.png",
+  "java/res/drawable-hdpi/notification_header.png",
+  "java/res/drawable-hdpi/grant_icon.png",
+  "java/res/drawable-hdpi/settings_desktop_mode.png",
+  "java/res/drawable-hdpi/verified_creator_large.png",
+  "java/res/drawable-hdpi/btn_star.png",
+  "java/res/drawable-hdpi/copy_paste.png",
+  "java/res/drawable-hdpi/omnibox_https_invalid_red.png",
+  "java/res/drawable-hdpi/group.png",
+  "java/res/drawable-hdpi/icn_twitter.png",
+  "java/res/drawable-hdpi/brave_sync_btn_laptop.png",
+  "java/res/drawable-hdpi/icon_validated_notification.png",
+  "java/res/drawable-hdpi/ic_file_download_white_24dp.png",
+  "java/res/drawable-hdpi/icon_close_notification.png",
+  "java/res/drawable-hdpi/icn_frowning_face.png",
+  "java/res/drawable-hdpi/contribute_icon.png",
+  "java/res/drawable-hdpi/bat_outline.png",
+  "java/res/drawable-hdpi/btn_bookmark_fill.png",
+  "java/res/drawable-hdpi/btn_delete_24dp.png",
+  "java/res/drawable-hdpi/incognito_splash.png",
+  "java/res/drawable-hdpi/btn_left.png",
+  "java/res/drawable-hdpi/brave_sync_btn_mobile.png",
+  "java/res/drawable-hdpi/android_onboarding_2.png",
+  "java/res/drawable-hdpi/wallet_withdraw.png",
+  "java/res/drawable-hdpi/btn_bat.png",
+  "java/res/drawable-hdpi/duckduckgo.png",
+  "java/res/drawable-hdpi/btn_toolbar_home.png",
+  "java/res/drawable-hdpi/notification_header_normal.png",
+  "java/res/drawable-hdpi/btn_tabstrip_switch_normal.png",
+  "java/res/drawable-hdpi/rewards_settings.png",
+  "java/res/drawable-hdpi/add_funds.png",
+  "java/res/drawable-hdpi/incognito_simple.png",
+  "java/res/drawable-hdpi/search_engine_google.png",
+  "java/res/drawable-hdpi/uphold_green.png",
+  "java/res/drawable-hdpi/btn_mic.png",
+  "java/res/drawable-hdpi/btn_star_filled.png",
+  "java/res/drawable-hdpi/ic_chrome.png",
+  "java/res/drawable-hdpi/modern_location_bar.9.png",
+  "java/res/drawable-hdpi/btn_brave.png",
+  "java/res/drawable-hdpi/search_engine_startpage.png",
+  "java/res/drawable-hdpi/btn_brave_off.png",
+  "java/res/drawable-hdpi/qrcode_dark.png",
+  "java/res/drawable-hdpi/android_br_on.png",
+  "java/res/drawable-hdpi/android_onboarding_3.png",
+  "java/res/drawable-hdpi/btn_tabswitcher_modern.png",
+  "java/res/drawable-hdpi/qrcode_light.png",
+  "java/res/drawable-hdpi/down_arrow.png",
+  "java/res/drawable-hdpi/icn_youtube.png",
+  "java/res/drawable-hdpi/android_onboarding_1.png",
+  "java/res/drawable-hdpi/bat_verified.png",
+  "java/res/drawable-hdpi/ic_expand_more_black_24dp.png",
+  "java/res/drawable-hdpi/omnibox_info_red.png",
+  "java/res/drawable-hdpi/icn_twitch.png",
+  "java/res/drawable-hdpi/btn_right_tablet.png",
+  "java/res/drawable-hdpi/brave_onboarding.png",
+  "java/res/drawable-hdpi/notification_header_warning.png",
+  "java/res/drawable-hdpi/search_engine_bing.png",
+  "java/res/drawable-hdpi/coins.png",
+  "java/res/drawable-hdpi/btn_right.png",
+  "java/res/drawable-hdpi/bat_icon.png",
+  "java/res/drawable-hdpi/search_engine_duckduckgo.png",
+  "java/res/drawable-hdpi/bat_unverified.png",
+  "java/res/drawable-hdpi/share_icon.png",
+  "java/res/drawable-hdpi/omnibox_https_valid.png",
+  "java/res/drawable-mdpi/check.png",
+  "java/res/drawable-mdpi/btn_bookmark.png",
+  "java/res/drawable-mdpi/arrow_forward.png",
+  "java/res/drawable-mdpi/camera.png",
+  "java/res/drawable-mdpi/slide_up.png",
+  "java/res/drawable-mdpi/brave_ads_launch_graphic.png",
+  "java/res/drawable-mdpi/shortcut_incognito.png",
+  "java/res/drawable-mdpi/header.png",
+  "java/res/drawable-mdpi/changetip_icon.png",
+  "java/res/drawable-mdpi/uphold_white.png",
+  "java/res/drawable-mdpi/down_icon.png",
+  "java/res/drawable-mdpi/btn_toolbar_reload.png",
+  "java/res/drawable-mdpi/plus.png",
+  "java/res/drawable-mdpi/cover_photo.png",
+  "java/res/drawable-mdpi/icn_unverified_alert.png",
+  "java/res/drawable-mdpi/slide_down.png",
+  "java/res/drawable-mdpi/ic_expand_less_black_24dp.png",
+  "java/res/drawable-mdpi/chromelogo16.png",
+  "java/res/drawable-mdpi/settings_play_yt_video_in_browser.png",
+  "java/res/drawable-mdpi/disclosure.png",
+  "java/res/drawable-mdpi/plane_small.png",
+  "java/res/drawable-mdpi/location_bar_incognito_badge.png",
+  "java/res/drawable-mdpi/up_icon.png",
+  "java/res/drawable-mdpi/checkbox.png",
+  "java/res/drawable-mdpi/android_onboarding_4.png",
+  "java/res/drawable-mdpi/icon_error_notification.png",
+  "java/res/drawable-mdpi/ic_delete_white_24dp.png",
+  "java/res/drawable-mdpi/checkbox_checked.png",
+  "java/res/drawable-mdpi/btn_info.png",
+  "java/res/drawable-mdpi/bat_logo.png",
+  "java/res/drawable-mdpi/chevron_right.png",
+  "java/res/drawable-mdpi/search_engine_duckduckgo_lite.png",
+  "java/res/drawable-mdpi/brave_sync.png",
+  "java/res/drawable-mdpi/wallet_add.png",
+  "java/res/drawable-mdpi/btn_suggestion_refine.png",
+  "java/res/drawable-mdpi/notification_icon.png",
+  "java/res/drawable-mdpi/icon_warning_notification.png",
+  "java/res/drawable-mdpi/verified_disclosure.png",
+  "java/res/drawable-mdpi/search_engine_qwant.png",
+  "java/res/drawable-mdpi/notification_header_error.png",
+  "java/res/drawable-mdpi/notification_header.png",
+  "java/res/drawable-mdpi/grant_icon.png",
+  "java/res/drawable-mdpi/settings_desktop_mode.png",
+  "java/res/drawable-mdpi/verified_creator_large.png",
+  "java/res/drawable-mdpi/btn_star.png",
+  "java/res/drawable-mdpi/copy_paste.png",
+  "java/res/drawable-mdpi/omnibox_https_invalid_red.png",
+  "java/res/drawable-mdpi/group.png",
+  "java/res/drawable-mdpi/icn_twitter.png",
+  "java/res/drawable-mdpi/brave_sync_btn_laptop.png",
+  "java/res/drawable-mdpi/icon_validated_notification.png",
+  "java/res/drawable-mdpi/ic_file_download_white_24dp.png",
+  "java/res/drawable-mdpi/icon_close_notification.png",
+  "java/res/drawable-mdpi/icn_frowning_face.png",
+  "java/res/drawable-mdpi/contribute_icon.png",
+  "java/res/drawable-mdpi/bat_outline.png",
+  "java/res/drawable-mdpi/btn_bookmark_fill.png",
+  "java/res/drawable-mdpi/btn_delete_24dp.png",
+  "java/res/drawable-mdpi/incognito_splash.png",
+  "java/res/drawable-mdpi/btn_left.png",
+  "java/res/drawable-mdpi/brave_sync_btn_mobile.png",
+  "java/res/drawable-mdpi/android_onboarding_2.png",
+  "java/res/drawable-mdpi/wallet_withdraw.png",
+  "java/res/drawable-mdpi/btn_bat.png",
+  "java/res/drawable-mdpi/duckduckgo.png",
+  "java/res/drawable-mdpi/btn_toolbar_home.png",
+  "java/res/drawable-mdpi/notification_header_normal.png",
+  "java/res/drawable-mdpi/btn_tabstrip_switch_normal.png",
+  "java/res/drawable-mdpi/rewards_settings.png",
+  "java/res/drawable-mdpi/add_funds.png",
+  "java/res/drawable-mdpi/incognito_simple.png",
+  "java/res/drawable-mdpi/search_engine_google.png",
+  "java/res/drawable-mdpi/uphold_green.png",
+  "java/res/drawable-mdpi/btn_mic.png",
+  "java/res/drawable-mdpi/btn_star_filled.png",
+  "java/res/drawable-mdpi/ic_chrome.png",
+  "java/res/drawable-mdpi/modern_location_bar.9.png",
+  "java/res/drawable-mdpi/btn_brave.png",
+  "java/res/drawable-mdpi/search_engine_startpage.png",
+  "java/res/drawable-mdpi/btn_brave_off.png",
+  "java/res/drawable-mdpi/android_br_on.png",
+  "java/res/drawable-mdpi/android_onboarding_3.png",
+  "java/res/drawable-mdpi/btn_tabswitcher_modern.png",
+  "java/res/drawable-mdpi/down_arrow.png",
+  "java/res/drawable-mdpi/icn_youtube.png",
+  "java/res/drawable-mdpi/android_onboarding_1.png",
+  "java/res/drawable-mdpi/bat_verified.png",
+  "java/res/drawable-mdpi/ic_expand_more_black_24dp.png",
+  "java/res/drawable-mdpi/omnibox_info_red.png",
+  "java/res/drawable-mdpi/icn_twitch.png",
+  "java/res/drawable-mdpi/btn_right_tablet.png",
+  "java/res/drawable-mdpi/brave_onboarding.png",
+  "java/res/drawable-mdpi/notification_header_warning.png",
+  "java/res/drawable-mdpi/search_engine_bing.png",
+  "java/res/drawable-mdpi/coins.png",
+  "java/res/drawable-mdpi/btn_right.png",
+  "java/res/drawable-mdpi/bat_icon.png",
+  "java/res/drawable-mdpi/search_engine_duckduckgo.png",
+  "java/res/drawable-mdpi/bat_unverified.png",
+  "java/res/drawable-mdpi/share_icon.png",
+  "java/res/drawable-mdpi/omnibox_https_valid.png",
+  "java/res/drawable-nodpi/will_christiansen_glacier_peak.jpg",
+  "java/res/drawable-nodpi/loader16.png",
+  "java/res/drawable-nodpi/loader11.png",
+  "java/res/drawable-nodpi/annie_spratt.jpg",
+  "java/res/drawable-nodpi/loader28.png",
+  "java/res/drawable-nodpi/oliwier_gesla.jpg",
+  "java/res/drawable-nodpi/xavier_balderas_cejudo.jpg",
+  "java/res/drawable-nodpi/joe_gardner.jpg",
+  "java/res/drawable-nodpi/dc_cavalleri.jpg",
+  "java/res/drawable-nodpi/loader10.png",
+  "java/res/drawable-nodpi/anton_repponen.jpg",
+  "java/res/drawable-nodpi/loader27.png",
+  "java/res/drawable-nodpi/loader15.png",
+  "java/res/drawable-nodpi/loader26.png",
+  "java/res/drawable-nodpi/loader9.png",
+  "java/res/drawable-nodpi/andreas_gucklhorn.jpg",
+  "java/res/drawable-nodpi/loader19.png",
+  "java/res/drawable-nodpi/ben_karpinski.jpg",
+  "java/res/drawable-nodpi/loader24.png",
+  "java/res/drawable-nodpi/loader25.png",
+  "java/res/drawable-nodpi/loader13.png",
+  "java/res/drawable-nodpi/loader8.png",
+  "java/res/drawable-nodpi/loader12.png",
+  "java/res/drawable-nodpi/loader5.png",
+  "java/res/drawable-nodpi/loader22.png",
+  "java/res/drawable-nodpi/loader14.png",
+  "java/res/drawable-nodpi/matt_palmer.jpg",
+  "java/res/drawable-nodpi/andy_mai.jpg",
+  "java/res/drawable-nodpi/loader4.png",
+  "java/res/drawable-nodpi/loader0_orange.png",
+  "java/res/drawable-nodpi/loader7.png",
+  "java/res/drawable-nodpi/loader1.png",
+  "java/res/drawable-nodpi/loader20.png",
+  "java/res/drawable-nodpi/loader23.png",
+  "java/res/drawable-nodpi/anders_jilden.jpg",
+  "java/res/drawable-nodpi/loader0.png",
+  "java/res/drawable-nodpi/loader18.png",
+  "java/res/drawable-nodpi/loader2.png",
+  "java/res/drawable-nodpi/will_christiansen_ice.jpg",
+  "java/res/drawable-nodpi/loader21.png",
+  "java/res/drawable-nodpi/svalbard_jerol_soibam.jpeg",
+  "java/res/drawable-nodpi/louis_kim.jpg",
+  "java/res/drawable-nodpi/loader3.png",
+  "java/res/drawable-nodpi/loader17.png",
+  "java/res/drawable-nodpi/loader6.png",
+  "java/res/drawable-xhdpi/check.png",
+  "java/res/drawable-xhdpi/btn_bookmark.png",
+  "java/res/drawable-xhdpi/arrow_forward.png",
+  "java/res/drawable-xhdpi/camera.png",
+  "java/res/drawable-xhdpi/slide_up.png",
+  "java/res/drawable-xhdpi/brave_ads_launch_graphic.png",
+  "java/res/drawable-xhdpi/shortcut_incognito.png",
+  "java/res/drawable-xhdpi/header.png",
+  "java/res/drawable-xhdpi/changetip_icon.png",
+  "java/res/drawable-xhdpi/uphold_white.png",
+  "java/res/drawable-xhdpi/down_icon.png",
+  "java/res/drawable-xhdpi/btn_toolbar_reload.png",
+  "java/res/drawable-xhdpi/plus.png",
+  "java/res/drawable-xhdpi/cover_photo.png",
+  "java/res/drawable-xhdpi/icn_unverified_alert.png",
+  "java/res/drawable-xhdpi/slide_down.png",
+  "java/res/drawable-xhdpi/ic_expand_less_black_24dp.png",
+  "java/res/drawable-xhdpi/chromelogo16.png",
+  "java/res/drawable-xhdpi/settings_play_yt_video_in_browser.png",
+  "java/res/drawable-xhdpi/disclosure.png",
+  "java/res/drawable-xhdpi/plane_small.png",
+  "java/res/drawable-xhdpi/location_bar_incognito_badge.png",
+  "java/res/drawable-xhdpi/up_icon.png",
+  "java/res/drawable-xhdpi/checkbox.png",
+  "java/res/drawable-xhdpi/android_onboarding_4.png",
+  "java/res/drawable-xhdpi/icon_error_notification.png",
+  "java/res/drawable-xhdpi/ic_delete_white_24dp.png",
+  "java/res/drawable-xhdpi/checkbox_checked.png",
+  "java/res/drawable-xhdpi/btn_info.png",
+  "java/res/drawable-xhdpi/bat_logo.png",
+  "java/res/drawable-xhdpi/chevron_right.png",
+  "java/res/drawable-xhdpi/search_engine_duckduckgo_lite.png",
+  "java/res/drawable-xhdpi/brave_sync.png",
+  "java/res/drawable-xhdpi/wallet_add.png",
+  "java/res/drawable-xhdpi/btn_suggestion_refine.png",
+  "java/res/drawable-xhdpi/notification_icon.png",
+  "java/res/drawable-xhdpi/icon_warning_notification.png",
+  "java/res/drawable-xhdpi/verified_disclosure.png",
+  "java/res/drawable-xhdpi/search_engine_qwant.png",
+  "java/res/drawable-xhdpi/notification_header_error.png",
+  "java/res/drawable-xhdpi/notification_header.png",
+  "java/res/drawable-xhdpi/grant_icon.png",
+  "java/res/drawable-xhdpi/settings_desktop_mode.png",
+  "java/res/drawable-xhdpi/verified_creator_large.png",
+  "java/res/drawable-xhdpi/btn_star.png",
+  "java/res/drawable-xhdpi/copy_paste.png",
+  "java/res/drawable-xhdpi/omnibox_https_invalid_red.png",
+  "java/res/drawable-xhdpi/group.png",
+  "java/res/drawable-xhdpi/icn_twitter.png",
+  "java/res/drawable-xhdpi/brave_sync_btn_laptop.png",
+  "java/res/drawable-xhdpi/icon_validated_notification.png",
+  "java/res/drawable-xhdpi/ic_file_download_white_24dp.png",
+  "java/res/drawable-xhdpi/icon_close_notification.png",
+  "java/res/drawable-xhdpi/icn_frowning_face.png",
+  "java/res/drawable-xhdpi/contribute_icon.png",
+  "java/res/drawable-xhdpi/bat_outline.png",
+  "java/res/drawable-xhdpi/btn_bookmark_fill.png",
+  "java/res/drawable-xhdpi/btn_delete_24dp.png",
+  "java/res/drawable-xhdpi/incognito_splash.png",
+  "java/res/drawable-xhdpi/btn_left.png",
+  "java/res/drawable-xhdpi/brave_sync_btn_mobile.png",
+  "java/res/drawable-xhdpi/android_onboarding_2.png",
+  "java/res/drawable-xhdpi/wallet_withdraw.png",
+  "java/res/drawable-xhdpi/btn_bat.png",
+  "java/res/drawable-xhdpi/duckduckgo.png",
+  "java/res/drawable-xhdpi/btn_toolbar_home.png",
+  "java/res/drawable-xhdpi/notification_header_normal.png",
+  "java/res/drawable-xhdpi/btn_tabstrip_switch_normal.png",
+  "java/res/drawable-xhdpi/rewards_settings.png",
+  "java/res/drawable-xhdpi/add_funds.png",
+  "java/res/drawable-xhdpi/incognito_simple.png",
+  "java/res/drawable-xhdpi/search_engine_google.png",
+  "java/res/drawable-xhdpi/uphold_green.png",
+  "java/res/drawable-xhdpi/btn_mic.png",
+  "java/res/drawable-xhdpi/btn_star_filled.png",
+  "java/res/drawable-xhdpi/ic_chrome.png",
+  "java/res/drawable-xhdpi/modern_location_bar.9.png",
+  "java/res/drawable-xhdpi/btn_brave.png",
+  "java/res/drawable-xhdpi/search_engine_startpage.png",
+  "java/res/drawable-xhdpi/btn_brave_off.png",
+  "java/res/drawable-xhdpi/android_br_on.png",
+  "java/res/drawable-xhdpi/android_onboarding_3.png",
+  "java/res/drawable-xhdpi/btn_tabswitcher_modern.png",
+  "java/res/drawable-xhdpi/down_arrow.png",
+  "java/res/drawable-xhdpi/icn_youtube.png",
+  "java/res/drawable-xhdpi/android_onboarding_1.png",
+  "java/res/drawable-xhdpi/bat_verified.png",
+  "java/res/drawable-xhdpi/ic_expand_more_black_24dp.png",
+  "java/res/drawable-xhdpi/omnibox_info_red.png",
+  "java/res/drawable-xhdpi/icn_twitch.png",
+  "java/res/drawable-xhdpi/btn_right_tablet.png",
+  "java/res/drawable-xhdpi/brave_onboarding.png",
+  "java/res/drawable-xhdpi/notification_header_warning.png",
+  "java/res/drawable-xhdpi/search_engine_bing.png",
+  "java/res/drawable-xhdpi/coins.png",
+  "java/res/drawable-xhdpi/btn_right.png",
+  "java/res/drawable-xhdpi/bat_icon.png",
+  "java/res/drawable-xhdpi/search_engine_duckduckgo.png",
+  "java/res/drawable-xhdpi/bat_unverified.png",
+  "java/res/drawable-xhdpi/share_icon.png",
+  "java/res/drawable-xhdpi/omnibox_https_valid.png",
+  "java/res/drawable-xxhdpi/check.png",
+  "java/res/drawable-xxhdpi/btn_bookmark.png",
+  "java/res/drawable-xxhdpi/arrow_forward.png",
+  "java/res/drawable-xxhdpi/camera.png",
+  "java/res/drawable-xxhdpi/slide_up.png",
+  "java/res/drawable-xxhdpi/brave_ads_launch_graphic.png",
+  "java/res/drawable-xxhdpi/shortcut_incognito.png",
+  "java/res/drawable-xxhdpi/header.png",
+  "java/res/drawable-xxhdpi/changetip_icon.png",
+  "java/res/drawable-xxhdpi/uphold_white.png",
+  "java/res/drawable-xxhdpi/down_icon.png",
+  "java/res/drawable-xxhdpi/btn_toolbar_reload.png",
+  "java/res/drawable-xxhdpi/plus.png",
+  "java/res/drawable-xxhdpi/cover_photo.png",
+  "java/res/drawable-xxhdpi/icn_unverified_alert.png",
+  "java/res/drawable-xxhdpi/slide_down.png",
+  "java/res/drawable-xxhdpi/ic_expand_less_black_24dp.png",
+  "java/res/drawable-xxhdpi/chromelogo16.png",
+  "java/res/drawable-xxhdpi/settings_play_yt_video_in_browser.png",
+  "java/res/drawable-xxhdpi/disclosure.png",
+  "java/res/drawable-xxhdpi/plane_small.png",
+  "java/res/drawable-xxhdpi/location_bar_incognito_badge.png",
+  "java/res/drawable-xxhdpi/up_icon.png",
+  "java/res/drawable-xxhdpi/checkbox.png",
+  "java/res/drawable-xxhdpi/android_onboarding_4.png",
+  "java/res/drawable-xxhdpi/icon_error_notification.png",
+  "java/res/drawable-xxhdpi/ic_delete_white_24dp.png",
+  "java/res/drawable-xxhdpi/checkbox_checked.png",
+  "java/res/drawable-xxhdpi/btn_info.png",
+  "java/res/drawable-xxhdpi/bat_logo.png",
+  "java/res/drawable-xxhdpi/chevron_right.png",
+  "java/res/drawable-xxhdpi/search_engine_duckduckgo_lite.png",
+  "java/res/drawable-xxhdpi/brave_sync.png",
+  "java/res/drawable-xxhdpi/wallet_add.png",
+  "java/res/drawable-xxhdpi/btn_suggestion_refine.png",
+  "java/res/drawable-xxhdpi/notification_icon.png",
+  "java/res/drawable-xxhdpi/icon_warning_notification.png",
+  "java/res/drawable-xxhdpi/verified_disclosure.png",
+  "java/res/drawable-xxhdpi/search_engine_qwant.png",
+  "java/res/drawable-xxhdpi/notification_header_error.png",
+  "java/res/drawable-xxhdpi/notification_header.png",
+  "java/res/drawable-xxhdpi/grant_icon.png",
+  "java/res/drawable-xxhdpi/settings_desktop_mode.png",
+  "java/res/drawable-xxhdpi/verified_creator_large.png",
+  "java/res/drawable-xxhdpi/btn_star.png",
+  "java/res/drawable-xxhdpi/copy_paste.png",
+  "java/res/drawable-xxhdpi/omnibox_https_invalid_red.png",
+  "java/res/drawable-xxhdpi/group.png",
+  "java/res/drawable-xxhdpi/icn_twitter.png",
+  "java/res/drawable-xxhdpi/brave_sync_btn_laptop.png",
+  "java/res/drawable-xxhdpi/icon_validated_notification.png",
+  "java/res/drawable-xxhdpi/ic_file_download_white_24dp.png",
+  "java/res/drawable-xxhdpi/icon_close_notification.png",
+  "java/res/drawable-xxhdpi/icn_frowning_face.png",
+  "java/res/drawable-xxhdpi/contribute_icon.png",
+  "java/res/drawable-xxhdpi/bat_outline.png",
+  "java/res/drawable-xxhdpi/btn_bookmark_fill.png",
+  "java/res/drawable-xxhdpi/btn_delete_24dp.png",
+  "java/res/drawable-xxhdpi/incognito_splash.png",
+  "java/res/drawable-xxhdpi/btn_left.png",
+  "java/res/drawable-xxhdpi/brave_sync_btn_mobile.png",
+  "java/res/drawable-xxhdpi/android_onboarding_2.png",
+  "java/res/drawable-xxhdpi/wallet_withdraw.png",
+  "java/res/drawable-xxhdpi/btn_bat.png",
+  "java/res/drawable-xxhdpi/duckduckgo.png",
+  "java/res/drawable-xxhdpi/btn_toolbar_home.png",
+  "java/res/drawable-xxhdpi/notification_header_normal.png",
+  "java/res/drawable-xxhdpi/btn_tabstrip_switch_normal.png",
+  "java/res/drawable-xxhdpi/rewards_settings.png",
+  "java/res/drawable-xxhdpi/add_funds.png",
+  "java/res/drawable-xxhdpi/incognito_simple.png",
+  "java/res/drawable-xxhdpi/search_engine_google.png",
+  "java/res/drawable-xxhdpi/uphold_green.png",
+  "java/res/drawable-xxhdpi/btn_mic.png",
+  "java/res/drawable-xxhdpi/btn_star_filled.png",
+  "java/res/drawable-xxhdpi/ic_chrome.png",
+  "java/res/drawable-xxhdpi/modern_location_bar.9.png",
+  "java/res/drawable-xxhdpi/btn_brave.png",
+  "java/res/drawable-xxhdpi/search_engine_startpage.png",
+  "java/res/drawable-xxhdpi/btn_brave_off.png",
+  "java/res/drawable-xxhdpi/qrcode_dark.png",
+  "java/res/drawable-xxhdpi/android_br_on.png",
+  "java/res/drawable-xxhdpi/android_onboarding_3.png",
+  "java/res/drawable-xxhdpi/btn_tabswitcher_modern.png",
+  "java/res/drawable-xxhdpi/qrcode_light.png",
+  "java/res/drawable-xxhdpi/icn_youtube.png",
+  "java/res/drawable-xxhdpi/android_onboarding_1.png",
+  "java/res/drawable-xxhdpi/bat_verified.png",
+  "java/res/drawable-xxhdpi/ic_expand_more_black_24dp.png",
+  "java/res/drawable-xxhdpi/omnibox_info_red.png",
+  "java/res/drawable-xxhdpi/icn_twitch.png",
+  "java/res/drawable-xxhdpi/btn_right_tablet.png",
+  "java/res/drawable-xxhdpi/brave_onboarding.png",
+  "java/res/drawable-xxhdpi/notification_header_warning.png",
+  "java/res/drawable-xxhdpi/search_engine_bing.png",
+  "java/res/drawable-xxhdpi/coins.png",
+  "java/res/drawable-xxhdpi/btn_right.png",
+  "java/res/drawable-xxhdpi/bat_icon.png",
+  "java/res/drawable-xxhdpi/search_engine_duckduckgo.png",
+  "java/res/drawable-xxhdpi/bat_unverified.png",
+  "java/res/drawable-xxhdpi/share_icon.png",
+  "java/res/drawable-xxhdpi/omnibox_https_valid.png",
+  "java/res/drawable-xxxhdpi/check.png",
+  "java/res/drawable-xxxhdpi/btn_bookmark.png",
+  "java/res/drawable-xxxhdpi/arrow_forward.png",
+  "java/res/drawable-xxxhdpi/camera.png",
+  "java/res/drawable-xxxhdpi/slide_up.png",
+  "java/res/drawable-xxxhdpi/brave_ads_launch_graphic.png",
+  "java/res/drawable-xxxhdpi/shortcut_incognito.png",
+  "java/res/drawable-xxxhdpi/header.png",
+  "java/res/drawable-xxxhdpi/changetip_icon.png",
+  "java/res/drawable-xxxhdpi/uphold_white.png",
+  "java/res/drawable-xxxhdpi/down_icon.png",
+  "java/res/drawable-xxxhdpi/btn_toolbar_reload.png",
+  "java/res/drawable-xxxhdpi/plus.png",
+  "java/res/drawable-xxxhdpi/cover_photo.png",
+  "java/res/drawable-xxxhdpi/icn_unverified_alert.png",
+  "java/res/drawable-xxxhdpi/slide_down.png",
+  "java/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png",
+  "java/res/drawable-xxxhdpi/chromelogo16.png",
+  "java/res/drawable-xxxhdpi/settings_play_yt_video_in_browser.png",
+  "java/res/drawable-xxxhdpi/disclosure.png",
+  "java/res/drawable-xxxhdpi/plane_small.png",
+  "java/res/drawable-xxxhdpi/location_bar_incognito_badge.png",
+  "java/res/drawable-xxxhdpi/up_icon.png",
+  "java/res/drawable-xxxhdpi/checkbox.png",
+  "java/res/drawable-xxxhdpi/icon_error_notification.png",
+  "java/res/drawable-xxxhdpi/ic_delete_white_24dp.png",
+  "java/res/drawable-xxxhdpi/checkbox_checked.png",
+  "java/res/drawable-xxxhdpi/btn_info.png",
+  "java/res/drawable-xxxhdpi/bat_logo.png",
+  "java/res/drawable-xxxhdpi/brave_sync.png",
+  "java/res/drawable-xxxhdpi/wallet_add.png",
+  "java/res/drawable-xxxhdpi/btn_suggestion_refine.png",
+  "java/res/drawable-xxxhdpi/notification_icon.png",
+  "java/res/drawable-xxxhdpi/icon_warning_notification.png",
+  "java/res/drawable-xxxhdpi/verified_disclosure.png",
+  "java/res/drawable-xxxhdpi/notification_header_error.png",
+  "java/res/drawable-xxxhdpi/notification_header.png",
+  "java/res/drawable-xxxhdpi/grant_icon.png",
+  "java/res/drawable-xxxhdpi/settings_desktop_mode.png",
+  "java/res/drawable-xxxhdpi/verified_creator_large.png",
+  "java/res/drawable-xxxhdpi/btn_star.png",
+  "java/res/drawable-xxxhdpi/copy_paste.png",
+  "java/res/drawable-xxxhdpi/omnibox_https_invalid_red.png",
+  "java/res/drawable-xxxhdpi/group.png",
+  "java/res/drawable-xxxhdpi/icn_twitter.png",
+  "java/res/drawable-xxxhdpi/brave_sync_btn_laptop.png",
+  "java/res/drawable-xxxhdpi/icon_validated_notification.png",
+  "java/res/drawable-xxxhdpi/ic_file_download_white_24dp.png",
+  "java/res/drawable-xxxhdpi/icon_close_notification.png",
+  "java/res/drawable-xxxhdpi/icn_frowning_face.png",
+  "java/res/drawable-xxxhdpi/contribute_icon.png",
+  "java/res/drawable-xxxhdpi/bat_outline.png",
+  "java/res/drawable-xxxhdpi/btn_bookmark_fill.png",
+  "java/res/drawable-xxxhdpi/btn_delete_24dp.png",
+  "java/res/drawable-xxxhdpi/incognito_splash.png",
+  "java/res/drawable-xxxhdpi/btn_left.png",
+  "java/res/drawable-xxxhdpi/brave_sync_btn_mobile.png",
+  "java/res/drawable-xxxhdpi/wallet_withdraw.png",
+  "java/res/drawable-xxxhdpi/btn_bat.png",
+  "java/res/drawable-xxxhdpi/duckduckgo.png",
+  "java/res/drawable-xxxhdpi/btn_toolbar_home.png",
+  "java/res/drawable-xxxhdpi/notification_header_normal.png",
+  "java/res/drawable-xxxhdpi/btn_tabstrip_switch_normal.png",
+  "java/res/drawable-xxxhdpi/rewards_settings.png",
+  "java/res/drawable-xxxhdpi/add_funds.png",
+  "java/res/drawable-xxxhdpi/incognito_simple.png",
+  "java/res/drawable-xxxhdpi/uphold_green.png",
+  "java/res/drawable-xxxhdpi/btn_mic.png",
+  "java/res/drawable-xxxhdpi/btn_star_filled.png",
+  "java/res/drawable-xxxhdpi/ic_chrome.png",
+  "java/res/drawable-xxxhdpi/btn_brave.png",
+  "java/res/drawable-xxxhdpi/btn_brave_off.png",
+  "java/res/drawable-xxxhdpi/qrcode_dark.png",
+  "java/res/drawable-xxxhdpi/btn_tabswitcher_modern.png",
+  "java/res/drawable-xxxhdpi/qrcode_light.png",
+  "java/res/drawable-xxxhdpi/icn_youtube.png",
+  "java/res/drawable-xxxhdpi/bat_verified.png",
+  "java/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png",
+  "java/res/drawable-xxxhdpi/omnibox_info_red.png",
+  "java/res/drawable-xxxhdpi/icn_twitch.png",
+  "java/res/drawable-xxxhdpi/btn_right_tablet.png",
+  "java/res/drawable-xxxhdpi/notification_header_warning.png",
+  "java/res/drawable-xxxhdpi/coins.png",
+  "java/res/drawable-xxxhdpi/btn_right.png",
+  "java/res/drawable-xxxhdpi/bat_icon.png",
+  "java/res/drawable-xxxhdpi/bat_unverified.png",
+  "java/res/drawable-xxxhdpi/share_icon.png",
+  "java/res/drawable-xxxhdpi/omnibox_https_valid.png",
+  "java/res/layout/brave_shields_ads_tracking_switcher.xml",
+  "java/res/layout/web_notification_icon_frame_brave.xml",
+  "java/res/layout/brave_sync_layout.xml",
+  "java/res/layout/location_status_incognito_badge.xml",
+  "java/res/layout/fragment_troubleshooting_onboarding.xml",
+  "java/res/layout/user_wallet_activity.xml",
+  "java/res/layout/new_tab_page_incognito.xml",
+  "java/res/layout/fragment_super_referral_share.xml",
+  "java/res/layout/activity_onboarding.xml",
+  "java/res/layout/brave_stats_layout.xml",
+  "java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml",
+  "java/res/layout/brave_set_default_browser_dialog.xml",
+  "java/res/layout/brave_rewards_spinnner_item.xml",
+  "java/res/layout/fragment_brave_shields_onboarding.xml",
+  "java/res/layout/brave_ads_existing_user_dialog_layout.xml",
+  "java/res/layout/brave_rewards_panel.xml",
+  "java/res/layout/brave_rewards_site_banner.xml",
+  "java/res/layout/brave_shields_switcher.xml",
+  "java/res/layout/verify_wallet_activity.xml",
+  "java/res/layout/brave_shields_menu_item.xml",
+  "java/res/layout/brave_shields_fingerprints_blocked_switcher.xml",
+  "java/res/layout/fragment_search_engine_onboarding.xml",
+  "java/res/layout/brave_rewards_spinnner_item_dropdown.xml",
+  "java/res/layout/brave_rewards_grants_list_item.xml",
+  "java/res/layout/add_sync_device_name_dialog.xml",
+  "java/res/layout/brave_rewards_donation_sent.xml",
+  "java/res/layout/ntp_bottom_sheet.xml",
+  "java/res/layout/brave_shields_scripts_blocked_switcher.xml",
+  "java/res/layout/brave_sync_device.xml",
+  "java/res/layout/brave_ddg_offer_link.xml",
+  "java/res/layout/ntp_non_distruptive_banner.xml",
+  "java/res/layout/brave_shields_https_upgrade_switcher.xml",
+  "java/res/layout/brave_toolbar.xml",
+  "java/res/layout/web_notification_big_brave_ads.xml",
+  "java/res/layout/brave_sync_done.xml",
+  "java/res/layout/fragment_brave_rewards_onboarding.xml",
+  "java/res/layout/new_tab_page_layout.xml",
+  "java/res/layout/brave_ads_new_user_dialog_layout.xml",
+  "java/res/layout/brave_shields_text_item.xml",
+  "java/res/layout/new_tab_page_view.xml",
+  "java/res/layout/fragment_brave_ads_onboarding.xml",
+  "java/res/layout/brave_rewards_reset_tab_content.xml",
+  "java/res/layout/brave_bookmark_toolbar.xml",
+  "java/res/layout/qa_code_check.xml",
+  "java/res/layout/web_notification_brave_ads.xml",
+  "java/res/layout/brave_custom_tabs_toolbar.xml",
+  "java/res/layout/brave_sync_add_mobile.xml",
+  "java/res/layout/brave_rewards_panel_header.xml",
+  "java/res/layout/brave_rewards_auto_contrib.xml",
+  "java/res/layout/brave_bottom_new_tab_button.xml",
+  "java/res/layout/ddg_offer_layout.xml",
+  "java/res/layout/menu_separator.xml",
+  "java/res/layout/brave_rewards_panel_grant.xml",
+  "java/res/layout/brave_sync_add_laptop.xml",
+  "java/res/layout-land/brave_rewards_site_banner.xml",
+  "java/res/layout-land/verify_wallet_activity.xml",
+  "java/res/menu/brave_shields_menu.xml",
+  "java/res/menu/new_tab_menu.xml",
+  "java/res/menu/exit_settings_menu.xml",
+  "java/res/values/brave_ids.xml",
+  "java/res/values/brave_styles.xml",
+  "java/res/values/brave_colors.xml",
+  "java/res/values/brave_dimens.xml",
+  "java/res/values-h380dp/dimens.xml",
+  "java/res/values-h500dp/dimens.xml",
+  "java/res/values-h568dp/dimens.xml",
+  "java/res/values-h730dp/dimens.xml",
+  "java/res/values-h748dp/dimens.xml",
+  "java/res/values-h765dp/dimens.xml",
+  "java/res/values-h820dp/dimens.xml",
+  "java/res/values-v21/brave_styles.xml",
+  "java/res/xml/brave_main_preferences.xml",
+  "java/res/xml/background_video_playback_preference.xml",
+  "java/res/xml/background_images_preferences.xml",
+  "java/res/xml/developer_preferences.xml",
+  "java/res/xml/use_custom_tabs_brave_preference.xml",
+  "java/res/xml/play_yt_video_in_browser_preferences.xml",
+  "java/res/xml/brave_theme_preferences.xml",
+  "java/res/xml/brave_license_preferences.xml",
+  "java/res/xml/desktop_mode_preferences.xml",
+  "java/res/xml/legal_information_preferences.xml",
+  "java/res/xml/qa_preferences.xml",
+  "java/res/xml/brave_rewards_preferences.xml",
+  "java/res/xml/closing_all_tabs_closes_brave_preference.xml",
+  "java/res/xml/clear_browsing_data_preferences_tab.xml",
+  "java/res/xml/brave_site_settings_preferences.xml",
+  "java/res/xml/brave_privacy_preferences.xml",
+  "java/res/xml/appearance_preferences.xml",
+]
diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
index 7652f2fa31c7..957abadb6cc9 100644
--- a/android/brave_java_sources.gni
+++ b/android/brave_java_sources.gni
@@ -106,7 +106,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
diff --git a/android/java/org/chromium/chrome/browser/browsing_data/BraveClearBrowsingDataPreferencesAdvanced.java b/android/java/org/chromium/chrome/browser/browsing_data/BraveClearBrowsingDataPreferencesAdvanced.java
deleted file mode 100644
index d70ad3141363..000000000000
--- a/android/java/org/chromium/chrome/browser/browsing_data/BraveClearBrowsingDataPreferencesAdvanced.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.chromium.chrome.browser.browsing_data;
-
-import androidx.annotation.DrawableRes;
-
-import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
-import org.chromium.chrome.R;
-
-public class BraveClearBrowsingDataPreferencesAdvanced extends ClearBrowsingDataFragmentAdvanced {
-    private static final int CLEAR_DOWNLOADS = DialogOption.NUM_ENTRIES;
-
-    // TODO(samartnik): disabling option as it requires futher research
-    // At the moment causes issue https://github.com/brave/brave-browser/issues/8737
-    // @Override
-    // protected List<Integer> getDialogOptions() {
-    //     return Arrays.asList(DialogOption.CLEAR_HISTORY, DialogOption.CLEAR_COOKIES_AND_SITE_DATA,
-    //             DialogOption.CLEAR_CACHE, DialogOption.CLEAR_PASSWORDS,
-    //             DialogOption.CLEAR_FORM_DATA, DialogOption.CLEAR_SITE_SETTINGS, CLEAR_DOWNLOADS);
-    // }
-
-    // TODO(samartnik): disabling option as it requires futher research
-    // At the moment causes issue https://github.com/brave/brave-browser/issues/8737
-    // @Override
-    // protected Set<Integer> getAllOptions() {
-    //     Set<Integer> all = super.getAllOptions();
-    //     all.add(CLEAR_DOWNLOADS);
-    //     return all;
-    // }
-
-    static boolean isValidDataType(int type) {
-        // TODO(samartnik): disabling option as it requires futher research
-        // At the moment causes issue https://github.com/brave/brave-browser/issues/8737
-        // return type == CLEAR_DOWNLOADS;
-        return false;
-    }
-
-    static @BrowsingDataType int getDataType(int type) {
-        switch (type) {
-            case CLEAR_DOWNLOADS:
-                return BrowsingDataType.DOWNLOADS;
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-
-    static String getPreferenceKey(int type) {
-        switch (type) {
-            case CLEAR_DOWNLOADS:
-                return "clear_downloads_checkbox";
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-
-    static @DrawableRes int getIcon(int type) {
-        switch (type) {
-            case CLEAR_DOWNLOADS:
-                return R.drawable.ic_file_download_24dp;
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-}
diff --git a/build/android/config.gni b/build/android/config.gni
index 7fcb6963fa4c..6c6a0a57061e 100644
--- a/build/android/config.gni
+++ b/build/android/config.gni
@@ -1,3 +1,4 @@
+import("//brave/android/brave_java_resources.gni")
 import("//brave/android/brave_java_sources.gni")
 import("//brave/build/android/bytecode/java_sources.gni")
 import("//brave/components/sync/android/java_sources.gni")
@@ -29,7 +30,3 @@ brave_chrome_java_srcjar_deps = [
 brave_chrome_app_java_resources_deps = [
   "//brave/build/android:android_brave_strings_grd",
 ]
-
-brave_chrome_app_java_resources_dirs = [
-  "//brave/android/java/res",
-]

From d7fd85f611a7a03a15db0f04ab24c2601c6cd902 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Thu, 30 Apr 2020 16:19:32 -0400
Subject: [PATCH 099/161] [Android] Updated patches to fix build

---
 patches/chrome-android-BUILD.gn.patch         |  4 +--
 ...a-ClearBrowsingDataTabsFragment.java.patch | 13 --------
 ...e-browser-ui-webui-favicon_source.cc.patch | 32 +++++++++++++++++++
 3 files changed, 34 insertions(+), 15 deletions(-)
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataTabsFragment.java.patch
 create mode 100644 patches/chrome-browser-ui-webui-favicon_source.cc.patch

diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch
index e819c1dbb18e..8d1c86c38317 100644
--- a/patches/chrome-android-BUILD.gn.patch
+++ b/patches/chrome-android-BUILD.gn.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index de0b8bbe9c6751033b6ddac36a4e25f94c0937b4..eea94a3e16b7c2fb3f0b4f0ab2d6bcaf1ca99ce7 100644
+index de0b8bbe9c6751033b6ddac36a4e25f94c0937b4..4c342d150fec037f822dba3d456a5cbfaa8b689e 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -196,6 +196,7 @@ android_resources("chrome_app_java_resources") {
      "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
      "//third_party/android_deps:com_google_android_material_material_java",
    ]
-+  deps += brave_chrome_app_java_resources_deps resource_dirs += brave_chrome_app_java_resources_dirs
++  deps += brave_chrome_app_java_resources_deps sources += brave_java_resources
    custom_package = "org.chromium.chrome"
  }
  
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataTabsFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataTabsFragment.java.patch
deleted file mode 100644
index 5981ddf9bcea..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataTabsFragment.java.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
-index c452db8b6abc8d5d5bea72d8b03ecafc9e0d0d0e..41f749213aba4580876810b3885e05493634537c 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
-@@ -136,7 +136,7 @@ public class ClearBrowsingDataTabsFragment extends Fragment {
-                     fragment = new ClearBrowsingDataFragmentBasic();
-                     break;
-                 case 1:
--                    fragment = new ClearBrowsingDataFragmentAdvanced();
-+                    fragment = new BraveClearBrowsingDataPreferencesAdvanced();
-                     break;
-                 default:
-                     throw new RuntimeException("invalid position: " + position);
diff --git a/patches/chrome-browser-ui-webui-favicon_source.cc.patch b/patches/chrome-browser-ui-webui-favicon_source.cc.patch
new file mode 100644
index 000000000000..f2ebc8eb3f29
--- /dev/null
+++ b/patches/chrome-browser-ui-webui-favicon_source.cc.patch
@@ -0,0 +1,32 @@
+diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
+index 17eca9e53f03a55ecf4f5233b0a4dc85e73ed1b9..05cbc0f56744cdb8d5fc709e5e636a5608626b6e 100644
+--- a/chrome/browser/ui/webui/favicon_source.cc
++++ b/chrome/browser/ui/webui/favicon_source.cc
+@@ -23,9 +23,11 @@
+ #include "components/history/core/browser/top_sites.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "content/public/browser/web_contents.h"
++#if !defined(OS_ANDROID)
+ #include "extensions/browser/extension_registry.h"
+ #include "extensions/common/constants.h"
+ #include "extensions/common/manifest.h"
++#endif
+ #include "net/url_request/url_request.h"
+ #include "third_party/skia/include/core/SkBitmap.h"
+ #include "ui/base/layout.h"
+@@ -109,6 +111,7 @@ void FaviconSource::StartDataRequest(
+     return;
+   }
+ 
++#if !defined(OS_ANDROID)
+   if (url_format_ == chrome::FaviconUrlFormat::kFaviconLegacy) {
+     const extensions::Extension* extension =
+         extensions::ExtensionRegistry::Get(profile_)
+@@ -120,6 +123,7 @@ void FaviconSource::StartDataRequest(
+                                     extensions::Manifest::NUM_LOAD_TYPES);
+     }
+   }
++#endif
+ 
+   int desired_size_in_pixel =
+       std::ceil(parsed.size_in_dip * parsed.device_scale_factor);

From e8b57cca56296486c6a2ffcda6c351571945a677 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Mon, 4 May 2020 16:39:29 -0400
Subject: [PATCH 100/161] [Android] Fixed build issues related to renaming

---
 .../chrome/browser/BraveActivity.java         |  6 ++-
 .../chromium/chrome/browser/BraveHelper.java  |  2 +-
 .../BraveRewardsDonationSentActivity.java     |  4 +-
 .../chrome/browser/BraveRewardsHelper.java    | 14 +++---
 .../browser/BraveRewardsNativeWorker.java     |  4 +-
 .../browser/BraveRewardsPanelPopup.java       |  4 +-
 .../BraveRewardsSiteBannerActivity.java       |  4 +-
 .../chrome/browser/BraveSyncWorker.java       |  2 +-
 .../chromium/chrome/browser/BraveUphold.java  |  2 +-
 .../BraveTabbedAppMenuPropertiesDelegate.java |  4 +-
 .../document/BraveLauncherActivity.java       |  4 +-
 .../BraveExternalNavigationHandler.java       |  9 ++--
 .../settings/BraveHomepageSettings.java       |  4 +-
 .../BraveRadioButtonGroupThemePreference.java |  2 +-
 .../settings/BraveThemePreferences.java       |  4 +-
 ...eSetDefaultBrowserNotificationService.java |  2 +-
 .../browser/ntp/BraveNewTabPageView.java      |  2 +-
 .../browser/ntp/IncognitoNewTabPageView.java  | 49 ++++++++++++++++---
 .../RewardsBottomSheetDialogFragment.java     |  8 +--
 .../SuperReferralShareDialogFragment.java     |  2 +-
 .../BraveRewardsOnboardingFragment.java       |  2 +-
 .../BraveShieldsOnboardingFragment.java       |  2 +-
 .../onboarding/NonSwipeableViewPager.java     |  2 +-
 .../onboarding/OnboardingActivity.java        |  4 +-
 .../OnboardingViewPagerAdapter.java           |  6 +--
 .../SearchEngineOnboardingFragment.java       |  2 +-
 .../TroubleshootingOnboardingFragment.java    |  2 +-
 .../BravePartnerBrowserCustomizations.java    |  5 +-
 .../settings/BravePrivacySettings.java        | 16 +++---
 .../browser/qrreader/BarcodeTracker.java      |  2 +-
 .../qrreader/BarcodeTrackerFactory.java       |  2 +-
 .../settings/AppearancePreferences.java       | 13 ++---
 .../settings/BackgroundImagesPreferences.java |  6 ++-
 .../BackgroundVideoPlaybackPreference.java    |  5 +-
 .../settings/BraveCustomTabsPreference.java   |  4 +-
 .../settings/BraveLicensePreferences.java     |  3 +-
 .../settings/BraveMainPreferencesBase.java    |  9 ++--
 .../settings/BravePreferenceFragment.java     |  2 +-
 .../settings/BraveRewardsPreferences.java     |  6 ++-
 .../settings/BraveRewardsResetPreference.java |  2 +-
 .../BraveRewardsResetPreferenceDialog.java    |  2 +-
 .../settings/BraveSearchEngineAdapter.java    |  2 +-
 .../settings/BraveSearchEnginePreference.java |  2 +-
 .../ClosingAllTabsClosesBravePreference.java  |  5 +-
 .../SearchEngineTabModelSelectorObserver.java |  3 +-
 .../developer/BraveQAPreferences.java         |  8 +--
 ...tonGroupCustomHomepageThemePreference.java |  3 +-
 .../BraveSiteSettingsPreferencesBase.java     |  4 +-
 .../site_settings/DesktopModePreferences.java |  6 +--
 .../PlayYTVideoInBrowserPreferences.java      |  6 +--
 .../browser/tabmodel/BraveTabCreator.java     | 11 ++---
 .../bottom/BraveBottomToolbarCoordinator.java | 32 ++++++------
 .../BraveBottomToolbarVariationManager.java   |  6 +--
 ...eBrowsingModeBottomToolbarCoordinator.java | 17 ++++---
 .../toolbar/top/BraveToolbarLayout.java       | 15 +++---
 .../upgrade/BraveUpgradeJobIntentService.java |  2 +-
 .../res/layout/brave_bookmark_toolbar.xml     |  2 +-
 .../layout/brave_bottom_new_tab_button.xml    |  2 +-
 ...lds_3rd_party_cookies_blocked_switcher.xml |  2 +-
 .../brave_shields_ads_tracking_switcher.xml   |  2 +-
 ..._shields_fingerprints_blocked_switcher.xml |  2 +-
 .../brave_shields_https_upgrade_switcher.xml  |  2 +-
 .../res/layout/brave_shields_menu_item.xml    |  2 +-
 ...brave_shields_scripts_blocked_switcher.xml |  2 +-
 .../res/layout/brave_shields_switcher.xml     |  2 +-
 .../res/layout/brave_shields_text_item.xml    |  2 +-
 android/java/res/layout/brave_sync_device.xml |  2 +-
 android/java/res/layout/brave_sync_layout.xml |  2 +-
 .../layout/fragment_super_referral_share.xml  |  2 +-
 .../res/layout/new_tab_page_incognito.xml     |  2 +-
 .../java/res/layout/new_tab_page_layout.xml   |  8 +++
 android/java/res/menu/exit_settings_menu.xml  |  2 +-
 .../res/xml/legal_information_preferences.xml |  2 +-
 .../BraveAdsOnboardingFragment.java           |  2 +-
 ...es-menu-website_preferences_menu.xml.patch |  2 +-
 75 files changed, 226 insertions(+), 169 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/BraveActivity.java b/android/java/org/chromium/chrome/browser/BraveActivity.java
index b0d394e9bb3d..880d48ff8821 100644
--- a/android/java/org/chromium/chrome/browser/BraveActivity.java
+++ b/android/java/org/chromium/chrome/browser/BraveActivity.java
@@ -34,6 +34,8 @@
 import org.chromium.chrome.browser.BraveSyncWorker;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.bookmarks.BookmarkModel;
+import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
+import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService;
 import org.chromium.chrome.browser.onboarding.OnboardingActivity;
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
@@ -51,7 +53,7 @@
 import org.chromium.chrome.browser.toolbar.top.BraveToolbarLayout;
 import org.chromium.chrome.browser.util.BraveDbUtil;
 import org.chromium.chrome.browser.util.BraveReferrer;
-import org.chromium.chrome.browser.util.UrlConstants;
+import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
@@ -64,7 +66,7 @@
  * Brave's extension for ChromeActivity
  */
 @JNINamespace("chrome::android")
-public abstract class BraveActivity extends ChromeActivity {
+public abstract class BraveActivity<C extends ChromeActivityComponent> extends ChromeActivity {
     public static final int SITE_BANNER_REQUEST_CODE = 33;
     public static final int VERIFY_WALLET_ACTIVITY_REQUEST_CODE = 34;
     public static final int USER_WALLET_ACTIVITY_REQUEST_CODE = 35;
diff --git a/android/java/org/chromium/chrome/browser/BraveHelper.java b/android/java/org/chromium/chrome/browser/BraveHelper.java
index bcaf0d77f2f6..75cbabc41b66 100644
--- a/android/java/org/chromium/chrome/browser/BraveHelper.java
+++ b/android/java/org/chromium/chrome/browser/BraveHelper.java
@@ -7,7 +7,7 @@
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
-import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.firstrun.FirstRunStatus;
 
 public class BraveHelper {
diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java
index 1972d772591e..e08e9d4554f2 100644
--- a/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java
+++ b/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java
@@ -18,7 +18,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.chromium.chrome.browser.util.IntentUtils;
+import org.chromium.base.IntentUtils;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.BraveRewardsHelper;
 import org.chromium.chrome.browser.BraveRewardsNativeWorker;
@@ -51,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_);
         Tab currentActiveTab = BraveRewardsHelper.currentActiveTab();
-        String url = currentActiveTab.getUrl();
+        String url = currentActiveTab.getUrlString();
         String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL;
         mIconFetcher = new org.chromium.chrome.browser.BraveRewardsHelper();
         mIconFetcher.retrieveLargeIcon(favicon_url, this);
diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java
index 3745ec241179..2296ec3f96d4 100644
--- a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java
+++ b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java
@@ -25,12 +25,14 @@
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.BraveActivity;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
-import org.chromium.chrome.browser.favicon.IconType;
-import org.chromium.chrome.browser.favicon.LargeIconBridge;
+import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.ui.favicon.IconType;
+import org.chromium.chrome.browser.ui.favicon.LargeIconBridge;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabImpl;
-import org.chromium.chrome.browser.favicon.RoundedIconGenerator;
+import org.chromium.chrome.browser.ui.favicon.RoundedIconGenerator;
 import org.chromium.chrome.R;
+import org.chromium.url.GURL;
 
 import java.math.BigDecimal;
 import java.util.Calendar;
@@ -61,7 +63,7 @@ public interface LargeIconReadyCallback {
 
     public BraveRewardsHelper () {
         if (mLargeIconBridge == null) {
-            mLargeIconBridge = new LargeIconBridge(((TabImpl)currentActiveTab()).getProfile());
+            mLargeIconBridge = new LargeIconBridge(Profile.fromWebContents(((TabImpl)currentActiveTab()).getWebContents()));
         }
     }
 
@@ -94,7 +96,7 @@ private void retrieveLargeIconInternal() {
         if (mFaviconUrl == null || mFaviconUrl.isEmpty() || mFaviconUrl.equals("clear")) {
             Tab tab  = currentActiveTab();
             if (tab != null) {
-                mFaviconUrl = tab.getUrl();
+                mFaviconUrl = tab.getUrlString();
             }
 
             mHandler.postDelayed(new Runnable() {
@@ -109,7 +111,7 @@ public void run() {
 
         //get the icon
         if (mLargeIconBridge!= null && mCallback != null && !mFaviconUrl.isEmpty()) {
-            mLargeIconBridge.getLargeIconForUrl(mFaviconUrl,FAVICON_DESIRED_SIZE, this);
+            mLargeIconBridge.getLargeIconForUrl(new GURL(mFaviconUrl),FAVICON_DESIRED_SIZE, this);
         }
     }
 
diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java
index f3aceb52244f..d646c0f5dda7 100644
--- a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java
+++ b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java
@@ -16,7 +16,7 @@
 import org.chromium.chrome.browser.BraveRewardsObserver;
 import org.chromium.chrome.browser.BraveRewardsPublisher.PublisherStatus;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.util.UrlConstants;
+import org.chromium.components.embedder_support.util.UrlConstants;
 import org.json.JSONException;
 
 import java.util.ArrayList;
@@ -154,7 +154,7 @@ private void TriggerOnNotifyFrontTabUrlChanged() {
             public void run() {
                 Tab tab = BraveRewardsHelper.currentActiveTab();
                 if (tab != null && !tab.isIncognito()) {
-                    OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrl());
+                    OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrlString());
                 }
             }
         });
diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java
index 478ff2184da2..871c3be2e921 100644
--- a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java
+++ b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java
@@ -650,7 +650,7 @@ public void ShowWebSiteView(boolean returning_to_rewards) {
           ShowRewardsSummary();
           Tab currentActiveTab = BraveRewardsHelper.currentActiveTab();
           if (currentActiveTab != null && !currentActiveTab.isIncognito()) {
-            String url = currentActiveTab.getUrl();
+            String url = currentActiveTab.getUrlString();
             if (URLUtil.isValidUrl(url)) {
                 mBraveRewardsNativeWorker.GetPublisherInfo(currentActiveTab.getId(), url);
                 mPublisherFetcher = new Timer();
@@ -1241,7 +1241,7 @@ public void OnPublisherInfo(int tabId) {
 
         String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId);
         Tab currentActiveTab = BraveRewardsHelper.currentActiveTab();
-        String url = currentActiveTab.getUrl();
+        String url = currentActiveTab.getUrlString();
         final String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL;
 
         mIconFetcher.retrieveLargeIcon(favicon_url,this);
diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java
index f5051021d7cb..6f406681dcdb 100644
--- a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java
+++ b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java
@@ -23,7 +23,7 @@
 import android.widget.ToggleButton;
 import android.text.Spanned;
 import android.view.MotionEvent;
-import org.chromium.chrome.browser.util.IntentUtils;
+import org.chromium.base.IntentUtils;
 import org.chromium.chrome.browser.BraveRewardsBalance;
 import org.chromium.chrome.browser.BraveRewardsHelper;
 import org.chromium.chrome.browser.BraveRewardsNativeWorker;
@@ -129,7 +129,7 @@ public void onClick(View view) {
 
         String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_);
         Tab currentActiveTab = BraveRewardsHelper.currentActiveTab();
-        String url = currentActiveTab.getUrl();
+        String url = currentActiveTab.getUrlString();
         String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL;
         mIconFetcher = new BraveRewardsHelper();
         mIconFetcher.retrieveLargeIcon(favicon_url, this);
diff --git a/android/java/org/chromium/chrome/browser/BraveSyncWorker.java b/android/java/org/chromium/chrome/browser/BraveSyncWorker.java
index 96ce4136710a..baa7a7fb1b42 100755
--- a/android/java/org/chromium/chrome/browser/BraveSyncWorker.java
+++ b/android/java/org/chromium/chrome/browser/BraveSyncWorker.java
@@ -2567,7 +2567,7 @@ public void run() {
                                 mNewBookmarkModel.setBookmarkTitle(bookmarkId, mTitle);
                             }
                             if (!mUrl.isEmpty() && bookmarkItem.isUrlEditable()) {
-                                String fixedUrl = UrlFormatter.fixupUrl(mUrl);
+                                String fixedUrl = UrlFormatter.fixupUrl(mUrl).getSpec();
                                 if (null != fixedUrl && !fixedUrl.equals(bookmarkItem.getTitle())) {
                                     mNewBookmarkModel.setBookmarkUrl(bookmarkId, fixedUrl);
                                 }
diff --git a/android/java/org/chromium/chrome/browser/BraveUphold.java b/android/java/org/chromium/chrome/browser/BraveUphold.java
index b70fdd26585e..292e1ad2f115 100644
--- a/android/java/org/chromium/chrome/browser/BraveUphold.java
+++ b/android/java/org/chromium/chrome/browser/BraveUphold.java
@@ -19,7 +19,7 @@
 import org.chromium.chrome.browser.BraveRewardsNativeWorker;
 import org.chromium.chrome.browser.BraveRewardsObserver;
 import org.chromium.chrome.browser.externalnav.BraveExternalNavigationHandler;
-import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
+import org.chromium.components.external_intents.ExternalNavigationParams;
 import org.chromium.chrome.R;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
index dc439460eabe..26d4ce80caa2 100644
--- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
+++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
@@ -20,12 +20,12 @@
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
-import org.chromium.chrome.browser.flags.FeatureUtilities;
 import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
 import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.tabbed_mode.TabbedAppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
 import org.chromium.chrome.browser.toolbar.ToolbarManager;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
@@ -96,7 +96,7 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {
 
         // Hide bookmark button if bottom toolbar is enabled
         ImageButton bookmarkButton = view.findViewById(R.id.bookmark_this_page_id);
-        if (bookmarkButton != null && FeatureUtilities.isBottomToolbarEnabled()) {
+        if (bookmarkButton != null && BottomToolbarConfiguration.isBottomToolbarEnabled()) {
             bookmarkButton.setVisibility(View.GONE);
         }
 
diff --git a/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java b/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java
index 2f519ad0392f..da8467977467 100644
--- a/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java
+++ b/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java
@@ -9,8 +9,8 @@
 import android.os.Bundle;
 
 import org.chromium.chrome.browser.BraveHelper;
-import org.chromium.chrome.browser.flags.FeatureUtilities;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
 
 /**
  * Base class for ChromeLauncherActivity
@@ -22,7 +22,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         SharedPreferencesManager.getInstance().disableKeyCheckerForTesting();
 
-        FeatureUtilities.isBottomToolbarEnabled();
+        BottomToolbarConfiguration.isBottomToolbarEnabled();
         BraveHelper.DisableFREDRP();
     }
 }
diff --git a/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java b/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
index 18ab767affd0..d7783537b591 100644
--- a/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
+++ b/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
@@ -5,16 +5,15 @@
 
 package org.chromium.chrome.browser.externalnav;
 
-import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
-import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
+import org.chromium.components.external_intents.ExternalNavigationDelegate;
+import org.chromium.components.external_intents.ExternalNavigationHandler;
+import org.chromium.components.external_intents.ExternalNavigationParams;
+import org.chromium.components.external_intents.ExternalNavigationHandler.OverrideUrlLoadingResult;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.BraveUphold;
 
 public class BraveExternalNavigationHandler extends ExternalNavigationHandler {
     private BraveUphold mBraveUphold;
-    public BraveExternalNavigationHandler(Tab tab) {
-        super(tab);
-    }
 
     public BraveExternalNavigationHandler(ExternalNavigationDelegate delegate) {
         super(delegate);
diff --git a/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java b/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java
index 39995039178e..a4fcfea6caef 100644
--- a/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java
+++ b/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java
@@ -8,8 +8,8 @@
 import android.os.Bundle;
 
 import org.chromium.chrome.browser.homepage.HomepageManager;
-import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.homepage.HomepageSettings;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.chrome.browser.homepage.settings.HomepageSettings;
 
 public class BraveHomepageSettings extends HomepageSettings {
     private HomepageManager mHomepageManager;
diff --git a/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java
index 77b3b4d8daa2..17205dff168f 100644
--- a/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java
+++ b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java
@@ -6,7 +6,7 @@
 package org.chromium.chrome.browser.night_mode.settings;
 
 import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java
index 0d266bdb157a..6e25573e9550 100644
--- a/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java
+++ b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java
@@ -10,7 +10,7 @@
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.chromium.chrome.R;
 import org.chromium.base.BuildInfo;
@@ -18,7 +18,7 @@
 import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder;
 import org.chromium.chrome.browser.night_mode.ThemeType;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
-import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge;
 
diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java
index 460ae4b17edf..ab1ab1648b65 100644
--- a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java
+++ b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java
@@ -25,7 +25,7 @@
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
 import org.chromium.chrome.browser.BraveActivity;
-import org.chromium.chrome.browser.util.UrlConstants;
+import org.chromium.components.embedder_support.util.UrlConstants;
 
 import java.util.Calendar;
 
diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java
index 2395103f07e0..cf97b0b4de9f 100644
--- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java
+++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java
@@ -22,7 +22,7 @@
 import android.os.Build;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
-import android.support.design.widget.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import java.util.List;
 import android.view.MenuItem;
 
diff --git a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java
index 4a247aa6146b..dc43ed499e43 100644
--- a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java
+++ b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java
@@ -13,11 +13,13 @@
 import android.text.SpannableString;
 import android.util.AttributeSet;
 import android.view.View;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ImageView;
 import android.widget.FrameLayout;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
+import org.chromium.components.content_settings.CookieControlsEnforcement;
 import org.chromium.ui.base.ViewUtils;
 import org.chromium.ui.text.NoUnderlineClickableSpan;
 
@@ -46,18 +48,19 @@ interface IncognitoNewTabPageManager {
         void loadIncognitoLearnMore();
 
         /**
-         * Enables/disables cookie controls mode as set from incognito NTP. By default
-         * nothing happens.
-         * @param enable A boolean specifying the state of third party cookie blocking in
-         *         incognito. True will enable third-party cookie blocking in incognito and false
-         *         will disable this feature.
+         * Initializes the cookie controls manager for interaction with the cookie controls toggle.
          * */
-        void setThirdPartyCookieBlocking(boolean enable);
+        void initCookieControlsManager();
 
         /**
-         * Returns whether third-party cookies are currently being blocked.
+         * Tells the caller whether a new snapshot is required or not.
          * */
-        boolean shouldBlockThirdPartyCookies();
+        boolean shouldCaptureThumbnail();
+
+        /**
+         * Cleans up the manager after it is finished being used.
+         * */
+        void destroy();
 
         /**
          * Called when the NTP has completely finished loading (all views will be inflated
@@ -135,6 +138,36 @@ void captureThumbnail(Canvas canvas) {
         mSnapshotScrollY = mScrollView.getScrollY();
     }
 
+    /**
+     * Set the visibility of the cookie controls card on the incognito description.
+     * @param isVisible Whether it's visible or not.
+     */
+    void setIncognitoCookieControlsCardVisibility(boolean isVisible) {}
+
+    /**
+     * Set the toggle on the cookie controls card.
+     * @param isChecked Whether it's checked or not.
+     */
+    void setIncognitoCookieControlsToggleChecked(boolean isChecked) {}
+
+    /**
+     * Set the incognito cookie controls toggle checked change listener.
+     * @param listener The given checked change listener.
+     */
+    void setIncognitoCookieControlsToggleCheckedListener(OnCheckedChangeListener listener) {}
+
+    /**
+     * Set the enforcement rule for the incognito cookie controls toggle.
+     * @param enforcement The enforcement enum to set.
+     */
+    void setIncognitoCookieControlsToggleEnforcement(@CookieControlsEnforcement int enforcement) {}
+
+    /**
+     * Set the incognito cookie controls icon click listener.
+     * @param listener The given onclick listener.
+     */
+    void setIncognitoCookieControlsIconOnclickListener(OnClickListener listener) {}
+
     @Override
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java b/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java
index 29d2ce02bd1f..5fce7653f9d1 100644
--- a/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java
+++ b/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java
@@ -24,9 +24,9 @@
 import android.text.TextPaint;
 import android.content.res.Configuration;
 
-import android.support.design.widget.BottomSheetDialogFragment;
-import android.support.design.widget.BottomSheetDialog;
-import android.support.design.widget.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import android.view.ViewTreeObserver;
 
 import org.chromium.chrome.R;
@@ -117,7 +117,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
             @Override
             public void onGlobalLayout() {
                 BottomSheetDialog dialog = (BottomSheetDialog) getDialog();
-                FrameLayout bottomSheet = (FrameLayout) dialog.findViewById(android.support.design.R.id.design_bottom_sheet);
+                FrameLayout bottomSheet = (FrameLayout) dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet);
                 BottomSheetBehavior behavior = BottomSheetBehavior.from(bottomSheet);
                 behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
             }
diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java b/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java
index 4414f6e2c647..bdee9fa6cc62 100644
--- a/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java
+++ b/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java
@@ -12,7 +12,7 @@
 import android.graphics.Bitmap;
 import android.widget.ImageView;
 import android.widget.Button;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
diff --git a/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java
index 0e1b82a2d20a..fb3bb6201c44 100644
--- a/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java
+++ b/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java
@@ -7,7 +7,7 @@
 
 package org.chromium.chrome.browser.onboarding;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
diff --git a/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java
index 09be32807b3c..d4f2e0be5db4 100644
--- a/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java
+++ b/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java
@@ -7,7 +7,7 @@
 
 package org.chromium.chrome.browser.onboarding;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.text.Spanned;
 import android.text.method.ScrollingMovementMethod;
diff --git a/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java b/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java
index 8feb3e535640..8b3f83ca0ac9 100644
--- a/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java
+++ b/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java
@@ -8,7 +8,7 @@
 package org.chromium.chrome.browser.onboarding;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.animation.DecelerateInterpolator;
diff --git a/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java b/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java
index 2b73302929c9..64e46e0fc50d 100644
--- a/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java
+++ b/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java
@@ -9,7 +9,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
@@ -41,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         OnboardingViewPagerAdapter onboardingViewPagerAdapter = new OnboardingViewPagerAdapter(
-                this, getFragmentManager(), this, onboardingType, fromSettings);
+                this, getSupportFragmentManager(), this, onboardingType, fromSettings);
         viewPager = findViewById(R.id.view_pager);
         viewPager.setAdapter(onboardingViewPagerAdapter);
     }
diff --git a/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java b/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java
index 8f6588506add..1e276e53bc10 100644
--- a/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java
+++ b/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java
@@ -7,10 +7,10 @@
 
 package org.chromium.chrome.browser.onboarding;
 
-import android.app.Fragment;
-import android.app.FragmentManager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import android.content.Context;
-import android.support.v13.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import org.chromium.chrome.browser.onboarding.OnViewPagerAction;
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
diff --git a/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java
index 497608740fec..779c0c73d2d1 100644
--- a/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java
+++ b/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java
@@ -9,7 +9,7 @@
 
 import static org.chromium.ui.base.ViewUtils.dpToPx;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java
index 18aef2fa8d67..7f4b5aa40e53 100644
--- a/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java
+++ b/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java
@@ -7,7 +7,7 @@
 
 package org.chromium.chrome.browser.onboarding;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java b/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java
index 8050bfc82de7..2b1893523429 100644
--- a/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java
+++ b/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java
@@ -5,9 +5,8 @@
 
 package org.chromium.chrome.browser.partnercustomizations;
 
-public class BravePartnerBrowserCustomizations
-        extends PartnerBrowserCustomizations {
-    public static class ProviderPackage implements Provider {
+public class BravePartnerBrowserCustomizations {
+    public static class ProviderPackage implements PartnerBrowserCustomizations.Provider {
         @Override
         public String getHomepage() {
             return null;
diff --git a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
index f3818fefd71a..6c08f197e745 100644
--- a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
+++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
@@ -7,7 +7,7 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
@@ -15,11 +15,11 @@
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
-import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference;
-import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
-import org.chromium.chrome.browser.settings.privacy.PrivacySettings;
-import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
+import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 
 public class BravePrivacySettings extends PrivacySettings {
     private static final String PREF_HTTPSE = "httpse";
@@ -33,7 +33,7 @@ public class BravePrivacySettings extends PrivacySettings {
     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
 
     private final PrefServiceBridge mPrefServiceBridge = PrefServiceBridge.getInstance();
-    private final ManagedPreferenceDelegate mManagedPreferenceDelegate =
+    private final ChromeManagedPreferenceDelegate mManagedPreferenceDelegate =
             createManagedPreferenceDelegate();
     private ChromeSwitchPreference mSearchSuggestions;
     private ChromeSwitchPreference mAutocompleteTopSites;
@@ -128,7 +128,7 @@ private void removePreferenceIfPresent(String key) {
         }
     }
 
-    private ManagedPreferenceDelegate createManagedPreferenceDelegate() {
+    private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() {
         return preference -> {
             String key = preference.getKey();
             if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
diff --git a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java
index 380489657501..4599136a5cfb 100644
--- a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java
+++ b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java
@@ -15,7 +15,7 @@
  */
 package org.chromium.chrome.browser.qrreader;
 
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceFragmentCompat;
 
 import com.google.android.gms.vision.Tracker;
 import com.google.android.gms.vision.barcode.Barcode;
diff --git a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java
index de5a0f3b1bf1..fb8a3c6035b5 100644
--- a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java
+++ b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java
@@ -15,7 +15,7 @@
  */
 package org.chromium.chrome.browser.qrreader;
 
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceFragmentCompat;
 
 import com.google.android.gms.vision.MultiProcessor;
 import com.google.android.gms.vision.Tracker;
diff --git a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java
index 594213b46108..187ae597abb7 100644
--- a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java
+++ b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java
@@ -9,7 +9,7 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
@@ -18,10 +18,11 @@
 import org.chromium.chrome.browser.BraveRewardsNativeWorker;
 import org.chromium.chrome.browser.BraveRewardsObserver;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
-import org.chromium.chrome.browser.flags.FeatureUtilities;
 import org.chromium.chrome.browser.night_mode.NightModeUtils;
 import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
-import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
+import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 import org.chromium.ui.base.DeviceFormFactor;
 
@@ -41,7 +42,7 @@ public void onCreate(Bundle savedInstanceState) {
             removePreferenceIfPresent(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY);
         }
 
-        if (!NightModeUtils.isNightModeSupported() || !FeatureUtilities.isNightModeAvailable()) {
+        if (!NightModeUtils.isNightModeSupported()) {
             removePreferenceIfPresent(PREF_UI_THEME);
         }
 
@@ -78,7 +79,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
                     ContextUtils.getApplicationContext());
             ((ChromeSwitchPreference) enableBottomToolbar)
                     .setChecked(!isTablet
-                            && FeatureUtilities.isBottomToolbarEnabled());
+                            && BottomToolbarConfiguration.isBottomToolbarEnabled());
         }
     }
 
@@ -105,7 +106,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
         if (BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY.equals(key)) {
             SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
-            Boolean originalStatus = FeatureUtilities.isBottomToolbarEnabled();
+            Boolean originalStatus = BottomToolbarConfiguration.isBottomToolbarEnabled();
             prefs.edit()
                     .putBoolean(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY,
                             !originalStatus)
diff --git a/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java b/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java
index bdbb80184c19..b24a83d66592 100644
--- a/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java
+++ b/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java
@@ -7,8 +7,8 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
@@ -16,6 +16,8 @@
 import org.chromium.chrome.browser.preferences.BravePref;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.BraveRelaunchUtils;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 
 /**
  * Fragment to keep track of all the display related preferences.
diff --git a/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java b/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java
index b7cb58b41289..e9eb95153271 100644
--- a/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java
+++ b/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java
@@ -6,12 +6,13 @@
 package org.chromium.chrome.browser.settings;
 
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveRelaunchUtils;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
-import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 
 public class BackgroundVideoPlaybackPreference
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java
index 6c9a5961b0ac..0a5f4972e029 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java
@@ -7,13 +7,15 @@
 
 import android.os.Bundle;
 import android.content.SharedPreferences;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.browser.BraveLaunchIntentDispatcher;
 import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 import org.chromium.chrome.R;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 
 public class BraveCustomTabsPreference extends BravePreferenceFragment
         implements Preference.OnPreferenceChangeListener {
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java
index e7d7ca4103aa..899a01424892 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java
@@ -11,7 +11,8 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveRewardsHelper;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
-import org.chromium.chrome.browser.settings.TextMessagePreference;
+import org.chromium.components.browser_ui.settings.TextMessagePreference;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java
index 26fb4b32b681..9486f9eb78eb 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java
@@ -13,7 +13,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 import android.util.DisplayMetrics;
 import android.widget.TextView;
 import android.os.Build;
@@ -31,6 +31,8 @@
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil;
 import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge;
+import org.chromium.components.browser_ui.settings.ChromeBasePreference;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.components.search_engines.TemplateUrl;
 import org.chromium.components.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.rate.RateDialogFragment;
@@ -57,6 +59,7 @@ public class BraveMainPreferencesBase extends BravePreferenceFragment {
     private static final String PREF_BRAVE_REWARDS = "brave_rewards";
     private static final String PREF_HOMEPAGE = "homepage";
     private static final String PREF_USE_CUSTOM_TABS = "use_custom_tabs";
+    private static final String PREF_LANGUAGES = "languages";
     private static final String PREF_RATE_BRAVE = "rate_brave";
 
     private final HashMap<String, Preference> mRemovedPreferences = new HashMap<>();
@@ -144,7 +147,7 @@ private void rearrangePreferenceOrders() {
         findPreference(PREF_SYNC).setOrder(++order);
         findPreference(PREF_ACCESSIBILITY).setOrder(++order);
         findPreference(PREF_CONTENT_SETTINGS).setOrder(++order);
-        findPreference(MainSettings.PREF_LANGUAGES).setOrder(++order);
+        findPreference(PREF_LANGUAGES).setOrder(++order);
         findPreference(MainSettings.PREF_DATA_REDUCTION).setOrder(++order);
         findPreference(MainSettings.PREF_DOWNLOADS).setOrder(++order);
         // This preference doesn't exist by default in Release mode
@@ -204,7 +207,7 @@ public boolean onPreferenceClick(Preference preference) {
                 int padding = dp2px(20);
                 titleTextView.setPadding(padding, padding, padding, padding);
                 titleTextView.setTextSize(18);
-                titleTextView.setTextColor(context.getResources().getColor(R.color.standard_mode_tint));
+                titleTextView.setTextColor(context.getResources().getColor(R.color.default_icon_color_tint_list));
                 titleTextView.setTypeface(null, Typeface.BOLD);
 
                 AlertDialog alertDialog = new AlertDialog.Builder(context, R.style.Theme_Chromium_AlertDialog)
diff --git a/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java b/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java
index bcdb1592c6df..f6cf8e4ac583 100644
--- a/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java
+++ b/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java
@@ -8,7 +8,7 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceFragmentCompat;
 import android.os.Build;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java
index 087a9b7e8ddf..d5e51a20568a 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java
@@ -7,8 +7,8 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
@@ -17,6 +17,8 @@
 import org.chromium.chrome.browser.BraveRewardsObserver;
 import org.chromium.chrome.browser.BraveRewardsPanelPopup;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 
 /**
  * Fragment to keep track of all Brave Rewards related preferences.
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java
index 155c93d1eea9..23ce2662b94e 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java
@@ -6,7 +6,7 @@
 package org.chromium.chrome.browser.settings;
 
 import android.content.Context;
-import android.support.v7.preference.DialogPreference;
+import androidx.preference.DialogPreference;
 import android.util.AttributeSet;
 
 import org.chromium.chrome.R;
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java
index 16a9b19b2757..fe935e3009b0 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java
@@ -6,7 +6,7 @@
 package org.chromium.chrome.browser.settings;
 
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceDialogFragmentCompat;
+import androidx.preference.PreferenceDialogFragmentCompat;
 import android.view.View;
 
 import org.chromium.chrome.browser.BraveRewardsNativeWorker;
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java b/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java
index 2ca41863320e..07a42093bb1f 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java
@@ -8,7 +8,7 @@
 import android.content.Context;
 import android.view.View;
 
-import org.chromium.chrome.browser.settings.search_engine.SearchEngineAdapter;
+import org.chromium.chrome.browser.search_engines.settings.SearchEngineAdapter;
 import org.chromium.components.search_engines.TemplateUrl;
 
 public class BraveSearchEngineAdapter extends SearchEngineAdapter {
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java b/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java
index 85e5041e904a..c5bac36b87a5 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java
@@ -10,7 +10,7 @@
 import android.view.View;
 import android.widget.ListView;
 
-import org.chromium.chrome.browser.settings.search_engine.SearchEngineAdapter;
+import org.chromium.chrome.browser.search_engines.settings.SearchEngineAdapter;
 import org.chromium.chrome.R;
 
 public class BraveSearchEnginePreference extends ListFragment {
diff --git a/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java b/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java
index 7be30fcfa9b7..157b1d51ed85 100644
--- a/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java
+++ b/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java
@@ -6,10 +6,11 @@
 package org.chromium.chrome.browser.settings;
 
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 import org.chromium.chrome.browser.partnercustomizations.CloseBraveManager;
 
diff --git a/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java b/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java
index e9962a616532..f0505d7b7083 100644
--- a/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java
+++ b/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java
@@ -6,6 +6,7 @@
 package org.chromium.chrome.browser.settings;
 
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tab.TabCreationState;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
@@ -26,7 +27,7 @@ public SearchEngineTabModelSelectorObserver(TabModelSelector tabModelSelector) {
     public void onChange() {}
 
     @Override
-    public void onNewTabCreated(Tab tab) {}
+    public void onNewTabCreated(Tab tab, @TabCreationState int creationState) {}
 
     @Override
     public void onTabModelSelected(TabModel newModel, TabModel oldModel) {
diff --git a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
index f8850f72ef8e..c67e3486cdfb 100644
--- a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
+++ b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
@@ -14,8 +14,8 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
 import android.text.InputType;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,8 +33,8 @@
 import org.chromium.chrome.browser.BraveRewardsPanelPopup;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
-import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.chrome.browser.util.BraveDbUtil;
 
 /**
diff --git a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java b/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java
index e5bbb79be46b..dd5bc3e6e318 100644
--- a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java
+++ b/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java
@@ -6,7 +6,7 @@
 package org.chromium.chrome.browser.settings.themes;
 
 import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.RadioGroup;
@@ -16,6 +16,7 @@
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.preferences.BravePref;
+import org.chromium.chrome.browser.night_mode.settings.RadioButtonGroupThemePreference;
 import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge;
 import org.chromium.chrome.browser.BraveRelaunchUtils;
 
diff --git a/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java
index 0db6da5285cf..b49a947a977e 100644
--- a/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java
+++ b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java
@@ -6,11 +6,11 @@
 package org.chromium.chrome.browser.site_settings;
 
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 
 import java.util.HashMap;
diff --git a/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java b/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java
index a02745e9398a..6413d32b009e 100644
--- a/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java
+++ b/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java
@@ -6,12 +6,12 @@
 package org.chromium.chrome.browser.site_settings;
 
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
-import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 
 public class DesktopModePreferences
diff --git a/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java b/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java
index 3c121441a485..f4803c8f2c64 100644
--- a/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java
+++ b/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java
@@ -6,12 +6,12 @@
 package org.chromium.chrome.browser.site_settings;
 
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
-import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
 
 public class PlayYTVideoInBrowserPreferences
diff --git a/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java b/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java
index 352436ebaef1..1be1bf1c42fc 100644
--- a/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java
+++ b/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java
@@ -19,18 +19,15 @@
 import org.chromium.chrome.browser.preferences.BravePref;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.util.UrlConstants;
+import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil;
 import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge;
 
 public class BraveTabCreator extends ChromeTabCreator {
 
-    public BraveTabCreator(ChromeActivity activity,
-            WindowAndroid nativeWindow,
-            StartupTabPreloader startupTabPreloader,
-            Supplier<TabDelegateFactory> tabDelegateFactory,
-            boolean incognito) {
-        super(activity, nativeWindow, startupTabPreloader, tabDelegateFactory, incognito);
+    public BraveTabCreator(ChromeActivity activity, WindowAndroid nativeWindow, StartupTabPreloader startupTabPreloader,
+            Supplier<TabDelegateFactory> tabDelegateFactory, boolean incognito, OverviewNTPCreator overviewNTPCreator) {
+        super(activity, nativeWindow, startupTabPreloader, tabDelegateFactory, incognito, overviewNTPCreator);
     }
 
     @Override
diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java
index 0c62d0f5fde7..c594b8c1e71e 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java
@@ -13,14 +13,17 @@
 import android.view.ViewGroup;
 import android.view.ViewStub;
 
+import org.chromium.base.Callback;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.ThemeColorProvider;
 import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.homepage.HomepageManager;
+import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.toolbar.HomeButton;
 import org.chromium.chrome.browser.toolbar.IncognitoStateProvider;
 import org.chromium.chrome.browser.toolbar.TabCountProvider;
@@ -38,19 +41,18 @@ public class BraveBottomToolbarCoordinator
     private SearchAccelerator mSearchAccelerator;
     private BottomToolbarNewTabButton mNewTabButton;
     private ActivityTabProvider mBraveTabProvider;
-    private OnClickListener mOriginalHomeButtonListener;
+    private Runnable mOriginalHomeButtonRunnable;
 
     private final Context mContext = ContextUtils.getApplicationContext();
 
     BraveBottomToolbarCoordinator(ViewStub stub, ActivityTabProvider tabProvider,
-            OnClickListener homeButtonListener, OnClickListener searchAcceleratorListener,
-            ObservableSupplier<OnClickListener> shareButtonListener,
-            OnLongClickListener tabsSwitcherLongClickListner,
-            ThemeColorProvider themeColorProvider) {
-        super(stub, tabProvider, homeButtonListener, searchAcceleratorListener, shareButtonListener,
-                tabsSwitcherLongClickListner, themeColorProvider);
+            OnLongClickListener tabsSwitcherLongClickListner, ThemeColorProvider themeColorProvider,
+            ObservableSupplier<ShareDelegate> shareDelegateSupplier, Supplier<Boolean> showStartSurfaceCallable,
+            Runnable openHomepageAction, Callback<Integer> setUrlBarFocusAction) {
+        super(stub, tabProvider, tabsSwitcherLongClickListner, themeColorProvider, shareDelegateSupplier,
+                showStartSurfaceCallable, openHomepageAction, setUrlBarFocusAction);
         mBraveTabProvider = tabProvider;
-        mOriginalHomeButtonListener = homeButtonListener;
+        mOriginalHomeButtonRunnable = openHomepageAction;
     }
 
     @Override
@@ -80,14 +82,12 @@ public boolean onLongClick(View v) {
     }
 
     @Override
-    void initializeWithNative(OnClickListener tabSwitcherListener,
-            OnClickListener newTabClickListener, OnClickListener closeTabsClickListener,
+    void initializeWithNative(OnClickListener tabSwitcherListener, OnClickListener newTabClickListener,
             AppMenuButtonHelper menuButtonHelper, OverviewModeBehavior overviewModeBehavior,
-            TabCountProvider tabCountProvider, IncognitoStateProvider incognitoStateProvider,
-            ViewGroup topToolbarRoot) {
-        super.initializeWithNative(tabSwitcherListener, newTabClickListener, closeTabsClickListener,
-                menuButtonHelper, overviewModeBehavior, tabCountProvider, incognitoStateProvider,
-                topToolbarRoot);
+            TabCountProvider tabCountProvider, IncognitoStateProvider incognitoStateProvider, ViewGroup topToolbarRoot,
+            Runnable closeAllTabsAction) {
+        super.initializeWithNative(tabSwitcherListener, newTabClickListener, menuButtonHelper, overviewModeBehavior,
+                tabCountProvider, incognitoStateProvider, topToolbarRoot, closeAllTabsAction);
 
         View root = (View) topToolbarRoot.getParent();
         View bottom_toolbar_browsing = root.findViewById(R.id.bottom_toolbar_browsing);
@@ -100,7 +100,7 @@ void initializeWithNative(OnClickListener tabSwitcherListener,
             final OnClickListener homeButtonListener = v -> {
                 final boolean isHomepageEnabled = HomepageManager.isHomepageEnabled();
                 if (isHomepageEnabled) {
-                    mOriginalHomeButtonListener.onClick(v);
+                    mOriginalHomeButtonRunnable.run();
                 } else {
                     newTabClickListener.onClick(v);
                 }
diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java
index b8995d9d8e8b..37ce4b63de14 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java
@@ -5,7 +5,7 @@
 
 package org.chromium.chrome.browser.toolbar.bottom;
 
-import org.chromium.chrome.browser.flags.FeatureUtilities;
+import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
 
 /**
   * Brave's extension for BottomToolbarVariationManager
@@ -16,12 +16,12 @@ public class BraveBottomToolbarVariationManager
 
     private static @Variations String getBraveVariation() {
         if (sBraveVariation != null) return sBraveVariation;
-        sBraveVariation = FeatureUtilities.getBottomToolbarVariation();
+        sBraveVariation = BOTTOM_TOOLBAR_VARIATION.getValue();
         return sBraveVariation;
     }
 
     public static boolean isBraveVariation() {
-        return FeatureUtilities.isBottomToolbarEnabled()
+        return BottomToolbarConfiguration.isBottomToolbarEnabled()
                 && getBraveVariation().equals(Variations.NONE);
     }
 }
diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java
index 4f641f3da60e..1e4f1ee5bc6e 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java
@@ -47,14 +47,15 @@ public class BraveBrowsingModeBottomToolbarCoordinator
             mBookmarkButton.setVisibility(View.VISIBLE);
             getNewTabButtonParent().setVisibility(View.GONE);
 
-            mBookmarkButtonListenerSupplierCallback = bookmarkButtonListener -> {
-                mBookmarkButton.setOnClickListener(bookmarkButtonListener);
-            };
-            // To avoid extensive patching we use shareButtonListenerSupplier for both
-            // share and bookmark buttons. Thus we can't use them both simultaneously.
-            mBookmarkButtonListenerSupplier = shareButtonListenerSupplier;
-            mBookmarkButton.setActivityTabProvider(mBraveTabProvider);
-            mBookmarkButtonListenerSupplier.addObserver(mBookmarkButtonListenerSupplierCallback);
+            // TODO(samartnik): add proper listener for bookmark button
+            // mBookmarkButtonListenerSupplierCallback = bookmarkButtonListener -> {
+            //     mBookmarkButton.setOnClickListener(bookmarkButtonListener);
+            // };
+            // // To avoid extensive patching we use shareButtonListenerSupplier for both
+            // // share and bookmark buttons. Thus we can't use them both simultaneously.
+            // mBookmarkButtonListenerSupplier = shareButtonListenerSupplier;
+            // mBookmarkButton.setActivityTabProvider(mBraveTabProvider);
+            // mBookmarkButtonListenerSupplier.addObserver(mBookmarkButtonListenerSupplierCallback);
         }
         mMenuButton = mBraveToolbarRoot.findViewById(R.id.menu_button_wrapper);
         if (!BottomToolbarVariationManager.isMenuButtonOnBottom()) {
diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
index 4c69010ab107..3a4baec8942c 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
@@ -37,6 +37,7 @@
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettings;
 import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettingsObserver;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.AppearancePreferences;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabImpl;
@@ -113,7 +114,7 @@ protected void onFinishInflate() {
           ImageButton forwardButton = findViewById(R.id.forward_button);
           if (forwardButton != null) {
               final Drawable forwardButtonDrawable = UiUtils.getTintedDrawable(
-                      getContext(), R.drawable.btn_right_tablet, R.color.standard_mode_tint);
+                      getContext(), R.drawable.btn_right_tablet, R.color.default_icon_color_tint_list);
               forwardButton.setImageDrawable(forwardButtonDrawable);
           }
       }
@@ -242,7 +243,7 @@ public void onPageLoadFinished(final Tab tab, String url) {
             public void onDidFinishNavigation(Tab tab, NavigationHandle navigation) {
                 if (getToolbarDataProvider().getTab() == tab && mBraveRewardsNativeWorker != null
                         && !tab.isIncognito()) {
-                    mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrl());
+                    mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrlString());
                 }
             }
 
@@ -258,7 +259,7 @@ public void didSelectTab(Tab tab, @TabSelectionType int type, int lastId) {
                 if (getToolbarDataProvider().getTab() == tab &&
                     mBraveRewardsNativeWorker != null &&
                     !tab.isIncognito()) {
-                    mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrl());
+                    mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrlString());
                 }
             }
         };
@@ -276,13 +277,13 @@ public void onClick(View v) {
               return;
           }
           try {
-              URL url = new URL(currentTab.getUrl());
+              URL url = new URL(currentTab.getUrlString());
               // Don't show shields popup if protocol is not valid for shields.
               if (!isValidProtocolForShields(url.getProtocol())) {
                   return;
               }
-              mBraveShieldsHandler.show(mBraveShieldsButton, currentTab.getUrl(),
-                  url.getHost(), currentTab.getId(), ((TabImpl)currentTab).getProfile());
+              mBraveShieldsHandler.show(mBraveShieldsButton, currentTab.getUrlString(),
+                  url.getHost(), currentTab.getId(), Profile.fromWebContents(((TabImpl)currentTab).getWebContents()));
           } catch (Exception e) {
               // Do nothing if url is invalid.
               // Just return w/o showing shields popup.
@@ -429,7 +430,7 @@ private boolean isShieldsOnForTab(Tab tab) {
           assert false;
           return false;
       }
-      return BraveShieldsContentSettings.getShields(((TabImpl)tab).getProfile(), tab.getUrl(),
+      return BraveShieldsContentSettings.getShields(Profile.fromWebContents(((TabImpl)tab).getWebContents()), tab.getUrlString(),
           BraveShieldsContentSettings.RESOURCE_IDENTIFIER_BRAVE_SHIELDS);
   }
 
diff --git a/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java b/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java
index ebc51ecebbc3..bdedda02a3bc 100644
--- a/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java
+++ b/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java
@@ -343,7 +343,7 @@ protected void onHandleWork(Intent intent) {
         // Kick off the migration task only after the browser has
         // completed startup, as migration requires a profile.
         PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
-            BrowserStartupController.get(LibraryProcessType.PROCESS_BROWSER)
+            BrowserStartupController.getInstance()
                     .addStartupCompletedObserver(new BrowserStartupController.StartupCallback() {
                         @Override
                         public void onSuccess() {
diff --git a/android/java/res/layout/brave_bookmark_toolbar.xml b/android/java/res/layout/brave_bookmark_toolbar.xml
index c4ecf01e61e9..4ca0d31e46ef 100644
--- a/android/java/res/layout/brave_bookmark_toolbar.xml
+++ b/android/java/res/layout/brave_bookmark_toolbar.xml
@@ -11,7 +11,7 @@
 
     <org.chromium.chrome.browser.toolbar.bottom.BookmarksButton
         android:id="@+id/bottom_bookmark_button"
-        app:tint="@color/standard_mode_tint"
+        app:tint="@color/default_icon_color_tint_list"
         style="@style/SplitToolbarButton"
         android:layout_gravity="center"
         android:contentDescription="@string/accessibility_toolbar_btn_home"
diff --git a/android/java/res/layout/brave_bottom_new_tab_button.xml b/android/java/res/layout/brave_bottom_new_tab_button.xml
index 5ef2da08b431..13a69b9a640e 100644
--- a/android/java/res/layout/brave_bottom_new_tab_button.xml
+++ b/android/java/res/layout/brave_bottom_new_tab_button.xml
@@ -12,7 +12,7 @@
     <org.chromium.chrome.browser.toolbar.bottom.BottomToolbarNewTabButton
         android:id="@+id/bottom_new_tab_button"
         android:contentDescription="@string/accessibility_toolbar_btn_new_tab"
-        app:tint="@color/standard_mode_tint"
+        app:tint="@color/default_icon_color_tint_list"
         android:background="?attr/selectableItemBackgroundBorderless"
         app:srcCompat="@drawable/new_tab_icon"
         android:visibility="gone"
diff --git a/android/java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml b/android/java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml
index 0865066f3b50..8a14e34e05c6 100644
--- a/android/java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml
+++ b/android/java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml
@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/brave_shields_block_3rd_party_cookies_switch"
-        android:textColor="@color/standard_mode_tint"
+        android:textColor="@color/default_icon_color_tint_list"
         android:orientation="horizontal"
         android:paddingStart="10dp"
         android:gravity="start|center_vertical"
diff --git a/android/java/res/layout/brave_shields_ads_tracking_switcher.xml b/android/java/res/layout/brave_shields_ads_tracking_switcher.xml
index a336a4a4fb55..e5c4d2a465df 100644
--- a/android/java/res/layout/brave_shields_ads_tracking_switcher.xml
+++ b/android/java/res/layout/brave_shields_ads_tracking_switcher.xml
@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/brave_shields_ads_tracking_switch"
-        android:textColor="@color/standard_mode_tint"
+        android:textColor="@color/default_icon_color_tint_list"
         android:orientation="horizontal"
         android:paddingStart="10dp"
         android:gravity="start|center_vertical"
diff --git a/android/java/res/layout/brave_shields_fingerprints_blocked_switcher.xml b/android/java/res/layout/brave_shields_fingerprints_blocked_switcher.xml
index 7b2524036b8f..cd47cff6c107 100644
--- a/android/java/res/layout/brave_shields_fingerprints_blocked_switcher.xml
+++ b/android/java/res/layout/brave_shields_fingerprints_blocked_switcher.xml
@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/brave_shields_block_fingerprints_switch"
-        android:textColor="@color/standard_mode_tint"
+        android:textColor="@color/default_icon_color_tint_list"
         android:orientation="horizontal"
         android:paddingStart="10dp"
         android:gravity="start|center_vertical"
diff --git a/android/java/res/layout/brave_shields_https_upgrade_switcher.xml b/android/java/res/layout/brave_shields_https_upgrade_switcher.xml
index ead43f3043c8..2333be70c502 100644
--- a/android/java/res/layout/brave_shields_https_upgrade_switcher.xml
+++ b/android/java/res/layout/brave_shields_https_upgrade_switcher.xml
@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/brave_shields_https_everywhere_switch"
-        android:textColor="@color/standard_mode_tint"
+        android:textColor="@color/default_icon_color_tint_list"
         android:orientation="horizontal"
         android:paddingStart="10dp"
         android:gravity="start|center_vertical"
diff --git a/android/java/res/layout/brave_shields_menu_item.xml b/android/java/res/layout/brave_shields_menu_item.xml
index 23bf4d7ef5a5..ac6cd43bb8f0 100644
--- a/android/java/res/layout/brave_shields_menu_item.xml
+++ b/android/java/res/layout/brave_shields_menu_item.xml
@@ -22,7 +22,7 @@
         android:textSize="16sp"
         android:fontFamily="sans-serif"
         android:textStyle="normal"
-        android:textColor="@color/standard_mode_tint"
+        android:textColor="@color/default_icon_color_tint_list"
         android:gravity="start|center_vertical"
         android:layout_gravity="center_vertical"
         android:paddingStart="10dp" />
diff --git a/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml b/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml
index 982ce19051a8..f167b5a1291e 100644
--- a/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml
+++ b/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml
@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/brave_shields_blocks_scripts_switch"
-        android:textColor="@color/standard_mode_tint"
+        android:textColor="@color/default_icon_color_tint_list"
         android:orientation="horizontal"
         android:paddingStart="10dp"
         android:gravity="start|center_vertical"
diff --git a/android/java/res/layout/brave_shields_switcher.xml b/android/java/res/layout/brave_shields_switcher.xml
index bdbd04645a22..56571a476a3a 100644
--- a/android/java/res/layout/brave_shields_switcher.xml
+++ b/android/java/res/layout/brave_shields_switcher.xml
@@ -15,7 +15,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:textColor="@color/shield_text_color"
+        android:textColor="@color/default_icon_color_tint_list"
         android:orientation="horizontal"
         android:textSize="14sp"
         android:gravity="start|center_vertical"
diff --git a/android/java/res/layout/brave_shields_text_item.xml b/android/java/res/layout/brave_shields_text_item.xml
index 9ec79f4cff6f..ad59d4a83fd7 100644
--- a/android/java/res/layout/brave_shields_text_item.xml
+++ b/android/java/res/layout/brave_shields_text_item.xml
@@ -13,5 +13,5 @@
         android:textSize="16sp"
         android:fontFamily="sans-serif"
         android:textStyle="normal"
-        android:textColor="@color/standard_mode_tint" />
+        android:textColor="@color/default_icon_color_tint_list" />
 </RelativeLayout>
diff --git a/android/java/res/layout/brave_sync_device.xml b/android/java/res/layout/brave_sync_device.xml
index 6c79bc6c0e01..425f68ed2305 100644
--- a/android/java/res/layout/brave_sync_device.xml
+++ b/android/java/res/layout/brave_sync_device.xml
@@ -38,7 +38,7 @@
         style="@style/ListItemEndIcon"
         android:contentDescription="@string/remove"
         android:src="@drawable/ic_delete_white_24dp"
-        app:tint="@color/standard_mode_tint"
+        app:tint="@color/default_icon_color_tint_list"
         android:layout_centerVertical="true"
         android:layout_alignParentEnd="true" />
 
diff --git a/android/java/res/layout/brave_sync_layout.xml b/android/java/res/layout/brave_sync_layout.xml
index d09bbccecc11..c895920fd498 100644
--- a/android/java/res/layout/brave_sync_layout.xml
+++ b/android/java/res/layout/brave_sync_layout.xml
@@ -246,7 +246,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/copy_paste"
-                    app:tint="@color/standard_mode_tint"
+                    app:tint="@color/default_icon_color_tint_list"
                     android:background="@android:color/transparent"
                     android:contentDescription="@string/brave_sync_word_count_text"
                     android:gravity="end|center" />
diff --git a/android/java/res/layout/fragment_super_referral_share.xml b/android/java/res/layout/fragment_super_referral_share.xml
index 687f9e0e90b6..68434dfb16ab 100644
--- a/android/java/res/layout/fragment_super_referral_share.xml
+++ b/android/java/res/layout/fragment_super_referral_share.xml
@@ -22,7 +22,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:text="@string/share_brave_with_your_friends"
-            android:textColor="@color/standard_mode_tint"
+            android:textColor="@color/default_icon_color_tint_list"
             android:fontFamily="sans-serif"
             android:textStyle="bold"/>
 
diff --git a/android/java/res/layout/new_tab_page_incognito.xml b/android/java/res/layout/new_tab_page_incognito.xml
index 617ae1e798c2..abe51b1e3051 100644
--- a/android/java/res/layout/new_tab_page_incognito.xml
+++ b/android/java/res/layout/new_tab_page_incognito.xml
@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/brave_new_tab_private_header"
-                android:textAppearance="@style/TextAppearance.WhiteHeadline" />
+                android:textAppearance="@style/TextAppearance.Headline.Primary.Light" />
 
             <TextView
                 android:id="@+id/new_tab_incognito_title"
diff --git a/android/java/res/layout/new_tab_page_layout.xml b/android/java/res/layout/new_tab_page_layout.xml
index c517f9484de1..1c21c7d9789e 100644
--- a/android/java/res/layout/new_tab_page_layout.xml
+++ b/android/java/res/layout/new_tab_page_layout.xml
@@ -65,6 +65,14 @@
             <!-- Search box -->
             <include layout="@layout/fake_search_box_layout"/>
 
+            <!-- Query tiles -->
+            <FrameLayout
+                android:id="@+id/query_tiles"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:visibility="gone"/>
+
             <!-- Middle spacer -->
             <View
                 android:id="@+id/ntp_middle_spacer"
diff --git a/android/java/res/menu/exit_settings_menu.xml b/android/java/res/menu/exit_settings_menu.xml
index 4f566814d08e..9ddfd7ec4cf6 100644
--- a/android/java/res/menu/exit_settings_menu.xml
+++ b/android/java/res/menu/exit_settings_menu.xml
@@ -12,5 +12,5 @@
         android:icon="@drawable/btn_close"
         android:title="@string/settings_exit"
         app:showAsAction="ifRoom"
-        app:iconTint="@color/standard_mode_tint" />
+        app:iconTint="@color/default_icon_color_tint_list" />
 </menu>
diff --git a/android/java/res/xml/legal_information_preferences.xml b/android/java/res/xml/legal_information_preferences.xml
index 8694814f2210..cf0ef9fc1eb7 100644
--- a/android/java/res/xml/legal_information_preferences.xml
+++ b/android/java/res/xml/legal_information_preferences.xml
@@ -12,7 +12,7 @@
         app:url="@string/open_source_license_url" />
     <org.chromium.chrome.browser.settings.HyperlinkPreference
         android:key="terms_of_service"
-        android:title="@string/terms_of_service_title"
+        android:title="@string/google_terms_of_service_title"
         app:url="@string/brave_terms_of_service_url" />
     <org.chromium.chrome.browser.settings.HyperlinkPreference
         android:key="privacy_notice"
diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java
index 095ea81e1b18..0d4a17e0fe9e 100644
--- a/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java
+++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java
@@ -7,7 +7,7 @@
 
 package org.chromium.chrome.browser.onboarding;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Handler;
diff --git a/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch b/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch
index f6d2a00b22fa..f5d4c0615cbd 100644
--- a/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch
+++ b/patches/chrome-android-java-res-menu-website_preferences_menu.xml.patch
@@ -6,5 +6,5 @@ index 6371709bb96312fe31a1f4e48eee546e4e8bd746..e1a88694bc1d273cc1975af4731c671a
            android:title="@string/search"
            app:showAsAction="always"
            app:actionViewClass="androidx.appcompat.widget.SearchView" />
-+    <item android:id="@+id/close_menu_id" android:icon="@drawable/btn_close" android:title="@string/settings_exit" app:showAsAction="ifRoom" app:iconTint="@color/standard_mode_tint" />
++    <item android:id="@+id/close_menu_id" android:icon="@drawable/btn_close" android:title="@string/settings_exit" app:showAsAction="ifRoom" app:iconTint="@color/default_icon_color_tint_list" />
  </menu>

From f69c5645f8baaa9b8641247cdc44b0b6f1ae8cea Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Mon, 4 May 2020 16:44:57 -0400
Subject: [PATCH 101/161] [Android] Updated patches to fix build

---
 ...bottom-BottomToolbarCoordinator.java.patch | 22 ++-----------------
 ...lbar-top-TabSwitcherModeTTPhone.java.patch |  4 ++--
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
index c0d40a882894..020ad3a93f7f 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomToolbarCoordinator.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
-index 949ac0ed0ac7d0c2b5ebcbc628e60d7e8d2d6e08..79e88e544c9d45a2eb2c219ffcf5ffe7d50f8df3 100644
+index 949ac0ed0ac7d0c2b5ebcbc628e60d7e8d2d6e08..e253a85fef76afd71c4bf3df2e90558408f39084 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
 @@ -39,7 +39,7 @@ import org.chromium.components.feature_engagement.Tracker;
@@ -31,25 +31,7 @@ index 949ac0ed0ac7d0c2b5ebcbc628e60d7e8d2d6e08..79e88e544c9d45a2eb2c219ffcf5ffe7
                  homeButtonListener, searchAcceleratorListener, mShareButtonListenerSupplier,
                  tabsSwitcherLongClickListner);
  
-@@ -228,13 +228,16 @@ class BottomToolbarCoordinator {
- 
-     private void onShareDelegateAvailable(ShareDelegate shareDelegate) {
-         final OnClickListener shareButtonListener = v -> {
-+/*
-             if (BottomToolbarVariationManager.isShareButtonOnBottom()) {
-                 recordBottomToolbarUseForIPH();
-                 RecordUserAction.record("MobileBottomToolbarShareButton");
-             }
- 
-+*/
-             Tab tab = mTabProvider.get();
--            shareDelegate.share(tab, /*shareDirectly=*/false);
-+            tab.GetActivity().addOrEditBookmark(tab);
-+//        shareDelegate.share(tab, /*shareDirectly=*/false);
-         };
- 
-         mShareButtonListenerSupplier.set(shareButtonListener);
-@@ -260,4 +263,5 @@ class BottomToolbarCoordinator {
+@@ -260,4 +260,5 @@ class BottomToolbarCoordinator {
              listener.onClick(v);
          };
      }
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch
index b738553bdc00..33923ae25682 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-TabSwitcherModeTTPhone.java.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java
-index 2d5c7f94389664cdfad0e4764477043f0735bc3e..43fce29710826b322b18691dfdca43e4a5e54241 100644
+index 2d5c7f94389664cdfad0e4764477043f0735bc3e..25097eff0af644a39f9fd5e4a9cd86422fb173d8 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTPhone.java
 @@ -291,6 +291,7 @@ public class TabSwitcherModeTTPhone extends OptimizedFrameLayout
          if (BottomToolbarVariationManager.isTabSwitcherOnBottom() && !shouldShowIncognitoToggle()) {
              mToggleTabStackButton.setVisibility(isVisible ? GONE : VISIBLE);
          }
-+        setMenuButtonVisibility(!isVisible || (FeatureUtilities.isBottomToolbarEnabled() && !BottomToolbarVariationManager.isMenuButtonOnBottom()));
++        setMenuButtonVisibility(!isVisible || (BottomToolbarConfiguration.isBottomToolbarEnabled() && !BottomToolbarVariationManager.isMenuButtonOnBottom()));
      }
  
      private void setNewTabButtonVisibility(boolean isButtonVisible) {

From 676f74ab901cb16073df5a625f9573e11161c84e Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Mon, 4 May 2020 18:10:55 -0400
Subject: [PATCH 102/161] [Android] Removed patch for HomepageManager

---
 android/brave_java_sources.gni                 |  1 +
 .../browser/homepage/BraveHomepageManager.java | 15 +++++++++++++++
 .../chromium/chrome/browser/BytecodeTest.java  |  1 +
 .../org/brave/bytecode/BraveClassAdapter.java  |  1 +
 .../BraveHomepageManagerClassAdapter.java      | 18 ++++++++++++++++++
 build/android/bytecode/java_sources.gni        |  1 +
 ...browser-homepage-HomepageManager.java.patch | 16 ----------------
 7 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java
 create mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveHomepageManagerClassAdapter.java
 delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch

diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
index 957abadb6cc9..64b073d05b9e 100644
--- a/android/brave_java_sources.gni
+++ b/android/brave_java_sources.gni
@@ -36,6 +36,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java",
   "../../brave/android/java/org/chromium/chrome/browser/help/BraveHelpAndFeedback.java",
+  "../../brave/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java",
   "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java",
diff --git a/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java b/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java
new file mode 100644
index 000000000000..78186664cfb7
--- /dev/null
+++ b/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java
@@ -0,0 +1,15 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.homepage;
+
+import org.chromium.chrome.browser.partnercustomizations.CloseBraveManager;
+
+// see org.brave.bytecode.BraveHomepageManagerClassAdapter
+public class BraveHomepageManager {
+    public static boolean shouldCloseAppWithZeroTabs() {
+        return CloseBraveManager.shouldCloseAppWithZeroTabs();
+    }
+}
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
index 608d08b5c11b..39e7991fc498 100644
--- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -47,6 +47,7 @@ public void testMethodsExist() throws Exception {
         Assert.assertTrue(methodExists("org/chromium/chrome/browser/externalnav/ExternalNavigationHandler",
                 "clobberCurrentTabWithFallbackUrl"));
         Assert.assertTrue(methodExists("org/chromium/chrome/browser/LaunchIntentDispatcher", "isCustomTabIntent"));
+        Assert.assertTrue(methodExists("org/chromium/chrome/browser/homepage/HomepageManager", "shouldCloseAppWithZeroTabs"));
     }
 
     @Test
diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java
index 01ed1e55272e..3251583a01d3 100644
--- a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java
+++ b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java
@@ -14,6 +14,7 @@ public static ClassVisitor createAdapter(ClassVisitor chain) {
         chain = new BraveAndroidSyncSettingsClassAdapter(chain);
         chain = new BraveLaunchIntentDispatcherClassAdapter(chain);
         chain = new BraveExternalNavigationHandlerClassAdapter(chain);
+        chain = new BraveHomepageManagerClassAdapter(chain);
         return chain;
     }
 }
diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveHomepageManagerClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveHomepageManagerClassAdapter.java
new file mode 100644
index 000000000000..f02855ac552b
--- /dev/null
+++ b/build/android/bytecode/java/org/brave/bytecode/BraveHomepageManagerClassAdapter.java
@@ -0,0 +1,18 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.brave.bytecode;
+
+import org.objectweb.asm.ClassVisitor;
+
+public class BraveHomepageManagerClassAdapter extends BraveClassVisitor {
+    static String sHomepageManagerClassName = "org/chromium/chrome/browser/homepage/HomepageManager";
+    static String sBraveHomepageManagerClassName = "org/chromium/chrome/browser/homepage/BraveHomepageManager";
+
+    public BraveHomepageManagerClassAdapter(ClassVisitor visitor) {
+        super(visitor);
+        changeMethodOwner(sHomepageManagerClassName, "shouldCloseAppWithZeroTabs", sBraveHomepageManagerClassName);
+    }
+}
diff --git a/build/android/bytecode/java_sources.gni b/build/android/bytecode/java_sources.gni
index 21689a681c85..741679eec780 100644
--- a/build/android/bytecode/java_sources.gni
+++ b/build/android/bytecode/java_sources.gni
@@ -1,6 +1,7 @@
 brave_java_bytecode_files = [
   "../../../brave/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java",
   "../../../brave/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java",
+  "../../../brave/build/android/bytecode/java/org/brave/bytecode/BraveHomepageManagerClassAdapter.java",
   "../../../brave/build/android/bytecode/java/org/brave/bytecode/BraveLaunchIntentDispatcherClassAdapter.java",
   "../../../brave/build/android/bytecode/java/org/brave/bytecode/BraveAndroidSyncSettingsClassAdapter.java",
   "../../../brave/build/android/bytecode/java/org/brave/bytecode/BraveBookmarkModelClassAdapter.java",
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch
deleted file mode 100644
index c142402208ce..000000000000
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-homepage-HomepageManager.java.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-index 5996580300f23c8de81558180906040980e0ac8f..65836f633a77264d0ac1af57f8dc4b59801d6e26 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -105,8 +105,9 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
-      * @return Whether to close the app when the user has zero tabs.
-      */
-     public static boolean shouldCloseAppWithZeroTabs() {
--        return HomepageManager.isHomepageEnabled()
--                && !NewTabPage.isNTPUrl(HomepageManager.getHomepageUri());
-+        return CloseBraveManager.shouldCloseAppWithZeroTabs();
-+        // return HomepageManager.isHomepageEnabled()
-+        //         && !NewTabPage.isNTPUrl(HomepageManager.getHomepageUri());
-     }
- 
-     /**

From 0c93743d85e0577b92a32d9b26e7bbfea0b88ad8 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Mon, 4 May 2020 19:44:03 -0400
Subject: [PATCH 103/161] [Android] Added click handler for bookmark button

---
 ...eBrowsingModeBottomToolbarCoordinator.java | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java
index 1e4f1ee5bc6e..a0c138d51fcd 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java
@@ -14,6 +14,7 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
+import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.ThemeColorProvider;
 import org.chromium.chrome.browser.toolbar.IncognitoStateProvider;
 import org.chromium.chrome.browser.toolbar.MenuButton;
@@ -25,8 +26,6 @@
  */
 public class BraveBrowsingModeBottomToolbarCoordinator
         extends BrowsingModeBottomToolbarCoordinator {
-    private Callback<OnClickListener> mBookmarkButtonListenerSupplierCallback;
-    private ObservableSupplier<OnClickListener> mBookmarkButtonListenerSupplier;
     private final BrowsingModeBottomToolbarLinearLayout mBraveToolbarRoot;
     private final ActivityTabProvider mBraveTabProvider;
     private final BookmarksButton mBookmarkButton;
@@ -46,16 +45,14 @@ public class BraveBrowsingModeBottomToolbarCoordinator
         if (BraveBottomToolbarVariationManager.isBraveVariation()) {
             mBookmarkButton.setVisibility(View.VISIBLE);
             getNewTabButtonParent().setVisibility(View.GONE);
-
-            // TODO(samartnik): add proper listener for bookmark button
-            // mBookmarkButtonListenerSupplierCallback = bookmarkButtonListener -> {
-            //     mBookmarkButton.setOnClickListener(bookmarkButtonListener);
-            // };
-            // // To avoid extensive patching we use shareButtonListenerSupplier for both
-            // // share and bookmark buttons. Thus we can't use them both simultaneously.
-            // mBookmarkButtonListenerSupplier = shareButtonListenerSupplier;
-            // mBookmarkButton.setActivityTabProvider(mBraveTabProvider);
-            // mBookmarkButtonListenerSupplier.addObserver(mBookmarkButtonListenerSupplierCallback);
+            OnClickListener bookmarkClickHandler = v -> {
+                TabImpl tab = (TabImpl) mBraveTabProvider.get();
+                if (tab == null || tab.getActivity() == null) {
+                    return;
+                }
+                tab.getActivity().addOrEditBookmark(tab);
+            };
+            mBookmarkButton.setOnClickListener(bookmarkClickHandler);
         }
         mMenuButton = mBraveToolbarRoot.findViewById(R.id.menu_button_wrapper);
         if (!BottomToolbarVariationManager.isMenuButtonOnBottom()) {
@@ -86,9 +83,6 @@ public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) {
     @Override
     public void destroy() {
         super.destroy();
-        if (mBookmarkButtonListenerSupplier != null) {
-            mBookmarkButtonListenerSupplier.removeObserver(mBookmarkButtonListenerSupplierCallback);
-        }
         mBookmarkButton.destroy();
         mMenuButton.destroy();
     }

From 837a2beac5d8df075a2db6a86b96e68de37bbcd1 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Tue, 5 May 2020 10:34:15 -0400
Subject: [PATCH 104/161] [Android] Fixed build error related to
 CanonicalCookie additional param

---
 .../android_webview/browser/cookie_manager.cc      |  2 +-
 .../weblayer/browser/cookie_manager_impl.cc        |  9 +++++++++
 .../weblayer-browser-cookie_manager_impl.cc.patch  | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 chromium_src/weblayer/browser/cookie_manager_impl.cc
 create mode 100644 patches/weblayer-browser-cookie_manager_impl.cc.patch

diff --git a/chromium_src/android_webview/browser/cookie_manager.cc b/chromium_src/android_webview/browser/cookie_manager.cc
index 1c6d2fd274d9..151eb63939d0 100644
--- a/chromium_src/android_webview/browser/cookie_manager.cc
+++ b/chromium_src/android_webview/browser/cookie_manager.cc
@@ -6,4 +6,4 @@
 #define BRAVE_SETCOOKIEHELPER true /*is_from_http*/
 
 #include "../../../../android_webview/browser/cookie_manager.cc"
-#undef BRAVE_SETCOOKIEFROMSTRING
+#undef BRAVE_SETCOOKIEHELPER
diff --git a/chromium_src/weblayer/browser/cookie_manager_impl.cc b/chromium_src/weblayer/browser/cookie_manager_impl.cc
new file mode 100644
index 000000000000..4dc0f8dd2c8a
--- /dev/null
+++ b/chromium_src/weblayer/browser/cookie_manager_impl.cc
@@ -0,0 +1,9 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#define BRAVE_SETCOOKIEINTERNAL true /*is_from_http*/,
+
+#include "../../../../weblayer/browser/cookie_manager_impl.cc"
+#undef BRAVE_SETCOOKIEINTERNAL
diff --git a/patches/weblayer-browser-cookie_manager_impl.cc.patch b/patches/weblayer-browser-cookie_manager_impl.cc.patch
new file mode 100644
index 000000000000..d9197f6f9eb3
--- /dev/null
+++ b/patches/weblayer-browser-cookie_manager_impl.cc.patch
@@ -0,0 +1,14 @@
+diff --git a/weblayer/browser/cookie_manager_impl.cc b/weblayer/browser/cookie_manager_impl.cc
+index 702bf23cc2b0e1bdd5b9de8c8ffb82b8e09ebf65..dd3d70373bdcddf5761e966986ec7c264c1fee76 100644
+--- a/weblayer/browser/cookie_manager_impl.cc
++++ b/weblayer/browser/cookie_manager_impl.cc
+@@ -139,7 +139,8 @@ void CookieManagerImpl::RemoveCookieChangedCallback(JNIEnv* env, int id) {
+ bool CookieManagerImpl::SetCookieInternal(const GURL& url,
+                                           const std::string& value,
+                                           SetCookieCallback callback) {
+-  auto cc = net::CanonicalCookie::Create(url, value, base::Time::Now(),
++  auto cc = net::CanonicalCookie::Create(BRAVE_SETCOOKIEINTERNAL
++                                         url, value, base::Time::Now(),
+                                          base::nullopt);
+   if (!cc) {
+     return false;

From cac474bee2d334681f28c0477a3d2234ed1fff58 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Tue, 5 May 2020 10:59:43 -0400
Subject: [PATCH 105/161] [Android] Fixed build error related to
 AddAndroidWidevine

---
 .../renderer/content_renderer_client_impl.cc  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 chromium_src/weblayer/renderer/content_renderer_client_impl.cc

diff --git a/chromium_src/weblayer/renderer/content_renderer_client_impl.cc b/chromium_src/weblayer/renderer/content_renderer_client_impl.cc
new file mode 100644
index 000000000000..cc41b4466764
--- /dev/null
+++ b/chromium_src/weblayer/renderer/content_renderer_client_impl.cc
@@ -0,0 +1,27 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#include <memory>
+#include <vector>
+
+#include "media/base/key_system_properties.h"
+#include "third_party/widevine/cdm/buildflags.h"
+
+// In components/cdm/renderer/android_key_systems.h the declaration of
+// AddAndroidWidevine is guarded by ENABLE_WIDEVINE, but in content_renderer_client_impl below
+// it is used without a guard. Instead of patching we can add an empty
+// definition of the same function here for when ENABLE_WIDEVINE is not true.
+
+#if !BUILDFLAG(ENABLE_WIDEVINE)
+namespace cdm {
+
+void AddAndroidWidevine(
+    std::vector<std::unique_ptr<media::KeySystemProperties>>*
+        concrete_key_systems) {}
+
+}  // namespace cdm
+#endif  // BUILDFLAG(ENABLE_WIDEVINE)
+
+#include "../../../../weblayer/renderer/content_renderer_client_impl.cc"

From 2054f1ee5b44a0bb31d8983572fba9cb8093e419 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Tue, 5 May 2020 12:56:26 -0400
Subject: [PATCH 106/161] [Android] Removed patch for favicon_source

---
 .../chrome/browser/ui/webui/favicon_source.cc | 48 ++++++++++++++++++-
 ...e-browser-ui-webui-favicon_source.cc.patch | 32 -------------
 2 files changed, 47 insertions(+), 33 deletions(-)
 delete mode 100644 patches/chrome-browser-ui-webui-favicon_source.cc.patch

diff --git a/chromium_src/chrome/browser/ui/webui/favicon_source.cc b/chromium_src/chrome/browser/ui/webui/favicon_source.cc
index b94c22ae6fe0..456b91bb258f 100644
--- a/chromium_src/chrome/browser/ui/webui/favicon_source.cc
+++ b/chromium_src/chrome/browser/ui/webui/favicon_source.cc
@@ -6,6 +6,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_ANDROID)
+#include "extensions/buildflags/buildflags.h"
 #include "ui/native_theme/native_theme.h"
 
 #define GetInstanceForNativeUi BraveGetInstanceForNativeUi
@@ -13,6 +14,51 @@
 #define IDR_DEFAULT_FAVICON_64 IDR_DEFAULT_FAVICON
 #define IDR_DEFAULT_FAVICON_DARK_32 IDR_DEFAULT_FAVICON_DARK
 #define IDR_DEFAULT_FAVICON_DARK_64 IDR_DEFAULT_FAVICON_DARK
-#endif
+#if !BUILDFLAG(ENABLE_EXTENSIONS)
+// Exclude extension headers to avoid build errors
+#define EXTENSIONS_BROWSER_EXTENSION_REGISTRY_H_
+#define EXTENSIONS_COMMON_CONSTANTS_H_
+#define EXTENSIONS_COMMON_MANIFEST_H_
+#include "chrome/browser/profiles/profile.h"
+#include "url/gurl.h"
+// Just dummy values to avoid build errors
+namespace {
+namespace extensions {
+class Manifest {
+ public:
+  enum Type { NUM_LOAD_TYPES };
+};
+class Extension {
+ public:
+  Manifest::Type GetType() const { return Manifest::Type::NUM_LOAD_TYPES; }
+};
+class UnusedClassB {
+ public:
+  UnusedClassB() {}
+  Extension* GetExtensionOrAppByURL(const GURL& url) { return nullptr; }
+};
+class UnusedClassA {
+ public:
+  UnusedClassA() {}
+  UnusedClassB enabled_extensions() { return UnusedClassB(); }
+};
+class ExtensionRegistry {
+ public:
+  static std::unique_ptr<UnusedClassA> Get(Profile* profile) {
+    return std::make_unique<UnusedClassA>();
+  }
+};
+}  // namespace extensions
+}  // namespace
+#endif  // #if !BUILDFLAG(ENABLE_EXTENSIONS)
+#endif  // #if defined(OS_ANDROID)
 
 #include "../../../../../chrome/browser/ui/webui/favicon_source.cc"  // NOLINT
+
+#if defined(OS_ANDROID)
+#if !BUILDFLAG(ENABLE_EXTENSIONS)
+#undef EXTENSIONS_BROWSER_EXTENSION_REGISTRY_H_
+#undef EXTENSIONS_COMMON_CONSTANTS_H_
+#undef EXTENSIONS_COMMON_MANIFEST_H_
+#endif  // #if !BUILDFLAG(ENABLE_EXTENSIONS)
+#endif  // #if defined(OS_ANDROID)
diff --git a/patches/chrome-browser-ui-webui-favicon_source.cc.patch b/patches/chrome-browser-ui-webui-favicon_source.cc.patch
deleted file mode 100644
index f2ebc8eb3f29..000000000000
--- a/patches/chrome-browser-ui-webui-favicon_source.cc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
-index 17eca9e53f03a55ecf4f5233b0a4dc85e73ed1b9..05cbc0f56744cdb8d5fc709e5e636a5608626b6e 100644
---- a/chrome/browser/ui/webui/favicon_source.cc
-+++ b/chrome/browser/ui/webui/favicon_source.cc
-@@ -23,9 +23,11 @@
- #include "components/history/core/browser/top_sites.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/web_contents.h"
-+#if !defined(OS_ANDROID)
- #include "extensions/browser/extension_registry.h"
- #include "extensions/common/constants.h"
- #include "extensions/common/manifest.h"
-+#endif
- #include "net/url_request/url_request.h"
- #include "third_party/skia/include/core/SkBitmap.h"
- #include "ui/base/layout.h"
-@@ -109,6 +111,7 @@ void FaviconSource::StartDataRequest(
-     return;
-   }
- 
-+#if !defined(OS_ANDROID)
-   if (url_format_ == chrome::FaviconUrlFormat::kFaviconLegacy) {
-     const extensions::Extension* extension =
-         extensions::ExtensionRegistry::Get(profile_)
-@@ -120,6 +123,7 @@ void FaviconSource::StartDataRequest(
-                                     extensions::Manifest::NUM_LOAD_TYPES);
-     }
-   }
-+#endif
- 
-   int desired_size_in_pixel =
-       std::ceil(parsed.size_in_dip * parsed.device_scale_factor);

From 50779e88d44a9391b7bb2c215d7a5e86825d33bc Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Tue, 5 May 2020 14:15:52 -0400
Subject: [PATCH 107/161] [Android] Fixed build for brave_unit_tests

---
 test/BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/BUILD.gn b/test/BUILD.gn
index 334b00883c64..4bbfd501265e 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -247,7 +247,7 @@ test("brave_unit_tests") {
       "//brave:brave_pak_assets",
       "//chrome:chrome_android_core",
       "//chrome/android:chrome_apk_paks",
-      "//chrome/android:chrome_test_java",
+      "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
       "//v8:v8_external_startup_data_assets",
     ]
     data += [

From c782e5da7a2223e5cf5563778345930ceff003d0 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Tue, 5 May 2020 15:14:32 -0400
Subject: [PATCH 108/161] [Android] Removed obsolete proguard rule

---
 android/java/proguard.flags | 2 --
 1 file changed, 2 deletions(-)

diff --git a/android/java/proguard.flags b/android/java/proguard.flags
index 4440300382db..7f7c47fd8aea 100644
--- a/android/java/proguard.flags
+++ b/android/java/proguard.flags
@@ -9,5 +9,3 @@
     <methods>;
 }
 -keepattributes JavascriptInterface
-
--keep class android.support.design.widget.BottomSheetBehavior { *; }

From 632bdceb9fb5ce841d5a93ce23bd678f0d456303 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Tue, 5 May 2020 15:51:12 -0400
Subject: [PATCH 109/161] [Android] Fixed crashes related to renaming

---
 .../java/res/xml/appearance_preferences.xml    |  4 ++--
 .../res/xml/background_images_preferences.xml  |  4 ++--
 .../background_video_playback_preference.xml   |  2 +-
 .../java/res/xml/brave_license_preferences.xml |  2 +-
 .../java/res/xml/brave_main_preferences.xml    | 18 +++++++++---------
 .../java/res/xml/brave_privacy_preferences.xml | 10 +++++-----
 .../java/res/xml/brave_rewards_preferences.xml |  2 +-
 .../clear_browsing_data_preferences_tab.xml    | 16 ++++++++--------
 ...losing_all_tabs_closes_brave_preference.xml |  2 +-
 .../java/res/xml/desktop_mode_preferences.xml  |  2 +-
 android/java/res/xml/developer_preferences.xml |  4 ++--
 .../play_yt_video_in_browser_preferences.xml   |  2 +-
 android/java/res/xml/qa_preferences.xml        |  6 +++---
 .../xml/use_custom_tabs_brave_preference.xml   |  2 +-
 14 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/android/java/res/xml/appearance_preferences.xml b/android/java/res/xml/appearance_preferences.xml
index 5630a60993e3..4f82c364518d 100644
--- a/android/java/res/xml/appearance_preferences.xml
+++ b/android/java/res/xml/appearance_preferences.xml
@@ -5,13 +5,13 @@
      You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
       android:key="hide_brave_rewards_icon"
       android:title="@string/hide_brave_rewards_icon_title"
       android:summaryOn="@string/hide_brave_rewards_icon_description"
       android:summaryOff="@string/hide_brave_rewards_icon_description" />
 
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="brave_bottom_toolbar_enabled_key"
         android:title="@string/bottom_toolbar_enable"
         android:summaryOn="@string/text_on"
diff --git a/android/java/res/xml/background_images_preferences.xml b/android/java/res/xml/background_images_preferences.xml
index b10cc8dcbd1a..d0b50abebb72 100644
--- a/android/java/res/xml/background_images_preferences.xml
+++ b/android/java/res/xml/background_images_preferences.xml
@@ -7,13 +7,13 @@
 <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto" >
 
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="show_background_images"
         android:title="@string/show_background_images"
         android:summaryOn="@string/text_on"
         android:summaryOff="@string/text_off" />
 
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="show_sponsored_images"
         android:title="@string/show_sponsored_images"
         android:summaryOn="@string/text_on"
diff --git a/android/java/res/xml/background_video_playback_preference.xml b/android/java/res/xml/background_video_playback_preference.xml
index 457cdd7acbca..030b2dbb59d1 100644
--- a/android/java/res/xml/background_video_playback_preference.xml
+++ b/android/java/res/xml/background_video_playback_preference.xml
@@ -6,7 +6,7 @@
 
 <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="background_video_playback"
         android:title="@string/prefs_background_video_playback"
         android:summaryOn="@string/prefs_background_video_playback_on"
diff --git a/android/java/res/xml/brave_license_preferences.xml b/android/java/res/xml/brave_license_preferences.xml
index 8d4dd4e0bbc7..48bfbfe4a48f 100644
--- a/android/java/res/xml/brave_license_preferences.xml
+++ b/android/java/res/xml/brave_license_preferences.xml
@@ -8,6 +8,6 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <org.chromium.chrome.browser.settings.TextMessagePreference
+    <org.chromium.components.browser_ui.settings.TextMessagePreference
         android:key="brave_license_text" />
 </PreferenceScreen>
diff --git a/android/java/res/xml/brave_main_preferences.xml b/android/java/res/xml/brave_main_preferences.xml
index 9df173260b38..8216b65981d9 100644
--- a/android/java/res/xml/brave_main_preferences.xml
+++ b/android/java/res/xml/brave_main_preferences.xml
@@ -11,12 +11,12 @@
         android:key="search_engine_section"
         android:order="0"
         android:title="@string/prefs_section_search_engine"/>
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.settings.BraveStandardSearchEnginePreference"
         android:key="standard_search_engine"
         android:order="1"
         android:title="@string/prefs_standard_search_engine"/>
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.settings.BravePrivateSearchEnginePreference"
         android:key="private_search_engine"
         android:order="2"
@@ -29,12 +29,12 @@
         android:key="display_section"
         android:order="12"
         android:title="@string/prefs_section_display"/>
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.settings.AppearancePreferences"
         android:key="appearance"
         android:order="13"
         android:title="@string/prefs_appearance"/>
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.settings.BackgroundImagesPreferences"
         android:key="backgroud_images"
         android:order="14"
@@ -47,27 +47,27 @@
         android:key="controls_section"
         android:order="16"
         android:title="@string/prefs_section_controls"/>
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.settings.BackgroundVideoPlaybackPreference"
         android:key="background_video_playback"
         android:order="17"
         android:title="@string/prefs_background_video_playback"/>
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.settings.ClosingAllTabsClosesBravePreference"
         android:key="closing_all_tabs_closes_brave"
         android:order="18"
         android:title="@string/prefs_closing_all_tabs_closes_brave"/>
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.settings.BraveCustomTabsPreference"
         android:key="use_custom_tabs"
         android:order="18"
         android:title="@string/prefs_use_custom_tabs"/>
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.settings.BraveRewardsPreferences"
         android:key="brave_rewards"
         android:order="19"
         android:title="@string/brave_ui_brave_rewards"/>
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.settings.BraveSyncScreensPreference"
         android:key="brave_sync_layout"
         android:order="20"
diff --git a/android/java/res/xml/brave_privacy_preferences.xml b/android/java/res/xml/brave_privacy_preferences.xml
index cf4d09ff27b8..2052d45161b5 100644
--- a/android/java/res/xml/brave_privacy_preferences.xml
+++ b/android/java/res/xml/brave_privacy_preferences.xml
@@ -7,27 +7,27 @@
 <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
+    <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
         android:key="close_tabs_on_exit"
         android:title="@string/close_tabs_on_exit_title"
         android:summary="@string/close_tabs_on_exit_summary"
         android:defaultValue="false" />
-    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
+    <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
         android:key="httpse"
         android:title="@string/httpse_title"
         android:summary="@string/httpse_summary"
         android:defaultValue="true" />
-    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
+    <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
         android:key="ad_block"
         android:title="@string/ad_block_title"
         android:summary="@string/ad_block_summary"
         android:defaultValue="true" />
-    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
+    <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
         android:key="fingerprinting_protection"
         android:title="@string/fingerprinting_protection_title"
         android:summary="@string/fingerprinting_protection_summary"
         android:defaultValue="true" />
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="search_suggestions"
         android:title="@string/autocomplete_searches_and_urls_title"
         android:summary="@string/autocomplete_searches_and_urls_summary"
diff --git a/android/java/res/xml/brave_rewards_preferences.xml b/android/java/res/xml/brave_rewards_preferences.xml
index 90e9338de13f..de845232ed99 100644
--- a/android/java/res/xml/brave_rewards_preferences.xml
+++ b/android/java/res/xml/brave_rewards_preferences.xml
@@ -7,7 +7,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto" >
 
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="ads_switch"
         android:title="@string/show_ads_when_brave_is_not_in_use"
         android:summaryOn="@string/text_on"
diff --git a/android/java/res/xml/clear_browsing_data_preferences_tab.xml b/android/java/res/xml/clear_browsing_data_preferences_tab.xml
index f9db196f100e..b6dee4403908 100644
--- a/android/java/res/xml/clear_browsing_data_preferences_tab.xml
+++ b/android/java/res/xml/clear_browsing_data_preferences_tab.xml
@@ -8,47 +8,47 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <org.chromium.chrome.browser.settings.SpinnerPreference
+    <org.chromium.components.browser_ui.settings.SpinnerPreference
         android:key="time_period_spinner"
         android:persistent="false"
         android:title="@string/clear_browsing_data_tab_period_title"
         app:singleLine="true" />
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_history_checkbox"
         android:persistent="false"
         android:title="@string/clear_history_title"
         android:summary="@string/clear_browsing_history_summary" />
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_cookies_checkbox"
         android:persistent="false"
         android:title="@string/clear_cookies_and_site_data_title"
         android:summary="@string/clear_cookies_and_site_data_summary_basic" />
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_cache_checkbox"
         android:persistent="false"
         android:title="@string/clear_cache_title" />
 
     <!-- TODO(samartnik): disabling option as it requires futher research
          At the moment causes issue https://github.com/brave/brave-browser/issues/8737 -->
-    <!-- <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <!-- <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_downloads_checkbox"
         android:persistent="false"
         android:title="@string/clear_downloads_title" /> -->
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_passwords_checkbox"
         android:persistent="false"
         android:title="@string/clear_passwords_title" />
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_form_data_checkbox"
         android:persistent="false"
         android:title="@string/clear_form_data_title" />
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_site_settings_checkbox"
         android:persistent="false"
         android:title="@string/prefs_site_settings" />
diff --git a/android/java/res/xml/closing_all_tabs_closes_brave_preference.xml b/android/java/res/xml/closing_all_tabs_closes_brave_preference.xml
index 95812bc7519b..82dc16476aba 100644
--- a/android/java/res/xml/closing_all_tabs_closes_brave_preference.xml
+++ b/android/java/res/xml/closing_all_tabs_closes_brave_preference.xml
@@ -6,7 +6,7 @@
 
 <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="closing_all_tabs_closes_brave"
         android:title="@string/prefs_closing_all_tabs_closes_brave"
         android:summaryOn="@string/text_on"
diff --git a/android/java/res/xml/desktop_mode_preferences.xml b/android/java/res/xml/desktop_mode_preferences.xml
index 4a25924a2ceb..cb3bcaf4b93f 100644
--- a/android/java/res/xml/desktop_mode_preferences.xml
+++ b/android/java/res/xml/desktop_mode_preferences.xml
@@ -6,7 +6,7 @@
 
 <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="desktop_mode"
         android:title="@string/settings_desktop_mode_title"
         android:summaryOn="@string/settings_desktop_mode_on"
diff --git a/android/java/res/xml/developer_preferences.xml b/android/java/res/xml/developer_preferences.xml
index 3f5b054d53a5..3c8e8e7d3136 100644
--- a/android/java/res/xml/developer_preferences.xml
+++ b/android/java/res/xml/developer_preferences.xml
@@ -9,10 +9,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orderingFromXml="true">
     <Preference
-        android:fragment="org.chromium.chrome.browser.settings.developer.TracingSettings"
+        android:fragment="org.chromium.chrome.browser.tracing.settings.TracingSettings"
         android:key="tracing"
         android:title="Tracing" />
-    <org.chromium.chrome.browser.settings.TextMessagePreference
+    <org.chromium.components.browser_ui.settings.TextMessagePreference
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:enabled="false"
diff --git a/android/java/res/xml/play_yt_video_in_browser_preferences.xml b/android/java/res/xml/play_yt_video_in_browser_preferences.xml
index 30a905839e5c..90e14e51c207 100644
--- a/android/java/res/xml/play_yt_video_in_browser_preferences.xml
+++ b/android/java/res/xml/play_yt_video_in_browser_preferences.xml
@@ -6,7 +6,7 @@
 
 <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="play_yt_video_in_browser"
         android:title="@string/settings_play_yt_video_in_browser_title"
         android:summaryOn="@string/settings_play_yt_video_in_browser_on"
diff --git a/android/java/res/xml/qa_preferences.xml b/android/java/res/xml/qa_preferences.xml
index 1a14ffba8f81..2bae6d7c8c94 100644
--- a/android/java/res/xml/qa_preferences.xml
+++ b/android/java/res/xml/qa_preferences.xml
@@ -7,20 +7,20 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:orderingFromXml="true">
 
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="use_rewards_staging_server"
         android:title="Use Rewards staging server"
         android:summaryOn="@string/text_on"
         android:summaryOff="@string/text_off" />
 
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="qa_maximize_initial_ads_number"
         android:title="Maximize initial ads number"
         android:summaryOn="@string/text_on"
         android:summaryOff="@string/text_off"
         android:defaultValue="true" />
 
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="qa_debug_ntp"
         android:title="Enable debugging NTP"
         android:summaryOn="@string/text_on"
diff --git a/android/java/res/xml/use_custom_tabs_brave_preference.xml b/android/java/res/xml/use_custom_tabs_brave_preference.xml
index 295bf47a9164..64284c227203 100644
--- a/android/java/res/xml/use_custom_tabs_brave_preference.xml
+++ b/android/java/res/xml/use_custom_tabs_brave_preference.xml
@@ -6,7 +6,7 @@
 
 <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="use_custom_tabs"
         android:title="@string/prefs_use_custom_tabs"
         android:summaryOn="@string/text_on"

From bb62a7dd774a7d1d40678dd4a7b54afc3f7f5f89 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Wed, 6 May 2020 16:46:53 -0400
Subject: [PATCH 110/161] [Android] Fixed build for brave_public_test_apk

---
 android/javatests/AndroidManifest.xml | 13 +++++++++++++
 test/BUILD.gn                         |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 android/javatests/AndroidManifest.xml

diff --git a/android/javatests/AndroidManifest.xml b/android/javatests/AndroidManifest.xml
new file mode 100644
index 000000000000..ea18b0df5b19
--- /dev/null
+++ b/android/javatests/AndroidManifest.xml
@@ -0,0 +1,13 @@
+{% extends "chrome/android/java/AndroidManifest.xml" %}
+
+# Copyright 2020 The Brave Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{% block application_label %}BravePublicTest{% endblock %}
+
+{% block extra_root_definitions %}
+    <instrumentation android:name="org.chromium.base.test.BaseChromiumAndroidJUnitRunner"
+        android:targetPackage="{{manifest_package}}"
+        android:label="Tests for {{manifest_package}}"/>
+{% endblock %}
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 4bbfd501265e..87c5ef05ea63 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -811,7 +811,7 @@ if (is_android) {
       "$root_gen_dir/brave_public_test_apk_manifest/AndroidManifest.xml"
 
   jinja_template("brave_public_test_apk_manifest") {
-    input = "//chrome/android/javatests/AndroidManifest.xml"
+    input = "//brave/android/javatests/AndroidManifest.xml"
     includes = [ "//chrome/android/java/AndroidManifest.xml" ]
     output = brave_public_test_apk_manifest
     variables = default_chrome_public_jinja_variables

From 9fa54329a9dddfbc3afafac411dfaabbbbee1af5 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Wed, 6 May 2020 17:06:12 -0400
Subject: [PATCH 111/161] [Android] Fixed java unit tests

---
 android/java/apk_for_test.flags                             | 6 +++++-
 .../javatests/org/chromium/chrome/browser/BytecodeTest.java | 4 ++--
 .../BraveExternalNavigationHandlerClassAdapter.java         | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
index 117da464fb16..07e284cc5016 100644
--- a/android/java/apk_for_test.flags
+++ b/android/java/apk_for_test.flags
@@ -23,10 +23,14 @@
     *** createBookmarkItem(...);
 }
 
--keep class org.chromium.chrome.browser.externalnav.ExternalNavigationHandler {
+-keep class org.chromium.components.external_intents.ExternalNavigationHandler {
     *** clobberCurrentTabWithFallbackUrl(...);
 }
 
 -keep class org.chromium.chrome.browser.LaunchIntentDispatcher {
     *** isCustomTabIntent(...);
 }
+
+-keep class org.chromium.chrome.browser.homepage.HomepageManager {
+    *** shouldCloseAppWithZeroTabs(...);
+}
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
index 39e7991fc498..e0481cc105cf 100644
--- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -29,7 +29,7 @@ public void testClassesExist() throws Exception {
         Assert.assertTrue(classExists("org/chromium/chrome/browser/settings/MainSettings"));
         Assert.assertTrue(classExists("org/chromium/components/sync/AndroidSyncSettings"));
         Assert.assertTrue(classExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge"));
-        Assert.assertTrue(classExists("org/chromium/chrome/browser/externalnav/ExternalNavigationHandler"));
+        Assert.assertTrue(classExists("org/chromium/components/external_intents/ExternalNavigationHandler"));
         Assert.assertTrue(classExists("org/chromium/chrome/browser/LaunchIntentDispatcher"));
     }
 
@@ -44,7 +44,7 @@ public void testMethodsExist() throws Exception {
         Assert.assertTrue(
                 methodExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge", "extensiveBookmarkChangesEnded"));
         Assert.assertTrue(methodExists("org/chromium/chrome/browser/bookmarks/BookmarkBridge", "createBookmarkItem"));
-        Assert.assertTrue(methodExists("org/chromium/chrome/browser/externalnav/ExternalNavigationHandler",
+        Assert.assertTrue(methodExists("org/chromium/components/external_intents/ExternalNavigationHandler",
                 "clobberCurrentTabWithFallbackUrl"));
         Assert.assertTrue(methodExists("org/chromium/chrome/browser/LaunchIntentDispatcher", "isCustomTabIntent"));
         Assert.assertTrue(methodExists("org/chromium/chrome/browser/homepage/HomepageManager", "shouldCloseAppWithZeroTabs"));
diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveExternalNavigationHandlerClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveExternalNavigationHandlerClassAdapter.java
index d29a623130b6..0fe3bef09ba0 100644
--- a/build/android/bytecode/java/org/brave/bytecode/BraveExternalNavigationHandlerClassAdapter.java
+++ b/build/android/bytecode/java/org/brave/bytecode/BraveExternalNavigationHandlerClassAdapter.java
@@ -13,7 +13,7 @@ public class BraveExternalNavigationHandlerClassAdapter extends BraveClassVisito
             "org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler";
 
     static String sExternalNavigationHandlerClassName =
-            "org/chromium/chrome/browser/externalnav/ExternalNavigationHandler";
+            "org/chromium/components/external_intents/ExternalNavigationHandler";
 
     static String sMethodClobberCurrentTabWithFallbackUrl =
             "clobberCurrentTabWithFallbackUrl";

From 7ce2631d20648a1b2bf60b1c6bbc3e6838a381b0 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 6 May 2020 17:33:37 -0400
Subject: [PATCH 112/161] OnThemeChanged must call parent implementation.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/7f31c1d3cb9da031f1c13f0eb9b2b328136c3750

commit 7f31c1d3cb9da031f1c13f0eb9b2b328136c3750
Author: Tom Anderson <thomasanderson@chromium.org>
Date:   Wed Mar 11 01:14:30 2020 +0000

    Add DCHECK to ensure OnThemeChanged() overrides call their parents

    A very commonly recurring bug is forgetting to call
    ParentClass::OnThemeChanged() in DerivedClass::OnThemeChanged().  This
    CL adds a DCHECK that attempts to address this issue.

    In the process, many missing OnThemeChanged() calls were discovered.
    It's probable that some of these may cause unexpected colors in
    certain UI that was relying on the hardcoded default colors.

    BUG=None
---
 .../infobars/brave_wayback_machine_infobar_contents_view.cc      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc b/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc
index c64b703beff3..b58a8de04d8e 100644
--- a/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc
+++ b/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc
@@ -67,6 +67,7 @@ BraveWaybackMachineInfoBarContentsView::
 ~BraveWaybackMachineInfoBarContentsView() {}
 
 void BraveWaybackMachineInfoBarContentsView::OnThemeChanged() {
+  views::View::OnThemeChanged();
   const SkColor background_color = GetColor(kInfoBarLabelBackgroundColor);
   const SkColor text_color = GetColor(kInfoBarLabelTextColor);
   for (auto* label : labels_) {

From 70a074498d557304b93bd9af126825d28082f0b8 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 6 May 2020 18:06:00 -0400
Subject: [PATCH 113/161] [Browser tests] Fixes hover card test.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/49bf6e021eb90a3486d2b1ccac933a071b755b8a

commit 49bf6e021eb90a3486d2b1ccac933a071b755b8a
Author: Bret Sepulveda <bsep@chromium.org>
Date:   Mon Feb 17 15:17:39 2020 +0000

    Prevent mouse events from triggering hover cards in browser tests.

    If the mouse happens to be in exactly the wrong position it triggers a
    hover card, which can cause strange failures in some tests, especially
    on bots where the mouse can cause the test to fail repeatedly until it
    happens to be moved. To fix this, this patch prevents
    Tab::OnMouseEntered from triggering hover cards when running an
    InProcessBrowserTest. Also changes hover card browser tests to call
    TabStrip::UpdateHoverCard instead of Tab::OnMouseEntered to get around
    that method now being disabled, and does some light refactoring.

    Bug: 1050012
---
 .../tab_hover_card_bubble_view_browsertest.cc | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc
index 09ca16122e68..314c710bf74c 100644
--- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc
+++ b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc
@@ -76,23 +76,18 @@ class TabHoverCardBubbleViewBrowserTest : public DialogBrowserTest {
     return hover_card->domain_label_->GetText();
   }
 
-  void HoverMouseOverTabAt(int index) {
-    TabStrip* tab_strip =
-        BrowserView::GetBrowserViewForBrowser(browser())->tabstrip();
-    Tab* tab = tab_strip->tab_at(index);
-    ui::MouseEvent hover_event(ui::ET_MOUSE_ENTERED, gfx::Point(), gfx::Point(),
-                               base::TimeTicks(), ui::EF_NONE, 0);
-    tab->OnMouseEntered(hover_event);
+  void HoverMouseOverTabAt(TabStrip* tab_strip, int index) {
+    // We don't use Tab::OnMouseEntered here to invoke the hover card because
+    // that path is disabled in browser tests. If we enabled it, the real mouse
+    // might interfere with the test.
+    tab_strip->UpdateHoverCard(tab_strip->tab_at(index));
   }
 
   // DialogBrowserTest:
   void ShowUi(const std::string& name) override {
     TabStrip* tab_strip =
         BrowserView::GetBrowserViewForBrowser(browser())->tabstrip();
-    Tab* tab = tab_strip->tab_at(0);
-    ui::MouseEvent hover_event(ui::ET_MOUSE_ENTERED, gfx::Point(), gfx::Point(),
-                               base::TimeTicks(), ui::EF_NONE, 0);
-    tab->OnMouseEntered(hover_event);
+    HoverMouseOverTabAt(tab_strip, 0);
     TabHoverCardBubbleView* hover_card = GetHoverCard(tab_strip);
     Widget* widget = GetHoverCardWidget(hover_card);
     HoverCardVisibleWaiter waiter(widget);
@@ -130,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(TabHoverCardBubbleViewBrowserTest,
   Widget* widget = GetHoverCardWidget(hover_card);
   EXPECT_TRUE(widget != nullptr);
   EXPECT_TRUE(widget->IsVisible());
-  HoverMouseOverTabAt(1);
+  HoverMouseOverTabAt(tab_strip, 1);
   EXPECT_EQ(GetHoverCardTitle(hover_card),
             base::UTF8ToUTF16("Settings - Addresses and more"));
   EXPECT_EQ(GetHoverCardDomain(hover_card),

From 526dcc6bfbc56d95710222f65425c459669ea2ad Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 6 May 2020 18:45:58 -0400
Subject: [PATCH 114/161] Upgrade patches from Chromium 83.0.4103.34 to
 Chromium 83.0.4103.44.

---
 patches/chrome-VERSION.patch                                  | 4 ++--
 patches/chrome-android-BUILD.gn.patch                         | 2 +-
 ...modules-canvas-canvas2d-base_rendering_context_2d.cc.patch | 2 +-
 patches/tools-licenses.py.patch                               | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index 3e1b6f8844ec..832c3526d660 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index e3da50bf97ece26c3801e37b6c30aa0d0caf49b6..9ce40941eb9f4c12af1e4d9391a4c479e473f31d 100644
+index 0a529909cfa4a99e606604cda02e4b9652dfc23b..07878a76f30272f543bc3710d4392b406590b20d 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=83
 -MINOR=0
 -BUILD=4103
--PATCH=34
+-PATCH=44
 +MINOR=1
 +BUILD=11
 +PATCH=28
diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch
index 8d1c86c38317..86375e319800 100644
--- a/patches/chrome-android-BUILD.gn.patch
+++ b/patches/chrome-android-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index de0b8bbe9c6751033b6ddac36a4e25f94c0937b4..4c342d150fec037f822dba3d456a5cbfaa8b689e 100644
+index 38fbea8a47e4298c5f2ca8bb79d684ffd51f35bc..679d43f831d758af2a9b1a54ca20b1de57c60caa 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -196,6 +196,7 @@ android_resources("chrome_app_java_resources") {
diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
index 4afe87947e27..a24c4de267f3 100644
--- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
+++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-index 074bb39bb45d850993022204081d3b3e06ad64e7..dddcd8880782b903759613222ff19957228e9011 100644
+index 5afdc0bb0211c3d6fdcfd8b606065ba3ffc6a549..96b1c992b859612d511e05bbfd1c9fcc05d24e43 100644
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
 @@ -1550,6 +1550,7 @@ ImageData* BaseRenderingContext2D::createImageData(
diff --git a/patches/tools-licenses.py.patch b/patches/tools-licenses.py.patch
index 9ca6c855aafd..aea7e35ad2ae 100644
--- a/patches/tools-licenses.py.patch
+++ b/patches/tools-licenses.py.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/licenses.py b/tools/licenses.py
-index b61ee97f416f564f8324bbca90bd9d9c8a67f6fa..8752a6438ab7e84cdfe59b6c8b1b6a4f8c84ef55 100755
+index b61ee97f416f564f8324bbca90bd9d9c8a67f6fa..5c1d4eb2447c275233ec0ec12036a103d5691808 100755
 --- a/tools/licenses.py
 +++ b/tools/licenses.py
 @@ -35,6 +35,7 @@ else:
@@ -28,7 +28,7 @@ index b61ee97f416f564f8324bbca90bd9d9c8a67f6fa..8752a6438ab7e84cdfe59b6c8b1b6a4f
              # Add all subdirectories that are not marked for skipping.
              for dir in dirs:
                  dirpath = os.path.join(path, dir)
-@@ -663,7 +666,8 @@ def GenerateCredits(
+@@ -664,7 +667,8 @@ def GenerateCredits(
      for path in third_party_dirs:
          try:
              metadata = ParseDir(path, _REPOSITORY_ROOT)

From e4ecf7a72cd0457bdd95dae1fe5db718741ec1ab Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Thu, 7 May 2020 11:20:59 -0400
Subject: [PATCH 115/161] [Android] Fix for brave unit tests

---
 test/BUILD.gn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/BUILD.gn b/test/BUILD.gn
index 87c5ef05ea63..b14529282f3e 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -247,6 +247,7 @@ test("brave_unit_tests") {
       "//brave:brave_pak_assets",
       "//chrome:chrome_android_core",
       "//chrome/android:chrome_apk_paks",
+      "//chrome/test/android:chrome_java_test_support",
       "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
       "//v8:v8_external_startup_data_assets",
     ]

From d668b0a7dae95337d229f53c710f56321a403418 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Thu, 7 May 2020 14:21:46 -0400
Subject: [PATCH 116/161] [Android] Fix for dark mode colors

---
 android/brave_java_resources.gni                              | 1 +
 android/java/{res_night => res}/values-night/brave_colors.xml | 0
 2 files changed, 1 insertion(+)
 rename android/java/{res_night => res}/values-night/brave_colors.xml (100%)

diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni
index 2c226294969b..d2feb13d9e5c 100644
--- a/android/brave_java_resources.gni
+++ b/android/brave_java_resources.gni
@@ -661,6 +661,7 @@ brave_java_resources = [
   "java/res/values-h748dp/dimens.xml",
   "java/res/values-h765dp/dimens.xml",
   "java/res/values-h820dp/dimens.xml",
+  "java/res/values-night/brave_colors.xml",
   "java/res/values-v21/brave_styles.xml",
   "java/res/xml/brave_main_preferences.xml",
   "java/res/xml/background_video_playback_preference.xml",
diff --git a/android/java/res_night/values-night/brave_colors.xml b/android/java/res/values-night/brave_colors.xml
similarity index 100%
rename from android/java/res_night/values-night/brave_colors.xml
rename to android/java/res/values-night/brave_colors.xml

From 117e50c71f4043802ddcf1f1aaf01fa9963620de Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 7 May 2020 16:11:54 -0400
Subject: [PATCH 117/161] Copy redirect-cc.py into output folder on Windows.

This is done to shorten the command line.
---
 script/redirect-cc.cmd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/redirect-cc.cmd b/script/redirect-cc.cmd
index 5f3422177f65..486fd51925a1 100644
--- a/script/redirect-cc.cmd
+++ b/script/redirect-cc.cmd
@@ -1,2 +1,3 @@
 @ECHO OFF
-python ..\..\brave\script\redirect-cc.py %*
+XCOPY /D /Y /Q "..\..\brave\script\redirect-cc.py" "%CD%/redirect.*" 1>nul
+python redirect.py %*

From dc9f81d88d5b7200e41c6f5284656f9863c4ce57 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 8 May 2020 15:58:46 -0400
Subject: [PATCH 118/161] Fixes vertical text alignment in rewards button.

---
 .../brave_rewards/resources/ui/components/rewardsButton/style.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/brave_rewards/resources/ui/components/rewardsButton/style.ts b/components/brave_rewards/resources/ui/components/rewardsButton/style.ts
index f9230a35b5cc..8a5e06c59ada 100644
--- a/components/brave_rewards/resources/ui/components/rewardsButton/style.ts
+++ b/components/brave_rewards/resources/ui/components/rewardsButton/style.ts
@@ -65,6 +65,7 @@ export const StyledButtonWrapper = styled<StyleProps, 'button'>('button')`
   border-radius: 28px;
   background: inherit;
   border: none;
+  align-items: center;
   cursor: ${p => p.disabled ? 'default' : 'pointer'};
   ${p => getTypeStyle(p.type, p.disabled)}
 

From 858b71d179159eea85652bc0ec2783a01832cfa6 Mon Sep 17 00:00:00 2001
From: Pete Miller <miller.pete@gmail.com>
Date: Fri, 8 May 2020 16:40:33 -0700
Subject: [PATCH 119/161] Settings WebUI gains ES Module / polymer3 compile

Ensures compatibility with c83 optimized compile
---
 browser/resources/settings/BUILD.gn           |  19 ++
 .../settings/brave_appearance_page/BUILD.gn   | 181 ++++++++++++++++++
 .../brave_appearance_browser_proxy.js         |   1 +
 .../brave_appearance_page/brave_theme.html    |  33 ++++
 .../brave_appearance_page/brave_theme.js      |  75 ++++++++
 ...pearance_page.html => super_referral.html} |  66 +------
 ...e_appearance_page.js => super_referral.js} |  86 +--------
 .../brave_appearance_page/toolbar.html        |  37 ++++
 .../settings/brave_appearance_page/toolbar.js |  16 ++
 .../settings/brave_privacy_page/BUILD.gn      |  35 ++++
 .../brave_privacy_page_browser_proxy.js       |   1 +
 .../settings/brave_settings_overrides.html    |   1 +
 .../default_brave_shields_page/BUILD.gn       | 101 ++++++++++
 .../default_brave_shields_browser_proxy.js    |   1 +
 .../resources/settings/settings_resources.grd |  13 +-
 .../settings/settings_resources_v3.grdp       |  54 ++++++
 .../settings/social_blocking_page/BUILD.gn    |  36 ++++
 .../social_blocking_browser_proxy.js          |   1 +
 ...-browser-resources-settings-BUILD.gn.patch |  10 +-
 ...appearance_page-appearance_page.html.patch |  13 +-
 20 files changed, 625 insertions(+), 155 deletions(-)
 create mode 100644 browser/resources/settings/brave_appearance_page/BUILD.gn
 create mode 100644 browser/resources/settings/brave_appearance_page/brave_theme.html
 create mode 100644 browser/resources/settings/brave_appearance_page/brave_theme.js
 rename browser/resources/settings/brave_appearance_page/{brave_appearance_page.html => super_referral.html} (51%)
 rename browser/resources/settings/brave_appearance_page/{brave_appearance_page.js => super_referral.js} (75%)
 create mode 100644 browser/resources/settings/brave_appearance_page/toolbar.html
 create mode 100644 browser/resources/settings/brave_appearance_page/toolbar.js
 create mode 100644 browser/resources/settings/brave_privacy_page/BUILD.gn
 create mode 100644 browser/resources/settings/default_brave_shields_page/BUILD.gn
 create mode 100644 browser/resources/settings/settings_resources_v3.grdp
 create mode 100644 browser/resources/settings/social_blocking_page/BUILD.gn

diff --git a/browser/resources/settings/BUILD.gn b/browser/resources/settings/BUILD.gn
index 6963c91b82bb..d4a81764db2a 100644
--- a/browser/resources/settings/BUILD.gn
+++ b/browser/resources/settings/BUILD.gn
@@ -8,6 +8,12 @@ import("//tools/grit/grit_rule.gni")
 grit("resources") {
   source = "settings_resources.grd"
 
+  grit_flags = [
+    "-E",
+    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+  ]
+
+  deps = [ ":polymer3_elements" ]
   defines = [
     "is_release_channel=$is_release_channel",
     "enable_tor=$enable_tor",
@@ -60,3 +66,16 @@ if (optimize_webui) {
     ]
   }
 }
+
+group("polymer3_elements") {
+  public_deps = [
+    # Sub-folder targets
+    "brave_appearance_page:polymer3_elements",
+    "brave_privacy_page:polymer3_elements",
+    "default_brave_shields_page:polymer3_elements",
+    "social_blocking_page:polymer3_elements",
+    # TODO(petemill): Add Local targets (e.g. brave_settings_overrides)
+    # when settings is rendered fully with ES Modules / polymer3, e.g.:
+    # ":modulize",
+  ]
+}
diff --git a/browser/resources/settings/brave_appearance_page/BUILD.gn b/browser/resources/settings/brave_appearance_page/BUILD.gn
new file mode 100644
index 000000000000..1027c7a5b915
--- /dev/null
+++ b/browser/resources/settings/brave_appearance_page/BUILD.gn
@@ -0,0 +1,181 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# you can obtain one at http://mozilla.org/MPL/2.0/.
+
+import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/polymer.gni")
+import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//chrome/browser/resources/settings/settings.gni")
+
+js_type_check("closure_compile") {
+  deps = [
+    ":brave_appearance_browser_proxy",
+    ":brave_theme",
+    ":super_referral",
+    ":toolbar"
+  ]
+}
+
+js_library("brave_appearance_browser_proxy") {
+  deps = [
+    "//ui/webui/resources/js:cr",
+  ]
+  externs_list = [
+    "$externs_path/chrome_send.js",
+    "$externs_path/management.js",
+  ]
+}
+
+js_library("brave_theme") {
+  deps = [
+    ":brave_appearance_browser_proxy",
+    "//chrome/browser/resources/settings:route",
+    "//chrome/browser/resources/settings:router",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:load_time_data",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
+  ]
+  externs_list = [
+    "$externs_path/settings_private.js",
+  ]
+}
+
+js_library("super_referral") {
+  deps = [
+    ":brave_appearance_browser_proxy",
+    "//chrome/browser/resources/settings:route",
+    "//chrome/browser/resources/settings:router",
+    "//ui/webui/resources/js:assert",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:i18n_behavior",
+    "//ui/webui/resources/js:load_time_data",
+  ]
+  externs_list = [
+    "$externs_path/settings_private.js",
+  ]
+}
+
+js_library("toolbar") {
+  externs_list = [
+    "$externs_path/settings_private.js",
+  ]
+}
+
+
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [
+    ":brave_appearance_browser_proxy.m",
+    ":brave_theme.m",
+    ":super_referral.m",
+    ":toolbar.m",
+  ]
+}
+
+js_library("brave_appearance_browser_proxy.m") {
+  sources = [ "$root_gen_dir/brave/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.m.js" ]
+  deps = [
+    "//ui/webui/resources/js:cr.m",
+  ]
+  externs_list = [
+    "$externs_path/chrome_send.js",
+    "$externs_path/management.js",
+  ]
+  extra_deps = [ ":brave_appearance_browser_proxy_module" ]
+}
+
+js_library("brave_theme.m") {
+  deps = [
+    ":brave_appearance_browser_proxy.m",
+    "//chrome/browser/resources/settings:route.m",
+    "//chrome/browser/resources/settings:router.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
+  ]
+  externs_list = [
+    "$externs_path/settings_private.js",
+  ]
+  extra_deps = [
+    ":brave_theme_module",
+  ]
+}
+
+js_library("super_referral.m") {
+  deps = [
+    ":brave_appearance_browser_proxy.m",
+    "//chrome/browser/resources/settings:route.m",
+    "//chrome/browser/resources/settings:router.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:load_time_data.m",
+  ]
+  externs_list = [
+    "$externs_path/settings_private.js",
+  ]
+  extra_deps = [
+    ":super_referral_module"
+  ]
+}
+
+js_library("toolbar.m") {
+  externs_list = [
+    "$externs_path/settings_private.js",
+  ]
+  extra_deps = [
+    ":toolbar_module"
+  ]
+}
+
+
+# make modules
+group("polymer3_elements") {
+  public_deps = [
+    ":brave_theme_module",
+    ":super_referral_module",
+    ":toolbar_module",
+    ":brave_appearance_browser_proxy_module",
+  ]
+}
+
+polymer_modulizer("brave_theme") {
+  js_file = "brave_theme.js"
+  html_file = "brave_theme.html"
+  html_type = "dom-module"
+  auto_imports = settings_auto_imports + [
+                   "ui/webui/resources/html/assert.html|assert",
+                   "chrome/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.html|BraveAppearanceBrowserProxy, BraveAppearanceBrowserProxyImpl",
+                   "chrome/browser/resources/settings/appearance_page/brave_appearance_browser_proxy.html|AppearanceBrowserProxy, AppearanceBrowserProxyImpl",
+                   "chrome/browser/resources/settings/route.html|routes",
+                   "chrome/browser/resources/settings/router.html|Router",
+                 ]
+  namespace_rewrites = settings_namespace_rewrites
+}
+
+polymer_modulizer("super_referral") {
+  js_file = "super_referral.js"
+  html_file = "super_referral.html"
+  html_type = "dom-module"
+  auto_imports = settings_auto_imports + [
+                   "ui/webui/resources/html/assert.html|assert",
+                   "chrome/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.html|BraveAppearanceBrowserProxy, BraveAppearanceBrowserProxyImpl",
+                   "chrome/browser/resources/settings/appearance_page/brave_appearance_browser_proxy.html|AppearanceBrowserProxy, AppearanceBrowserProxyImpl",
+                 ]
+  namespace_rewrites = settings_namespace_rewrites
+}
+
+polymer_modulizer("toolbar") {
+  js_file = "toolbar.js"
+  html_file = "toolbar.html"
+  html_type = "dom-module"
+  auto_imports = settings_auto_imports
+  namespace_rewrites = settings_namespace_rewrites
+}
+
+js_modulizer("brave_appearance_browser_proxy_module") {
+  input_files = [
+    "brave_appearance_browser_proxy.js",
+  ]
+  namespace_rewrites = settings_namespace_rewrites
+}
diff --git a/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.js b/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.js
index cdeef9009659..d54762b1d4c0 100644
--- a/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.js
+++ b/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.js
@@ -37,6 +37,7 @@ cr.define('settings', function() {
 
   cr.addSingletonGetter(BraveAppearanceBrowserProxyImpl);
 
+  // #cr_define_end
   return {
     BraveAppearanceBrowserProxy: BraveAppearanceBrowserProxy,
     BraveAppearanceBrowserProxyImpl: BraveAppearanceBrowserProxyImpl,
diff --git a/browser/resources/settings/brave_appearance_page/brave_theme.html b/browser/resources/settings/brave_appearance_page/brave_theme.html
new file mode 100644
index 000000000000..19f9e5e6f112
--- /dev/null
+++ b/browser/resources/settings/brave_appearance_page/brave_theme.html
@@ -0,0 +1,33 @@
+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
+<link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
+<link rel="import" href="brave_appearance_browser_proxy.html">
+<link rel="import" href="../settings_shared_css.html">
+<link rel="import" href="../settings_vars_css.html">
+
+<dom-module id="settings-brave-appearance-theme">
+  <template>
+    <style include="settings-shared md-select iron-flex">
+    </style>
+    <div class="settings-box first">
+      <div class="start">$i18n{appearanceSettingsBraveTheme}</div>
+      <select id="braveThemeType" class="md-select"
+          on-change="onBraveThemeTypeChange_">
+        <template is="dom-repeat" items="[[braveThemeList_]]">
+          <option value="[[item.value]]"
+              selected="[[braveThemeTypeEqual_(item.value, braveThemeType_)]]">
+            [[item.name]]
+          </option>
+        </template>
+      </select>
+    </div>
+    <template is="dom-if" if="[[useThemesSubPage_()]]">
+      <cr-link-row class="hr" id="themes-subpage-trigger"
+          label="$i18n{themes}" on-click="onThemeTap_"
+          role-description="$i18n{subpageArrowRoleDescription}">
+      </cr-link-row>
+    </template>
+  </template>
+  <script src="brave_theme.js"></script>
+</dom-module>
diff --git a/browser/resources/settings/brave_appearance_page/brave_theme.js b/browser/resources/settings/brave_appearance_page/brave_theme.js
new file mode 100644
index 000000000000..5090f2aade50
--- /dev/null
+++ b/browser/resources/settings/brave_appearance_page/brave_theme.js
@@ -0,0 +1,75 @@
+// Copyright (c) 2020 The Brave Authors. All rights reserved.
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// you can obtain one at http://mozilla.org/MPL/2.0/.
+
+(function() {
+
+/**
+ * 'settings-brave-appearance-theme' is the settings page area containing
+ * brave's appearance related settings that located at the top of appearance
+ * area.
+ */
+Polymer({
+  is: 'settings-brave-appearance-theme',
+
+  behaviors: [
+    WebUIListenerBehavior,
+  ],
+
+  properties: {
+    braveThemeList_: Array,
+    braveThemeType_: Number,
+  },
+
+  /** @private {?settings.BraveAppearanceBrowserProxy} */
+  browserProxy_: null,
+
+  observers: [
+    'updateSelected_(braveThemeType_, braveThemeList_)',
+  ],
+
+  /** @override */
+  created: function() {
+    this.browserProxy_ = settings.BraveAppearanceBrowserProxyImpl.getInstance();
+  },
+
+  /** @override */
+  ready: function() {
+    this.addWebUIListener('brave-theme-type-changed', (type) => {
+      this.braveThemeType_ = type;
+    })
+    this.browserProxy_.getBraveThemeList().then(list => {
+      this.braveThemeList_ = JSON.parse(list);
+    })
+    this.browserProxy_.getBraveThemeType().then(type => {
+      this.braveThemeType_ = type;
+    })
+  },
+
+  onBraveThemeTypeChange_: function() {
+    this.browserProxy_.setBraveThemeType(Number(this.$.braveThemeType.value));
+  },
+
+  braveThemeTypeEqual_: function(theme1, theme2) {
+    return theme1 === theme2;
+  },
+
+  onThemeTap_: function() {
+    settings.Router.getInstance().navigateTo(settings.routes.THEMES);
+  },
+
+  // Wait for the dom-repeat to populate the <select> before setting
+  // <select>#value so the correct option gets selected.
+  updateSelected_: function() {
+    this.async(() => {
+      this.$.braveThemeType.value = this.braveThemeType_;
+    });
+  },
+
+  useThemesSubPage_: function() {
+    return loadTimeData.getString('superReferralThemeName') !== "";
+  }
+});
+
+})();
\ No newline at end of file
diff --git a/browser/resources/settings/brave_appearance_page/brave_appearance_page.html b/browser/resources/settings/brave_appearance_page/super_referral.html
similarity index 51%
rename from browser/resources/settings/brave_appearance_page/brave_appearance_page.html
rename to browser/resources/settings/brave_appearance_page/super_referral.html
index f9493c81317d..50cebf5370b4 100644
--- a/browser/resources/settings/brave_appearance_page/brave_appearance_page.html
+++ b/browser/resources/settings/brave_appearance_page/super_referral.html
@@ -1,39 +1,7 @@
 <link rel="import" href="chrome://resources/html/polymer.html">
-
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
-<link rel="import" href="chrome://brave-resources/br_elements/br_toolbar/br_toolbar.html">
-<link rel="import" href="brave_appearance_browser_proxy.html">
-<link rel="import" href="../controls/settings_radio_group.html">
-<link rel="import" href="../settings_shared_css.html">
-<link rel="import" href="../settings_vars_css.html">
-<link rel="import" href="../page_visibility.html">
 
-<dom-module id="settings-brave-appearance-theme">
-  <template>
-    <style include="settings-shared md-select iron-flex">
-    </style>
-    <div class="settings-box first">
-      <div class="start">$i18n{appearanceSettingsBraveTheme}</div>
-      <select id="braveThemeType" class="md-select"
-          on-change="onBraveThemeTypeChange_">
-        <template is="dom-repeat" items="[[braveThemeList_]]">
-          <option value="[[item.value]]"
-              selected="[[braveThemeTypeEqual_(item.value, braveThemeType_)]]">
-            [[item.name]]
-          </option>
-        </template>
-      </select>
-    </div>
-    <template is="dom-if" if="[[useThemesSubPage_()]]">
-      <cr-link-row class="hr" id="themes-subpage-trigger"
-          label="$i18n{themes}" on-click="onThemeTap_"
-          role-description="$i18n{subpageArrowRoleDescription}">
-      </cr-link-row>
-    </template>
-  </template>
-  <script src="brave_appearance_page.js"></script>
-</dom-module>
+<link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
 
 <dom-module id="settings-brave-appearance-super-referral">
   <template>
@@ -105,35 +73,5 @@
       </div>
     </div>
   </template>
-</dom-module>
-
-<dom-module id="settings-brave-appearance-toolbar">
-  <template>
-    <style include="settings-shared md-select iron-flex">
-    </style>
-    <settings-toggle-button pref="{{prefs.brave.location_bar_is_wide}}"
-                            label="$i18n{appearanceSettingsLocationBarIsWide}">
-    </settings-toggle-button>
-    <settings-toggle-button
-      pref="{{prefs.brave.autocomplete_enabled}}"
-      label="$i18n{appearanceSettingsShowAutocompleteInAddressBar}">
-    </settings-toggle-button>
-    <settings-toggle-button
-      pref="{{prefs.brave.top_site_suggestions_enabled}}"
-      label="$i18n{appearanceSettingsUseTopSiteSuggestions}">
-    </settings-toggle-button>
-    <settings-toggle-button
-      pref="{{prefs.brave.brave_suggested_site_suggestions_enabled}}"
-      label="$i18n{appearanceSettingsUseBraveSuggestedSiteSuggestions}">
-    </settings-toggle-button>
-    <settings-toggle-button pref="{{prefs.brave.hide_brave_rewards_button}}"
-                            label="$i18n{appearanceSettingsHideBraveRewardsButtonLabel}"
-                            sub-label="$i18n{appearanceSettingsHideBraveRewardsButtonDesc}">
-    </settings-toggle-button>
-    <settings-toggle-button
-      pref="{{prefs.brave.always_show_bookmark_bar_on_ntp}}"
-      label="$i18n{appearanceSettingsAlwaysShowBookmarkBarOnNTP}"
-    >
-    </settings-toggle-button>
-  </template>
+  <script src="super_referral.js"></script>
 </dom-module>
diff --git a/browser/resources/settings/brave_appearance_page/brave_appearance_page.js b/browser/resources/settings/brave_appearance_page/super_referral.js
similarity index 75%
rename from browser/resources/settings/brave_appearance_page/brave_appearance_page.js
rename to browser/resources/settings/brave_appearance_page/super_referral.js
index ddc64d1aef8a..b7fd40afb39a 100644
--- a/browser/resources/settings/brave_appearance_page/brave_appearance_page.js
+++ b/browser/resources/settings/brave_appearance_page/super_referral.js
@@ -1,84 +1,9 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+// Copyright (c) 2020 The Brave Authors. All rights reserved.
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// you can obtain one at http://mozilla.org/MPL/2.0/.
 
 (function() {
-'use strict';
-
-/**
- * 'settings-brave-appearance-theme' is the settings page area containing
- * brave's appearance related settings that located at the top of appearance
- * area.
- */
-Polymer({
-  is: 'settings-brave-appearance-theme',
-
-  behaviors: [
-    WebUIListenerBehavior,
-  ],
-
-  properties: {
-    braveThemeList_: Array,
-    braveThemeType_: Number,
-  },
-
-  /** @private {?settings.BraveAppearanceBrowserProxy} */
-  browserProxy_: null,
-
-  observers: [
-    'updateSelected_(braveThemeType_, braveThemeList_)',
-  ],
-
-  /** @override */
-  created: function() {
-    this.browserProxy_ = settings.BraveAppearanceBrowserProxyImpl.getInstance();
-  },
-
-  /** @override */
-  ready: function() {
-    this.addWebUIListener('brave-theme-type-changed', (type) => {
-      this.braveThemeType_ = type;
-    })
-    this.browserProxy_.getBraveThemeList().then(list => {
-      this.braveThemeList_ = JSON.parse(list);
-    })
-    this.browserProxy_.getBraveThemeType().then(type => {
-      this.braveThemeType_ = type;
-    })
-  },
-
-  onBraveThemeTypeChange_: function() {
-    this.browserProxy_.setBraveThemeType(Number(this.$.braveThemeType.value));
-  },
-
-  braveThemeTypeEqual_: function(theme1, theme2) {
-    return theme1 === theme2;
-  },
-
-  onThemeTap_: function() {
-    settings.Router.getInstance().navigateTo(settings.routes.THEMES);
-  },
-
-  // Wait for the dom-repeat to populate the <select> before setting
-  // <select>#value so the correct option gets selected.
-  updateSelected_: function() {
-    this.async(() => {
-      this.$.braveThemeType.value = this.braveThemeType_;
-    });
-  },
-
-  useThemesSubPage_: function() {
-    return loadTimeData.getString('superReferralThemeName') !== "";
-  }
-});
-
-/**
- * 'settings-brave-appearance-toolbar' is the settings page area containing
- * brave's appearance settings related to the toolbar.
- */
-Polymer({
-  is: 'settings-brave-appearance-toolbar',
-});
 
 /**
  * ID for autogenerated themes. Should match
@@ -339,4 +264,5 @@ Polymer({
     this.themeSublabel_ = this.i18n(i18nId);
   }
 });
-})();
+
+})();
\ No newline at end of file
diff --git a/browser/resources/settings/brave_appearance_page/toolbar.html b/browser/resources/settings/brave_appearance_page/toolbar.html
new file mode 100644
index 000000000000..374753799775
--- /dev/null
+++ b/browser/resources/settings/brave_appearance_page/toolbar.html
@@ -0,0 +1,37 @@
+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
+<link rel="import" href="../settings_shared_css.html">
+<link rel="import" href="../settings_vars_css.html">
+
+<dom-module id="settings-brave-appearance-toolbar">
+  <template>
+    <style include="settings-shared md-select iron-flex">
+    </style>
+    <settings-toggle-button pref="{{prefs.brave.location_bar_is_wide}}"
+                            label="$i18n{appearanceSettingsLocationBarIsWide}">
+    </settings-toggle-button>
+    <settings-toggle-button
+      pref="{{prefs.brave.autocomplete_enabled}}"
+      label="$i18n{appearanceSettingsShowAutocompleteInAddressBar}">
+    </settings-toggle-button>
+    <settings-toggle-button
+      pref="{{prefs.brave.top_site_suggestions_enabled}}"
+      label="$i18n{appearanceSettingsUseTopSiteSuggestions}">
+    </settings-toggle-button>
+    <settings-toggle-button
+      pref="{{prefs.brave.brave_suggested_site_suggestions_enabled}}"
+      label="$i18n{appearanceSettingsUseBraveSuggestedSiteSuggestions}">
+    </settings-toggle-button>
+    <settings-toggle-button pref="{{prefs.brave.hide_brave_rewards_button}}"
+                            label="$i18n{appearanceSettingsHideBraveRewardsButtonLabel}"
+                            sub-label="$i18n{appearanceSettingsHideBraveRewardsButtonDesc}">
+    </settings-toggle-button>
+    <settings-toggle-button
+      pref="{{prefs.brave.always_show_bookmark_bar_on_ntp}}"
+      label="$i18n{appearanceSettingsAlwaysShowBookmarkBarOnNTP}"
+    >
+    </settings-toggle-button>
+  </template>
+  <script src="toolbar.js"></script>
+</dom-module>
diff --git a/browser/resources/settings/brave_appearance_page/toolbar.js b/browser/resources/settings/brave_appearance_page/toolbar.js
new file mode 100644
index 000000000000..3e24952324c3
--- /dev/null
+++ b/browser/resources/settings/brave_appearance_page/toolbar.js
@@ -0,0 +1,16 @@
+// Copyright (c) 2020 The Brave Authors. All rights reserved.
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// you can obtain one at http://mozilla.org/MPL/2.0/.
+
+(function() {
+
+/**
+ * 'settings-brave-appearance-toolbar' is the settings page area containing
+ * brave's appearance settings related to the toolbar.
+ */
+Polymer({
+  is: 'settings-brave-appearance-toolbar',
+});
+
+})();
diff --git a/browser/resources/settings/brave_privacy_page/BUILD.gn b/browser/resources/settings/brave_privacy_page/BUILD.gn
new file mode 100644
index 000000000000..324d755b61f0
--- /dev/null
+++ b/browser/resources/settings/brave_privacy_page/BUILD.gn
@@ -0,0 +1,35 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# you can obtain one at http://mozilla.org/MPL/2.0/.
+
+import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/polymer.gni")
+import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//chrome/browser/resources/settings/settings.gni")
+
+# ES Module conversion from HTML Imports code
+
+group("polymer3_elements") {
+  public_deps = [
+    ":brave_personalization_options_module",
+    ":brave_privacy_page_browser_proxy_module",
+  ]
+}
+
+polymer_modulizer("brave_personalization_options") {
+  js_file = "brave_personalization_options.js"
+  html_file = "brave_personalization_options.html"
+  html_type = "dom-module"
+  auto_imports = settings_auto_imports + [
+                   "chrome/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.html|BravePrivacyBrowserProxy, BravePrivacyBrowserProxyImpl",
+                 ]
+  namespace_rewrites = settings_namespace_rewrites
+}
+
+js_modulizer("brave_privacy_page_browser_proxy_module") {
+  input_files = [
+    "brave_privacy_page_browser_proxy.js",
+  ]
+  namespace_rewrites = settings_namespace_rewrites
+}
diff --git a/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.js b/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.js
index 10d3e0c1ddd2..af696d97de52 100644
--- a/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.js
+++ b/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.js
@@ -71,6 +71,7 @@ cr.define('settings', function() {
 
   cr.addSingletonGetter(BravePrivacyBrowserProxyImpl);
 
+  // #cr_define_end
   return {
     BravePrivacyBrowserProxy: BravePrivacyBrowserProxy,
     BravePrivacyBrowserProxyImpl: BravePrivacyBrowserProxyImpl,
diff --git a/browser/resources/settings/brave_settings_overrides.html b/browser/resources/settings/brave_settings_overrides.html
index e76a847361e1..78a841c5ef80 100644
--- a/browser/resources/settings/brave_settings_overrides.html
+++ b/browser/resources/settings/brave_settings_overrides.html
@@ -3,6 +3,7 @@
 <!-- Need chromium icons to be defined so that we can rewrite -->
 <link rel="import" href="icons.html">
 <link rel="import" href="brave_icons.html">
+<link rel="import" href="brave_appearance_page/super_referral.html">
 <link rel="import" href="brave_default_extensions_page/brave_default_extensions_page.html">
 <link rel="import" href="default_brave_shields_page/default_brave_shields_page.html">
 <link rel="import" href="social_blocking_page/social_blocking_page.html">
diff --git a/browser/resources/settings/default_brave_shields_page/BUILD.gn b/browser/resources/settings/default_brave_shields_page/BUILD.gn
new file mode 100644
index 000000000000..ff4288114790
--- /dev/null
+++ b/browser/resources/settings/default_brave_shields_page/BUILD.gn
@@ -0,0 +1,101 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# you can obtain one at http://mozilla.org/MPL/2.0/.
+
+import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/polymer.gni")
+import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//chrome/browser/resources/settings/settings.gni")
+
+# HTML Imports compatible compiles
+
+js_type_check("closure_compile") {
+  deps = [
+    ":default_brave_shields_browser_proxy",
+    ":default_brave_shields_page",
+  ]
+}
+
+js_library("default_brave_shields_browser_proxy") {
+  deps = [
+    "//ui/webui/resources/js:cr",
+  ]
+  externs_list = [
+    "$externs_path/chrome_send.js",
+  ]
+}
+
+js_library("default_brave_shields_page") {
+  deps = [
+    ":default_brave_shields_browser_proxy",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:load_time_data",
+  ]
+  externs_list = [
+    "$externs_path/settings_private.js",
+  ]
+}
+
+# ES Module compatible compiles
+
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [
+    ":default_brave_shields_browser_proxy.m",
+    ":default_brave_shields_page.m",
+  ]
+}
+
+js_library("default_brave_shields_browser_proxy.m") {
+  deps = [
+    "//ui/webui/resources/js:cr.m",
+  ]
+  externs_list = [
+    "$externs_path/chrome_send.js",
+  ]
+  extra_deps = [
+    ":default_brave_shields_browser_proxy_module",
+  ]
+}
+
+js_library("default_brave_shields_page.m") {
+  deps = [
+    ":default_brave_shields_browser_proxy.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:load_time_data.m",
+  ]
+  externs_list = [
+    "$externs_path/settings_private.js",
+  ]
+  extra_deps = [
+    ":default_brave_shields_page_module",
+  ]
+}
+
+# ES Module conversion from HTML Imports code
+
+group("polymer3_elements") {
+  public_deps = [
+    ":default_brave_shields_page_module",
+    ":default_brave_shields_browser_proxy_module",
+  ]
+}
+
+polymer_modulizer("default_brave_shields_page") {
+  js_file = "default_brave_shields_page.js"
+  html_file = "default_brave_shields_page.html"
+  html_type = "dom-module"
+  auto_imports = settings_auto_imports + [
+                   "chrome/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.html|DefaultBraveShieldsBrowserProxy, DefaultBraveShieldsBrowserProxyImpl",
+                 ]
+  namespace_rewrites = settings_namespace_rewrites
+}
+
+js_modulizer("default_brave_shields_browser_proxy_module") {
+  input_files = [
+    "default_brave_shields_browser_proxy.js",
+  ]
+  namespace_rewrites = settings_namespace_rewrites
+}
+
diff --git a/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.js b/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.js
index 949e8e1b412d..96ac33626950 100644
--- a/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.js
+++ b/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.js
@@ -109,6 +109,7 @@ cr.define('settings', function() {
 
   cr.addSingletonGetter(DefaultBraveShieldsBrowserProxyImpl);
 
+  // #cr_define_end
   return {
     DefaultBraveShieldsBrowserProxy,
     DefaultBraveShieldsBrowserProxyImpl
diff --git a/browser/resources/settings/settings_resources.grd b/browser/resources/settings/settings_resources.grd
index d0abf9e04b28..14cf2862c82c 100644
--- a/browser/resources/settings/settings_resources.grd
+++ b/browser/resources/settings/settings_resources.grd
@@ -21,10 +21,16 @@
       <structure name="IDR_SETTINGS_SOCIAL_BLOCKING_BROWSER_PROXY_JS" file="social_blocking_page/social_blocking_browser_proxy.js" type="chrome_html" preprocess="true" />
       <structure name="IDR_SETTINGS_SOCIAL_BLOCKING_PAGE_JS" file="social_blocking_page/social_blocking_page.js" type="chrome_html" preprocess="true" />
       <structure name="IDR_SETTINGS_SOCIAL_BLOCKING_PAGE_HTML" file="social_blocking_page/social_blocking_page.html" type="chrome_html" preprocess="true" allowexternalscript="true" />
+      <!-- appearance -->
       <structure name="IDR_SETTINGS_BRAVE_APPEARANCE_BROWSER_PROXY_HTML" file="brave_appearance_page/brave_appearance_browser_proxy.html" type="chrome_html" />
-      <structure name="IDR_SETTINGS_BRAVE_APPEARANCE_BROWSER_PROXY_JS" file="brave_appearance_page/brave_appearance_browser_proxy.js" type="chrome_html" preprocess="true" />
-      <structure name="IDR_SETTINGS_BRAVE_APPEARANCE_PAGE_JS" file="brave_appearance_page/brave_appearance_page.js" type="chrome_html" preprocess="true" />
-      <structure name="IDR_SETTINGS_BRAVE_APPEARANCE_PAGE_HTML" file="brave_appearance_page/brave_appearance_page.html" type="chrome_html" preprocess="true" allowexternalscript="true" />
+      <structure name="IDR_SETTINGS_BRAVE_APPEARANCE_BROWSER_PROXY_JS" file="brave_appearance_page/brave_appearance_browser_proxy.js" type="chrome_html" />
+      <structure name="IDR_SETTINGS_BRAVE_APPEARANCE_BRAVE_THEME_HTML" file="brave_appearance_page/brave_theme.html" type="chrome_html" preprocess="true" />
+      <structure name="IDR_SETTINGS_BRAVE_APPEARANCE_BRAVE_THEME_JS" file="brave_appearance_page/brave_theme.js" type="chrome_html" />
+      <structure name="IDR_SETTINGS_BRAVE_APPEARANCE_TOOLBAR_HTML" file="brave_appearance_page/toolbar.html" type="chrome_html" preprocess="true" />
+      <structure name="IDR_SETTINGS_BRAVE_APPEARANCE_TOOLBAR_JS" file="brave_appearance_page/toolbar.js" type="chrome_html" />
+      <structure name="IDR_SETTINGS_BRAVE_APPEARANCE_SUPER_REFERRAL_HTML" file="brave_appearance_page/super_referral.html" type="chrome_html" preprocess="true" />
+      <structure name="IDR_SETTINGS_BRAVE_APPEARANCE_SUPER_REFERRAL_JS" file="brave_appearance_page/super_referral.js" type="chrome_html" preprocess="true" />
+
       <structure name="IDR_SETTINGS_BRAVE_PAGE_VISIBILITY_JS" file="brave_page_visibility.js" type="chrome_html" />
       <structure name="IDR_SETTINGS_BRAVE_PERSONALIZATION_OPTIONS_HTML" file="brave_privacy_page/brave_personalization_options.html" type="chrome_html" preprocess="true" allowexternalscript="true" />
       <structure name="IDR_SETTINGS_BRAVE_PERSONALIZATION_OPTIONS_JS" file="brave_privacy_page/brave_personalization_options.js" type="chrome_html" preprocess="true" />
@@ -59,6 +65,7 @@
     </structures>
     <includes>
       <include name="IDR_SETTINGS_BRAVE_STAMP" file="brave_unpack.stamp" type="BINDATA" />
+      <part file="settings_resources_v3.grdp" />
     </includes>
   </release>
 </grit>
diff --git a/browser/resources/settings/settings_resources_v3.grdp b/browser/resources/settings/settings_resources_v3.grdp
new file mode 100644
index 000000000000..01dc2c1a8f35
--- /dev/null
+++ b/browser/resources/settings/settings_resources_v3.grdp
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+  <!-- Polymer 3.0 Elements -->
+  <include name="IDR_SETTINGS_BRAVE_APPEARANCE_PAGE_BRAVE_APPEARANCE_BROWSER_PROXY_M_JS"
+          file="${root_gen_dir}/brave/browser/resources/settings/brave_appearance_page/brave_appearance_browser_proxy.m.js"
+          use_base_dir="false"
+          preprocess="true"
+          type="BINDATA" />
+  <include name="IDR_SETTINGS_BRAVE_APPEARANCE_PAGE_BRAVE_THEME_M_JS"
+          file="${root_gen_dir}/brave/browser/resources/settings/brave_appearance_page/brave_theme.m.js"
+          use_base_dir="false"
+          preprocess="true"
+          type="BINDATA" />
+  <include name="IDR_SETTINGS_BRAVE_APPEARANCE_PAGE_BRAVE_TOOLBAR_M_JS"
+          file="${root_gen_dir}/brave/browser/resources/settings/brave_appearance_page/toolbar.m.js"
+          use_base_dir="false"
+          preprocess="true"
+          type="BINDATA" />
+  <include name="IDR_SETTINGS_BRAVE_APPEARANCE_PAGE_SUPER_REFERRAL_M_JS"
+          file="${root_gen_dir}/brave/browser/resources/settings/brave_appearance_page/super_referral.m.js"
+          use_base_dir="false"
+          preprocess="true"
+          type="BINDATA" />
+  <include name="IDR_SETTINGS_DEFAULT_BRAVE_SHIELDS_PAGE_DEFAULT_BRAVE_SHIELDS_BROWSER_PROXY_M_JS"
+          file="${root_gen_dir}/brave/browser/resources/settings/default_brave_shields_page/default_brave_shields_browser_proxy.m.js"
+          use_base_dir="false"
+          preprocess="true"
+          type="BINDATA" />
+  <include name="IDR_SETTINGS_DEFAULT_BRAVE_SHIELDS_PAGE_DEFAULT_BRAVE_SHIELDS_PAGE_M_JS"
+          file="${root_gen_dir}/brave/browser/resources/settings/default_brave_shields_page/default_brave_shields_page.m.js"
+          use_base_dir="false"
+          preprocess="true"
+          type="BINDATA" />
+  <include name="IDR_SETTINGS_BRAVE_SOCIAL_BLOCKING_PAGE_SOCIAL_BLOCKING_BROWSER_PROXY_M_JS"
+          file="${root_gen_dir}/brave/browser/resources/settings/social_blocking_page/social_blocking_browser_proxy.m.js"
+          use_base_dir="false"
+          preprocess="true"
+          type="BINDATA" />
+  <include name="IDR_SETTINGS_BRAVE_SOCIAL_BLOCKING_PAGE_SOCIAL_BLOCKING_PAGE_M_JS"
+          file="${root_gen_dir}/brave/browser/resources/settings/social_blocking_page/social_blocking_page.m.js"
+          use_base_dir="false"
+          preprocess="true"
+          type="BINDATA" />
+  <include name="IDR_SETTINGS_BRAVE_PRIVACY_PAGE_BRAVE_PRIVACY_PAGE_BROWSER_PROXY_M_JS"
+        file="${root_gen_dir}/brave/browser/resources/settings/brave_privacy_page/brave_privacy_page_browser_proxy.m.js"
+        use_base_dir="false"
+        preprocess="true"
+        type="BINDATA" />
+  <include name="IDR_SETTINGS_BRAVE_PRIVACY_PAGE_BRAVE_PERSONALIZATION_OPTIONS_BROWSER_PROXY_M_JS"
+        file="${root_gen_dir}/brave/browser/resources/settings/brave_privacy_page/brave_personalization_options.m.js"
+        use_base_dir="false"
+        preprocess="true"
+        type="BINDATA" />
+</grit-part>
diff --git a/browser/resources/settings/social_blocking_page/BUILD.gn b/browser/resources/settings/social_blocking_page/BUILD.gn
new file mode 100644
index 000000000000..89b0093d209b
--- /dev/null
+++ b/browser/resources/settings/social_blocking_page/BUILD.gn
@@ -0,0 +1,36 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# you can obtain one at http://mozilla.org/MPL/2.0/.
+
+import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/polymer.gni")
+import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//chrome/browser/resources/settings/settings.gni")
+
+# ES Module conversion from HTML Imports code
+
+group("polymer3_elements") {
+  public_deps = [
+    ":social_blocking_page_module",
+    ":social_blocking_browser_proxy_module",
+  ]
+}
+
+polymer_modulizer("social_blocking_page") {
+  js_file = "social_blocking_page.js"
+  html_file = "social_blocking_page.html"
+  html_type = "dom-module"
+  auto_imports = settings_auto_imports + [
+                   "chrome/browser/resources/settings/social_blocking_page/social_blocking_browser_proxy.html|SocialBlockingBrowserProxy, SocialBlockingBrowserProxyImpl",
+                 ]
+  namespace_rewrites = settings_namespace_rewrites
+}
+
+js_modulizer("social_blocking_browser_proxy_module") {
+  input_files = [
+    "social_blocking_browser_proxy.js",
+  ]
+  namespace_rewrites = settings_namespace_rewrites
+}
+
diff --git a/browser/resources/settings/social_blocking_page/social_blocking_browser_proxy.js b/browser/resources/settings/social_blocking_page/social_blocking_browser_proxy.js
index 02ff6b7e1766..dc1995bca7f2 100644
--- a/browser/resources/settings/social_blocking_page/social_blocking_browser_proxy.js
+++ b/browser/resources/settings/social_blocking_page/social_blocking_browser_proxy.js
@@ -15,6 +15,7 @@ cr.define('settings', function() {
 
   cr.addSingletonGetter(SocialBlockingBrowserProxyImpl);
 
+  // #cr_define_end
   return {
     SocialBlockingBrowserProxy,
     SocialBlockingBrowserProxyImpl
diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch
index d2ee4abe6b01..630dee12e542 100644
--- a/patches/chrome-browser-resources-settings-BUILD.gn.patch
+++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
-index e05a2589a3ee6dfaac01e41ed1f5f9df31b6cbe2..19af64fd4cf823a83f0fc0c843821d9950e0c3c2 100644
+index e05a2589a3ee6dfaac01e41ed1f5f9df31b6cbe2..3d6d80548cf0171b1439483bae753e8cb8ed037d 100644
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
 @@ -34,6 +34,7 @@ if (optimize_webui) {
@@ -10,3 +10,11 @@ index e05a2589a3ee6dfaac01e41ed1f5f9df31b6cbe2..19af64fd4cf823a83f0fc0c843821d99
    }
  
    optimize_webui("build_polymer3") {
+@@ -51,6 +52,7 @@ if (optimize_webui) {
+ 
+     deps = [
+       ":unpak",
++      "//brave/browser/resources/settings:unpak",
+       "../../../../ui/webui/resources:modulize",
+     ]
+     excludes = [ "chrome://resources/js/cr.m.js" ]
diff --git a/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch b/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch
index cad94400de7f..1ec4d7dffb1f 100644
--- a/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch
+++ b/patches/chrome-browser-resources-settings-appearance_page-appearance_page.html.patch
@@ -1,21 +1,20 @@
 diff --git a/chrome/browser/resources/settings/appearance_page/appearance_page.html b/chrome/browser/resources/settings/appearance_page/appearance_page.html
-index fc68a42c1a6e349bbbba7170506cac1f250b25de..b2e30e892ce0bda3131aa9eef2a51aad41e09f57 100644
+index fc68a42c1a6e349bbbba7170506cac1f250b25de..10e24bcc5ce584531ef367a4a94af9766f12fe7f 100644
 --- a/chrome/browser/resources/settings/appearance_page/appearance_page.html
 +++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html
-@@ -21,6 +21,12 @@
+@@ -21,6 +21,11 @@
  <link rel="import" href="../settings_vars_css.html">
  <link rel="import" href="home_url_input.html">
  
 +<if expr="not _google_chrome">
-+<link rel="import" href="../brave_appearance_page/brave_appearance_page.html">
-+<link rel="import" href="../default_brave_shields_page/default_brave_shields_page.html">
-+<link rel="import" href="../social_blocking_page/social_blocking_page.html">
++  <link rel="import" href="../brave_appearance_page/brave_theme.html">
++  <link rel="import" href="../brave_appearance_page/toolbar.html">
 +</if>
 +
  <dom-module id="settings-appearance-page">
    <template>
      <style include="settings-shared md-select iron-flex">
-@@ -47,6 +53,9 @@
+@@ -47,6 +52,9 @@
      <settings-animated-pages id="pages" section="appearance"
          focus-config="[[focusConfig_]]">
        <div route-path="default">
@@ -25,7 +24,7 @@ index fc68a42c1a6e349bbbba7170506cac1f250b25de..b2e30e892ce0bda3131aa9eef2a51aad
          <div class="settings-row continuation" id="themeRow"
              hidden="[[!pageVisibility.setTheme]]">
            <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
-@@ -119,6 +128,9 @@
+@@ -119,6 +127,9 @@
              </settings-radio-group>
            </div>
          </template>

From 3026eac6320fe4db12796f7cf7ea93c4c0d25422 Mon Sep 17 00:00:00 2001
From: Pete Miller <miller.pete@gmail.com>
Date: Fri, 8 May 2020 16:41:35 -0700
Subject: [PATCH 120/161] Settings WebUI element modifications for c83

Accounts for DOM changes in c83 vs c82
---
 .../settings/brave_settings_overrides.js       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/browser/resources/settings/brave_settings_overrides.js b/browser/resources/settings/brave_settings_overrides.js
index 3bb9804959d1..2bbad1ab75d7 100644
--- a/browser/resources/settings/brave_settings_overrides.js
+++ b/browser/resources/settings/brave_settings_overrides.js
@@ -432,13 +432,25 @@ BravePatching.RegisterPolymerTemplateModifications({
     // (we remove the People section as a separate section).
     const page = templateContent.querySelector('settings-animated-pages[section=people]')
     page.setAttribute('section', 'getStarted')
-    const manageGoogleAccount = templateContent.querySelector('#manage-google-account')
+    // The 'Manage profile' button is inside the "signin-allowed" conditional template.
+    // We don't allow Google Sign-in, but we do allow local profile editing, so we have to turn
+    // the template back on and remove the google signin prompt.
+    const signinTemplate = templateContent.querySelector('template[is=dom-if][if="[[signinAllowed_]]"]')
+    if (!signinTemplate) {
+      console.error('[Brave Settings Overrides] People Page cannot find signin template')
+      return
+    }
+    // always show the template content
+    signinTemplate.setAttribute('if', 'true')
+    // remove the google account button
+    const manageGoogleAccount = signinTemplate.content.querySelector('#manage-google-account')
     if (!manageGoogleAccount) {
-      console.error('[Brave Settings Overrides] Could not find the google account settings item')
+      console.error('[Brave Settings Overrides] Could not find the google account settings item', templateContent, templateContent.innerHTML)
+      return
     }
     manageGoogleAccount.remove()
     // Edit profile item needs to know it's the first in the section
-    const firstItem = templateContent.querySelector('#edit-profile')
+    const firstItem = signinTemplate.content.querySelector('#edit-profile')
     if (!firstItem) {
       console.error('[Brave Settings Overrides] Could not find #edit-profile item in people_page')
       return

From 7f9f17b4bfccfadad6933e6540bf4f9fac22b444 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 7 May 2020 16:13:06 -0400
Subject: [PATCH 121/161] Split rewards/ads unit tests into a separate suite.

When all unit test are in the same suite, all the -D and -I add up to a
command line that is too long on Windows.

Split rewards and ads to a separate build target in vendor/test.
---
 .gitignore                               |   1 +
 browser/BUILD.gn                         |   3 +-
 components/services/bat_ads/BUILD.gn     |   3 +-
 components/services/bat_ledger/BUILD.gn  |   3 +-
 script/brave_license_helper.py           |   3 +
 test/BUILD.gn                            | 146 +++----------------
 test/testing.gni                         |   8 +
 vendor/bat-native-confirmations/BUILD.gn |   2 +
 vendor/bat-native-ledger/BUILD.gn        |   1 +
 vendor/test/BUILD.gn                     | 178 +++++++++++++++++++++++
 10 files changed, 222 insertions(+), 126 deletions(-)
 create mode 100644 vendor/test/BUILD.gn

diff --git a/.gitignore b/.gitignore
index 4997b0935bd3..7aa61945e985 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
 !/vendor/bat-native-ads
 !/vendor/brave-ios
 !/vendor/CPPLINT.cfg
+!/vendor/test
 node_modules/
 patches/**/*.patchinfo
 *.xcodeproj
diff --git a/browser/BUILD.gn b/browser/BUILD.gn
index 62af973d026b..ba691ec354c9 100644
--- a/browser/BUILD.gn
+++ b/browser/BUILD.gn
@@ -23,7 +23,8 @@ source_set("browser_process") {
     "//chrome/browser/*",
     "//brave/browser/*",
     "//brave:browser_dependencies",
-    "//brave/test:*"
+    "//brave/test:*",
+    "//brave/vendor/test:*",
   ]
 
   sources = [
diff --git a/components/services/bat_ads/BUILD.gn b/components/services/bat_ads/BUILD.gn
index 440af1413aac..88508adb332b 100644
--- a/components/services/bat_ads/BUILD.gn
+++ b/components/services/bat_ads/BUILD.gn
@@ -1,7 +1,8 @@
 static_library("lib") {
   visibility = [
     "//brave/utility:*",
-    "//brave/test:*"
+    "//brave/test:*",
+    "//brave/vendor/test:*",
   ]
 
   sources = [
diff --git a/components/services/bat_ledger/BUILD.gn b/components/services/bat_ledger/BUILD.gn
index e19353b24307..571ad98c9dac 100644
--- a/components/services/bat_ledger/BUILD.gn
+++ b/components/services/bat_ledger/BUILD.gn
@@ -1,7 +1,8 @@
 static_library("lib") {
   visibility = [
     "//brave/utility:*",
-    "//brave/test:*"
+    "//brave/test:*",
+    "//brave/vendor/test:*",
   ]
 
   sources = [
diff --git a/script/brave_license_helper.py b/script/brave_license_helper.py
index 07ed81f5ca4e..3a9c6a323839 100644
--- a/script/brave_license_helper.py
+++ b/script/brave_license_helper.py
@@ -29,6 +29,9 @@ def AddBraveCredits(prune_paths, special_cases, prune_dirs, additional_paths):
         os.path.join('brave', 'vendor', 'brave-ios'),
         os.path.join('brave', 'vendor', 'brave_base'),
 
+        # Not an external component
+        os.path.join('brave', 'vendor', 'test'),
+
         # Brave overrides to third-party code, also covered by main notice.
         os.path.join('brave', 'third_party', 'android_deps'),
         os.path.join('brave', 'third_party', 'blink'),
diff --git a/test/BUILD.gn b/test/BUILD.gn
index b14529282f3e..01a4672bcff0 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -44,6 +44,15 @@ group("fix_brave_test_install_name_speedreader") {
   }
 }
 
+group("fix_all_tests") {
+  testonly = true
+  deps = [
+    ":fix_brave_test_install_name",
+    ":fix_brave_test_install_name_adblock",
+    ":fix_brave_test_install_name_speedreader",
+  ]
+}
+
 static_library("brave_test_support_unit") {
   testonly = true
   sources = [
@@ -76,6 +85,19 @@ static_library("brave_test_support_unit") {
 }
 
 if (!is_ios) {
+group("all_unit_tests") {
+  testonly = true
+  deps = [
+    ":brave_unit_tests",
+    "//brave/vendor/test:brave_rewards_unit_tests",
+  ]
+  if (!is_android) {
+    deps += [ ":brave_installer_unittests" ]
+  } else {
+    deps += [ ":brave_public_test_apk" ]
+  }
+}
+
 test("brave_unit_tests") {
   testonly = true
   sources = [
@@ -153,12 +175,7 @@ test("brave_unit_tests") {
     "//third_party/cacheinvalidation",
   ]
 
-  data = [
-    "data/",
-    "//brave/vendor/bat-native-ads/resources/",
-    "//brave/vendor/bat-native-ads/test/data/",
-    "//brave/vendor/bat-native-confirmations/test/data/",
-  ]
+  data = [ "data/" ]
 
   configs += [
     "//brave/build/geolocation",
@@ -297,32 +314,6 @@ test("brave_unit_tests") {
     ]
   }
 
-  if (brave_ads_enabled) {
-    sources += [
-      "//brave/components/brave_ads/browser/ads_service_impl_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/client_mock.h",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/client_mock.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_confirmation_filter_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_conversion_confirmation_type_filter_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_date_range_filter_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/conversion_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/total_max_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/sorts/ad_conversions_sort_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/sorts/ads_history_sort_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/page_classifier/page_classifier_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/funnel_sites_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/keywords_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/purchase_intent_classifier_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/url_util_unittest.cc",
-    ]
-  }
-
   if (brave_wallet_enabled) {
     sources += [
       "//brave/browser/extensions/brave_wallet_unittest.cc",
@@ -330,97 +321,6 @@ test("brave_unit_tests") {
     ]
   }
 
-  if (brave_rewards_enabled) {
-    sources += [
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_monthly_util_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_activity_info_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_balance_report_info_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/helper_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/reddit_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/github_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/twitch_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/twitter_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/vimeo_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/youtube_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_util_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_util_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/bat_helper_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/bat_util_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/publisher/publisher_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/client_state_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/publisher_settings_state_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/report_balance_state_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/unsigned_tx_state_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/wallet_info_state_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/wallet_state_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/test/niceware_partial_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_util_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/credentials/credentials_util_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_client_mock.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_client_mock.h",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.h",
-      "//brave/components/brave_rewards/browser/rewards_service_impl_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_is_mobile_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_client_mock.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_client_mock.h",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/ad_grants_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/payments_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_impl_mock.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_impl_mock.h",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_create_confirmation_request_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_fetch_payment_token_request_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/get_signed_tokens_request_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_redeem_payment_tokens_request_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/request_signed_tokens_request_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/security_helper_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/string_helper_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_unblinded_tokens_unittest.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/platform_helper_mock.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/platform_helper_mock.h",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/unittest_utils.cc",
-      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/unittest_utils.h",
-    ]
-
-    if (!is_android) {
-      sources += [
-        # TODO(https://github.com/brave/brave-browser/issues/9550):
-        # Temporarily disable Brave Ads tests which are passing in the detailed
-        # logs but failing in the summary
-
-        "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/redeem_token_mock.cc",
-        "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/redeem_token_mock.h",
-        "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/redeem_token_unittest.cc",
-        "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_tabs_unittest.cc",
-
-        # TODO(https://github.com/brave-intl/bat-native-usermodel/issues/26):
-        # Fix bat-native-user-model unittests fail to load data files from
-        # 'brave/vendor/bat-native-usermodel/test/data'
-        "//brave/vendor/bat-native-usermodel/test/usermodel_unittest.cc",
-      ]
-    }
-
-    deps += [
-      "//brave/components/brave_rewards/browser:testutil",
-      "//brave/components/brave_ads/browser:testutil",
-      "//brave/vendor/bat-native-ads",
-      "//brave/vendor/bat-native-confirmations",
-      "//brave/vendor/bat-native-ledger",
-      "//brave/vendor/bat-native-rapidjson",
-      "//brave/vendor/bat-native-usermodel",
-      "//brave/vendor/challenge_bypass_ristretto_ffi",
-    ]
-
-    configs += [ "//brave/vendor/bat-native-ledger:internal_config" ]
-    configs += [ "//brave/vendor/bat-native-ads:internal_config" ]
-    configs += [ "//brave/vendor/bat-native-confirmations:internal_config" ]
-  }
-
   if (enable_brave_translate_go) {
     sources += [
       "//brave/browser/net/brave_translate_redirect_network_delegate_helper_unittest.cc",
diff --git a/test/testing.gni b/test/testing.gni
index 824774cc9070..b4c1a11f2cc4 100644
--- a/test/testing.gni
+++ b/test/testing.gni
@@ -28,6 +28,7 @@ if (is_mac) {
       deps = [
         ":" + target_name + "_unit_tests",
         ":" + target_name + "_browser_tests",
+        ":" + target_name + "_rewards_unit_tests",
       ]
     }
     fix_testing_install_name_impl(target_name + "_unit_tests") {
@@ -44,5 +45,12 @@ if (is_mac) {
       outputs = [ "$root_build_dir/alwaysrunbrowsertests/$target_name" ]
       deps = [ "//brave/test:brave_browser_tests" ]
     }
+    fix_testing_install_name_impl(target_name + "_rewards_unit_tests") {
+      forward_variables_from(invoker, "*")
+      executable_path = "$root_build_dir/brave_rewards_unit_tests"
+      # input is the same as the output so just fake it
+      outputs = [ "$root_build_dir/alwaysrununittests/rewards_$target_name" ]
+      deps = [ "//brave/vendor/test:brave_rewards_unit_tests" ]
+    }
   }
 }
diff --git a/vendor/bat-native-confirmations/BUILD.gn b/vendor/bat-native-confirmations/BUILD.gn
index cbbf79f74efa..d8f811e655c2 100644
--- a/vendor/bat-native-confirmations/BUILD.gn
+++ b/vendor/bat-native-confirmations/BUILD.gn
@@ -22,6 +22,7 @@ config("internal_config") {
   visibility = [
     ":*",
     "//brave/test:*",
+    "//brave/vendor/test:*",
   ]
   include_dirs = [ "src" ]
 }
@@ -34,6 +35,7 @@ source_set("bat-native-confirmations") {
     ":*",
     rebase_path("bat-native-ledger", dep_base) + ":*",
     "//brave/test:*",
+    "//brave/vendor/test:*",
   ]
 
   sources = [
diff --git a/vendor/bat-native-ledger/BUILD.gn b/vendor/bat-native-ledger/BUILD.gn
index da85221233a6..6e446e7e50c7 100644
--- a/vendor/bat-native-ledger/BUILD.gn
+++ b/vendor/bat-native-ledger/BUILD.gn
@@ -23,6 +23,7 @@ config("internal_config") {
   visibility = [
     ":*",
     "//brave/test:*",
+    "//brave/vendor/test:*",
   ]
   include_dirs = [ "src" ]
 }
diff --git a/vendor/test/BUILD.gn b/vendor/test/BUILD.gn
new file mode 100644
index 000000000000..872f777e1e22
--- /dev/null
+++ b/vendor/test/BUILD.gn
@@ -0,0 +1,178 @@
+# Copyright (c) 2019 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import("//brave/build/config.gni")
+import("//brave/components/brave_ads/browser/buildflags/buildflags.gni")
+import("//brave/components/brave_rewards/browser/buildflags/buildflags.gni")
+import("//testing/test.gni")
+
+if (!is_ios) {
+test("brave_rewards_unit_tests") {
+  testonly = true
+  public_deps = [
+    "//base/test:test_support",
+    "//brave/test:brave_test_support_unit",
+  ]
+
+  data = [ "//brave/test/data/" ]
+
+  sources = []
+  if (is_android) {
+    sources += [
+      "../../../chrome/app/chrome_main_delegate.cc",
+      "../../../chrome/app/chrome_main_delegate.h",
+    ]
+  }
+
+  deps = []
+  if (is_component_build && is_android) {
+    deps += [ "//chrome/gpu" ]
+  }
+
+  if (brave_rewards_enabled) {
+    sources += [
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_monthly_util_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_activity_info_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_balance_report_info_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/helper_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/reddit_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/github_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/twitch_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/twitter_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/vimeo_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/media/youtube_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_util_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_util_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/bat_helper_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/bat_util_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/publisher/publisher_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/client_state_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/publisher_settings_state_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/report_balance_state_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/unsigned_tx_state_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/wallet_info_state_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/wallet_state_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/test/niceware_partial_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_util_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/credentials/credentials_util_unittest.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_client_mock.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_client_mock.h",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.cc",
+      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.h",
+      "//brave/components/brave_rewards/browser/rewards_service_impl_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_is_mobile_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_client_mock.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_client_mock.h",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/ad_grants_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/payments_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_impl_mock.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_impl_mock.h",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_create_confirmation_request_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_fetch_payment_token_request_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/get_signed_tokens_request_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_redeem_payment_tokens_request_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/request_signed_tokens_request_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/security_helper_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/string_helper_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_unblinded_tokens_unittest.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/platform_helper_mock.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/platform_helper_mock.h",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/unittest_utils.cc",
+      "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/unittest_utils.h",
+    ]
+
+    if (!is_android) {
+      sources += [
+        # TODO(https://github.com/brave/brave-browser/issues/9550):
+        # Temporarily disable Brave Ads tests which are passing in the detailed
+        # logs but failing in the summary
+
+        "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/redeem_token_mock.cc",
+        "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/redeem_token_mock.h",
+        "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/redeem_token_unittest.cc",
+        "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_tabs_unittest.cc",
+
+        # TODO(https://github.com/brave-intl/bat-native-usermodel/issues/26):
+        # Fix bat-native-user-model unittests fail to load data files from
+        # 'brave/vendor/bat-native-usermodel/test/data'
+        "//brave/vendor/bat-native-usermodel/test/usermodel_unittest.cc",
+      ]
+    }
+
+    deps += [
+      "//brave/browser:browser_process",
+      "//brave/components/brave_ads/browser:testutil",
+      "//brave/components/brave_rewards/browser:browser",
+      "//brave/components/brave_rewards/browser:testutil",
+      "//brave/components/brave_rewards/resources:static_resources_grit",
+      "//brave/vendor/bat-native-ads",
+      "//brave/vendor/bat-native-confirmations",
+      "//brave/vendor/bat-native-ledger",
+      "//brave/vendor/bat-native-rapidjson",
+      "//brave/vendor/bat-native-usermodel",
+      "//brave/vendor/challenge_bypass_ristretto_ffi",
+      "//chrome/browser:browser",
+      "//content/test:test_support",
+      "//net:net",
+      "//ui/base:base",
+      "//url:url",
+    ]
+
+    configs += [ "//brave/vendor/bat-native-ledger:internal_config" ]
+    configs += [ "//brave/vendor/bat-native-ads:internal_config" ]
+    configs += [ "//brave/vendor/bat-native-confirmations:internal_config" ]
+
+    data += [ "//brave/vendor/bat-native-confirmations/test/data/" ]
+  }  # if (brave_rewards_enabled)
+
+  if (brave_ads_enabled) {
+    sources += [
+      "//brave/components/brave_ads/browser/ads_service_impl_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/client_mock.h",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/client_mock.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_confirmation_filter_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_conversion_confirmation_type_filter_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_date_range_filter_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/conversion_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/total_max_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/sorts/ad_conversions_sort_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/sorts/ads_history_sort_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/page_classifier/page_classifier_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/funnel_sites_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/keywords_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/purchase_intent_classifier_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/url_util_unittest.cc",
+    ]
+
+    deps += [
+      "//brave/browser:browser_process",
+      "//brave/components/brave_ads/browser:browser",
+      "//brave/components/brave_rewards/browser:browser",
+      "//brave/components/brave_rewards/common:common",
+      "//chrome/browser:browser",
+      "//components/prefs:prefs",
+      "//content/test:test_support",
+
+    ]
+
+    data += [
+      "//brave/vendor/bat-native-ads/resources/",
+      "//brave/vendor/bat-native-ads/test/data/",
+    ]
+  }  # if (brave_ads_enabled)
+}  # test("brave_rewards_unit_tests")
+}  # if (!is_ios)
+

From c7c76f1f986b788cedce9656dd984d21f1a22e04 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Tue, 12 May 2020 17:21:04 -0400
Subject: [PATCH 122/161] [Android] Fix for brave_rewards_unit_tests

---
 vendor/test/BUILD.gn | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/vendor/test/BUILD.gn b/vendor/test/BUILD.gn
index 872f777e1e22..96803c9ee321 100644
--- a/vendor/test/BUILD.gn
+++ b/vendor/test/BUILD.gn
@@ -19,18 +19,27 @@ test("brave_rewards_unit_tests") {
   data = [ "//brave/test/data/" ]
 
   sources = []
+
+  deps = []
+
   if (is_android) {
+    deps += [
+      "//brave:brave_pak_assets",
+      "//chrome/test/android:chrome_java_test_support",
+      "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
+      "//v8:v8_external_startup_data_assets",
+    ]
+
+    if (is_component_build) {
+      deps += [ "//chrome/gpu" ]
+    }
+
     sources += [
       "../../../chrome/app/chrome_main_delegate.cc",
       "../../../chrome/app/chrome_main_delegate.h",
     ]
   }
 
-  deps = []
-  if (is_component_build && is_android) {
-    deps += [ "//chrome/gpu" ]
-  }
-
   if (brave_rewards_enabled) {
     sources += [
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded_unittest.cc",

From f03de2db4589cf0980d5e55dcda51cdea7cd60bf Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Wed, 13 May 2020 11:07:54 -0400
Subject: [PATCH 123/161] [Android] Added new resource files

---
 android/brave_java_resources.gni | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni
index d2feb13d9e5c..f2174b177836 100644
--- a/android/brave_java_resources.gni
+++ b/android/brave_java_resources.gni
@@ -133,6 +133,7 @@ brave_java_resources = [
   "java/res/drawable-hdpi/btn_brave_off.png",
   "java/res/drawable-hdpi/qrcode_dark.png",
   "java/res/drawable-hdpi/android_br_on.png",
+  "java/res/drawable-hdpi/coin_stack.png",
   "java/res/drawable-hdpi/android_onboarding_3.png",
   "java/res/drawable-hdpi/btn_tabswitcher_modern.png",
   "java/res/drawable-hdpi/qrcode_light.png",
@@ -235,6 +236,7 @@ brave_java_resources = [
   "java/res/drawable-mdpi/search_engine_startpage.png",
   "java/res/drawable-mdpi/btn_brave_off.png",
   "java/res/drawable-mdpi/android_br_on.png",
+  "java/res/drawable-mdpi/coin_stack.png",
   "java/res/drawable-mdpi/android_onboarding_3.png",
   "java/res/drawable-mdpi/btn_tabswitcher_modern.png",
   "java/res/drawable-mdpi/down_arrow.png",
@@ -381,6 +383,7 @@ brave_java_resources = [
   "java/res/drawable-xhdpi/search_engine_startpage.png",
   "java/res/drawable-xhdpi/btn_brave_off.png",
   "java/res/drawable-xhdpi/android_br_on.png",
+  "java/res/drawable-xhdpi/coin_stack.png",
   "java/res/drawable-xhdpi/android_onboarding_3.png",
   "java/res/drawable-xhdpi/btn_tabswitcher_modern.png",
   "java/res/drawable-xhdpi/down_arrow.png",
@@ -483,6 +486,7 @@ brave_java_resources = [
   "java/res/drawable-xxhdpi/btn_brave_off.png",
   "java/res/drawable-xxhdpi/qrcode_dark.png",
   "java/res/drawable-xxhdpi/android_br_on.png",
+  "java/res/drawable-xxhdpi/coin_stack.png",
   "java/res/drawable-xxhdpi/android_onboarding_3.png",
   "java/res/drawable-xxhdpi/btn_tabswitcher_modern.png",
   "java/res/drawable-xxhdpi/qrcode_light.png",
@@ -576,6 +580,7 @@ brave_java_resources = [
   "java/res/drawable-xxxhdpi/btn_brave.png",
   "java/res/drawable-xxxhdpi/btn_brave_off.png",
   "java/res/drawable-xxxhdpi/qrcode_dark.png",
+  "java/res/drawable-xxxhdpi/coin_stack.png",
   "java/res/drawable-xxxhdpi/btn_tabswitcher_modern.png",
   "java/res/drawable-xxxhdpi/qrcode_light.png",
   "java/res/drawable-xxxhdpi/icn_youtube.png",

From 1c594d8e6e55af104869147ddcae28b576c01050 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Wed, 13 May 2020 15:40:29 -0400
Subject: [PATCH 124/161] [Android] Reverted proguard rule for
 BottomSheetBehavior

---
 android/java/proguard.flags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/android/java/proguard.flags b/android/java/proguard.flags
index 7f7c47fd8aea..ef39801aff5b 100644
--- a/android/java/proguard.flags
+++ b/android/java/proguard.flags
@@ -9,3 +9,5 @@
     <methods>;
 }
 -keepattributes JavascriptInterface
+
+-keep class com.google.android.material.bottomsheet.BottomSheetBehavior { *; }

From 0b99a2a626f1813288fcafd776aaf5de64bd51c3 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 13 May 2020 14:39:00 -0400
Subject: [PATCH 125/161] [Linux] dist BUILDDIR -> OUTPUTDIR

Chromium change:

https://chromium.googlesource.com/chromium/src/+/70e8efce87a2610ffbbe2ee3661e0ca01470ce6b

commit 70e8efce87a2610ffbbe2ee3661e0ca01470ce6b
Author: Olivier Tilloy <olivier.tilloy@canonical.com>
Date:   Wed Apr 1 22:13:03 2020 +0000

    Initial integration of snap packaging.

    This adds logic to the linux_package template to generate a snap
    package from build artifacts, similar to what is done for .deb and
    .rpm packages.

    BUG=1055026
---
 .../installer/linux/common/brave-browser/chromium-browser.info  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chromium_src/chrome/installer/linux/common/brave-browser/chromium-browser.info b/chromium_src/chrome/installer/linux/common/brave-browser/chromium-browser.info
index 18e6f322356b..bce607074643 100644
--- a/chromium_src/chrome/installer/linux/common/brave-browser/chromium-browser.info
+++ b/chromium_src/chrome/installer/linux/common/brave-browser/chromium-browser.info
@@ -27,5 +27,5 @@ FULLDESC="Browse faster by blocking ads and trackers that violate your privacy a
 MAINTNAME="Brave Software"
 MAINTMAIL="support@brave.com"
 PRODUCTURL="https://brave.com/"
-VERSION=$(cat $BUILDDIR/version | tr -d 'v,')
+VERSION=$(cat $OUTPUTDIR/version | tr -d 'v,')
 VERSIONFULL=$VERSION

From b2b3cfb46e58a00f3f098121441ceedb4025b2dd Mon Sep 17 00:00:00 2001
From: Max Karolinskiy <max@brave.com>
Date: Thu, 14 May 2020 13:01:32 -0400
Subject: [PATCH 126/161] Upgrade patches from Chromium 83.0.4103.44 to
 Chromium 83.0.4103.56.

---
 patches/chrome-VERSION.patch                         |  4 ++--
 ...gs-site_settings_page-site_settings_page.js.patch | 12 ++++++------
 ...-ui-views-profiles-avatar_toolbar_button.cc.patch |  4 ++--
 ...hn-chrome_authenticator_request_delegate.cc.patch |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index 832c3526d660..53b1e6fb8253 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 0a529909cfa4a99e606604cda02e4b9652dfc23b..07878a76f30272f543bc3710d4392b406590b20d 100644
+index 42886fa8b091963f03835c8ceadb1343d5e087b2..897ec3948ad8133cf5238d35803537469346f474 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=83
 -MINOR=0
 -BUILD=4103
--PATCH=44
+-PATCH=56
 +MINOR=1
 +BUILD=11
 +PATCH=28
diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
index 1076edddb3ca..6b9bfb365abc 100644
--- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
+++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
-index c02b2e5edea29fda05324be17e9b229d977f55f2..d4df50138cbbb0233ebc03a39af7918a86ca8a96 100644
+index 15cbc1bd0ebe97c497287723fb883056f61f9db4..3a638f1900996c1af3f7f4a60c4626825f223d7e 100644
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
 @@ -27,6 +27,7 @@
@@ -42,7 +42,7 @@ index c02b2e5edea29fda05324be17e9b229d977f55f2..d4df50138cbbb0233ebc03a39af7918a
        {
          route: settings.routes.SITE_SETTINGS_BLUETOOTH_DEVICES,
          id: Id.BLUETOOTH_DEVICES,
-@@ -339,13 +351,15 @@
+@@ -337,13 +349,15 @@
                  Id.MIC,
                  Id.SENSORS,
                  Id.NOTIFICATIONS,
@@ -59,7 +59,7 @@ index c02b2e5edea29fda05324be17e9b229d977f55f2..d4df50138cbbb0233ebc03a39af7918a
                  Id.AUTOMATIC_DOWNLOADS,
                  Id.UNSANDBOXED_PLUGINS,
                  Id.PROTOCOL_HANDLERS,
-@@ -376,7 +390,9 @@
+@@ -372,7 +386,9 @@
                Id.CAMERA,
                Id.MIC,
                Id.NOTIFICATIONS,
@@ -69,7 +69,7 @@ index c02b2e5edea29fda05324be17e9b229d977f55f2..d4df50138cbbb0233ebc03a39af7918a
              ]),
              permissionsAdvanced: buildItemListFromIds([
                Id.SENSORS,
-@@ -396,6 +412,7 @@
+@@ -392,6 +408,7 @@
                Id.VR,
              ]),
              contentBasic: buildItemListFromIds([
@@ -77,7 +77,7 @@ index c02b2e5edea29fda05324be17e9b229d977f55f2..d4df50138cbbb0233ebc03a39af7918a
                Id.COOKIES,
                Id.JAVASCRIPT,
                Id.PLUGINS,
-@@ -404,7 +421,9 @@
+@@ -400,7 +417,9 @@
              ]),
              contentAdvanced: buildItemListFromIds([
                Id.SOUND,
@@ -86,4 +86,4 @@ index c02b2e5edea29fda05324be17e9b229d977f55f2..d4df50138cbbb0233ebc03a39af7918a
 +*/
                Id.ZOOM_LEVELS,
                'pdfDocuments',
-               // <if expr="chromeos">
+               Id.PROTECTED_CONTENT,
diff --git a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch
index c1fed987b8a3..28494977f764 100644
--- a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch
+++ b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
-index faf1d11d84ca5fbb7f6217ec134a4276c794ed88..5293bf388f51cc308619852040cfb3ec24c5eb59 100644
+index 16da25f6a12ad0e5fd657a07f8adf3bd34f4620b..8f048c8834563019f90b1a6ad44ce6c979437ea6 100644
 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
 +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
-@@ -208,6 +208,7 @@ void AvatarToolbarButton::OnHighlightChanged() {
+@@ -220,6 +220,7 @@ void AvatarToolbarButton::OnHighlightChanged() {
  }
  
  base::string16 AvatarToolbarButton::GetAvatarTooltipText() const {
diff --git a/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch b/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch
index 93935d925d2d..3ec4ecf5a391 100644
--- a/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch
+++ b/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-index d5697d1cdace1539f34d4398588a17416ade9957..e012c34f16d7eb27452aac291025eacd0cbd134e 100644
+index f7612e1f98b3c6a542d4eac27aeeaa82bfa6e051..a33b02b571daa88c5c4fc46bd2e2c0f4e5168602 100644
 --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
 +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -376,6 +376,7 @@ std::string TouchIdMetadataSecret(Profile* profile) {
+@@ -377,6 +377,7 @@ std::string TouchIdMetadataSecret(Profile* profile) {
  ChromeAuthenticatorRequestDelegate::TouchIdAuthenticatorConfig
  ChromeAuthenticatorRequestDelegate::TouchIdAuthenticatorConfigForProfile(
      Profile* profile) {

From 4faad988468d7fd8a8a13eb301f45bcb658db7a1 Mon Sep 17 00:00:00 2001
From: Kyle Hickinson <git@kylehickinson.com>
Date: Thu, 14 May 2020 21:15:00 -0400
Subject: [PATCH 127/161] [iOS] Fixes iOS build (gen_model_wrapper).

Chromium changes:

https://chromium.googlesource.com/chromium/src/+/90b95abb9b18974c90ddba4c638dd7cefd4feae7

commit 90b95abb9b18974c90ddba4c638dd7cefd4feae7
Author: Ken Rockot <rockot@google.com>
Date:   Thu Apr 2 20:07:29 2020 +0000

    Extract mojom parser from bindings generator

    This extracts the mojom parsing logic from mojom_bindings_generator.py
    into a new mojom_parser.py script within the mojom tool directory.

    Apart from simply moving the parsing logic to a new script, this also
    changes how the parse result is persisted by an intermediate build step
    for subsequent build steps to consume.

    Prior to this change, the parsing step emitted a ".p" file for each
    processed .mojom file. This was nothing more than a serialized version
    of the parsed AST with [EnableIf] feature filtering applied. Every
    subsequent step for the mojom in question would load this AST, then
    recursively process its import dependencies while loading their ASTs in
    turn, before finally processing all of the aggregated data (resolving
    references, computing field packing data, etc) to produce a Module
    object suitable for bindings generation.

    This CL rolls most of that processing into the parsing step (with more
    to follow in future CLs), and the resulting computed Module object is
    persisted to a ".mojom-module" file.

    To generate bindings for a given .mojom file, the generator can simply
    call Module.Load() on the corresponding .mojom-module produced by the
    parser. The loaded Module is sufficient to inform code generation
    with no need to resolve dependencies, process other modules, or
    perform other complex computations on the model.

    Each mojom-module is thus entirely self-contained, replicating the full
    contents of all transitive import dependencies. This means the build
    consumes more disk space with intermediate build artifacts, but it
    also means generation steps are faster and simpler.

    This CL should result in no net changes to the final build outputs.

    Bug: 1060471

https://chromium.googlesource.com/chromium/src/+/77cb7c1e2a6250342e3b9349fd0d1f02eb676032

commit 77cb7c1e2a6250342e3b9349fd0d1f02eb676032
Author: Ken Rockot <rockot@google.com>
Date:   Fri Mar 13 03:19:49 2020 +0000

    Fix mojom parser tests

    This fixes all the existing mojom parser tests that are still meaningful
    and applicable and deletes the rest. This also fixes or (where
    appropriate) disables any outstanding pylint issues in these flies.

    The tests can be run locally with:

      python -m unittest discover \
          -s mojo/public/tools/mojom/ -p "*_unittest.py"

    A follow-up CL will introduce a general-purpose script for registering
    and running all Python-based tests related to Mojo tools so that they
    can run on the CQ as well.

    Bug: 1060473
---
 vendor/brave-ios/BUILD.gn                     |  6 +--
 .../scripts/mojo/gen_model_wrappers.py        | 42 ++++---------------
 .../scripts/mojo/mojom_objc_generator.py      |  1 +
 .../mojo/objc_templates/module+private.h.tmpl |  4 +-
 .../mojo/objc_templates/module.mm.tmpl        |  2 +-
 5 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/vendor/brave-ios/BUILD.gn b/vendor/brave-ios/BUILD.gn
index f9a859ce7127..8702d4750f04 100644
--- a/vendor/brave-ios/BUILD.gn
+++ b/vendor/brave-ios/BUILD.gn
@@ -230,10 +230,10 @@ action("compile_coredata") {
 
 action("mojo_gen_wrappers") {
   script = "scripts/mojo/gen_model_wrappers.py"
-  pickled_ast = rebase_path("$root_gen_dir/brave/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.p")
+  mojom_module = rebase_path("$root_gen_dir/brave/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom-module")
   mojom_idl = rebase_path("//brave/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom")
   inputs = [
-    pickled_ast,
+    mojom_module,
     mojom_idl,
     "scripts/mojo/mojom_objc_generator.py",
     "scripts/mojo/objc_templates/enum.tmpl",
@@ -252,7 +252,7 @@ action("mojo_gen_wrappers") {
   ]
   output_dir = rebase_path(target_gen_dir)
   args = [
-    "--pickled-ast=$pickled_ast",
+    "--mojom-module=$mojom_module",
     "--module-include-path=bat/ledger/public/interfaces",
     "--mojom-file=$mojom_idl",
     "--output-dir=$output_dir",
diff --git a/vendor/brave-ios/scripts/mojo/gen_model_wrappers.py b/vendor/brave-ios/scripts/mojo/gen_model_wrappers.py
index d00e851d73c6..846dbea016db 100644
--- a/vendor/brave-ios/scripts/mojo/gen_model_wrappers.py
+++ b/vendor/brave-ios/scripts/mojo/gen_model_wrappers.py
@@ -2,47 +2,20 @@
 
 import argparse
 
-try:
-  import cPickle as pickle
-except ImportError:
-  import pickle
-
 import importlib
 import os
 import sys
 
 _current_dir = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(1, os.path.join(_current_dir, *([os.pardir] * 5 + ['mojo/public/tools/bindings/pylib'])))
+sys.path.insert(1, os.path.join(_current_dir, *([os.pardir] * 5 + ['mojo/public/tools/mojom'])))
 
 import mojom.fileutil as fileutil
-import mojom.generate.generator as generator
 from mojom.generate import template_expander
-from mojom.generate import translate
-
-def _UnpickleAST(input_file):
-  try:
-    with open(input_file, "rb") as f:
-      return pickle.load(f)
-  except (IOError, pickle.UnpicklingError) as e:
-    print("%s: Error: %s" % (input_file, str(e)))
-    sys.exit(1)
-
-def _GenerateModule(tree, module_path):
-  imports = {}
-  for parsed_imp in tree.import_list:
-    filename = parsed_imp.import_filename
-    print("imported file " + filename)
-    import_tree = _UnpickleAST(os.path.join(ast_root_dir, os.path.splitext(os.path.basename(parsed_imp.import_filename))[0] + '.p'))
-    imports[filename] = _GenerateModule(import_tree, filename)
-  # Set the module path as relative to the source root.
-  # Normalize to unix-style path here to keep the generators simpler.
-  # module_path = rel_filename.relative_path().replace('\\', '/')
-  path = os.path.basename(module_path)
-  return translate.OrderedModule(tree, path, imports)
+from mojom.generate.module import Module
 
 def parse_args():
   parser = argparse.ArgumentParser(description='Generate Obj-C files from mojo definitions')
-  parser.add_argument('--pickled-ast', nargs=1)
+  parser.add_argument('--mojom-module', nargs=1)
   parser.add_argument('--module-include-path', nargs=1)
   parser.add_argument('--mojom-file', nargs=1)
   parser.add_argument('--output-dir', nargs=1)
@@ -52,14 +25,12 @@ def main():
   global ast_root_dir
 
   args = parse_args()
-  pickled_ast = args.pickled_ast[0]
+  mojom_module = args.mojom_module[0]
   module_include_path = args.module_include_path[0]
-  mojom_file = args.mojom_file[0]
   output_dir = args.output_dir[0]
 
-  ast_root_dir = os.path.dirname(pickled_ast)
+  ast_root_dir = os.path.dirname(mojom_module)
 
-  tree = _UnpickleAST(pickled_ast)
   generator_module = importlib.import_module('mojom_objc_generator')
   bytecode_path = os.path.join(output_dir, "objc_templates_bytecode")
   fileutil.EnsureDirectoryExists(bytecode_path)
@@ -68,7 +39,8 @@ def main():
   generator = generator_module.Generator(None)
   generator.bytecode_path = bytecode_path
   generator.module_include_path = module_include_path
-  generator.module = _GenerateModule(tree, mojom_file)
+  with open(mojom_module, 'rb') as f:
+    generator.module = Module.Load(f)
   generator.GenerateFiles(output_dir)
 
 if __name__ == "__main__":
diff --git a/vendor/brave-ios/scripts/mojo/mojom_objc_generator.py b/vendor/brave-ios/scripts/mojo/mojom_objc_generator.py
index 98b182e27b84..df768dd3a0c5 100644
--- a/vendor/brave-ios/scripts/mojo/mojom_objc_generator.py
+++ b/vendor/brave-ios/scripts/mojo/mojom_objc_generator.py
@@ -321,6 +321,7 @@ def _GetJinjaExports(self):
       "interfaces": self.module.interfaces,
       "kinds": self.module.kinds,
       "module": self.module,
+      "module_name": os.path.basename(self.module.path),
       "module_include_path": self.module_include_path,
       "cpp_namespace": self._CppNamespace(),
       "class_prefix": self.class_prefix,
diff --git a/vendor/brave-ios/scripts/mojo/objc_templates/module+private.h.tmpl b/vendor/brave-ios/scripts/mojo/objc_templates/module+private.h.tmpl
index 6e4269480d4c..500d4d499e78 100644
--- a/vendor/brave-ios/scripts/mojo/objc_templates/module+private.h.tmpl
+++ b/vendor/brave-ios/scripts/mojo/objc_templates/module+private.h.tmpl
@@ -4,8 +4,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #import <Foundation/Foundation.h>
-#import "{{module.path}}.objc.h"
-#import "{{module_include_path}}/{{module.path}}.h"
+#import "{{module_name}}.objc.h"
+#import "{{module_include_path}}/{{module_name}}.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
diff --git a/vendor/brave-ios/scripts/mojo/objc_templates/module.mm.tmpl b/vendor/brave-ios/scripts/mojo/objc_templates/module.mm.tmpl
index 151fd7d7c65a..92e4582b7a98 100644
--- a/vendor/brave-ios/scripts/mojo/objc_templates/module.mm.tmpl
+++ b/vendor/brave-ios/scripts/mojo/objc_templates/module.mm.tmpl
@@ -4,7 +4,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #import <Foundation/Foundation.h>
-#import "{{module.path}}.objc+private.h"
+#import "{{module_name}}.objc+private.h"
 #import "CppTransformations.h"
 #import "base/containers/flat_map.h"
 

From 1ddc6866d239938293d71c75df105f70e201a29f Mon Sep 17 00:00:00 2001
From: Max Karolinskiy <max@brave.com>
Date: Mon, 18 May 2020 10:55:04 -0400
Subject: [PATCH 128/161] iOS XCode 11.3.1 build error workaround.

---
 .../net/url_request/url_request_test_job.cc    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 chromium_src/net/url_request/url_request_test_job.cc

diff --git a/chromium_src/net/url_request/url_request_test_job.cc b/chromium_src/net/url_request/url_request_test_job.cc
new file mode 100644
index 000000000000..bf6cb35f3003
--- /dev/null
+++ b/chromium_src/net/url_request/url_request_test_job.cc
@@ -0,0 +1,18 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+// When building for iOS with XCode 11.3.1 the build fails because Erase is
+// declared and defined earlier than EraseIf that's used in Erase. Putting a
+// forward declaration here helps get around that. XCode 11.4.1 doesn't have
+// this problem.
+#include <list>
+
+namespace base {
+template <class T, class Allocator, class Predicate>
+size_t EraseIf(std::list<T, Allocator>& container, Predicate pred);  // NOLINT
+}  // namespace base
+#include "base/stl_util.h"
+
+#include "../../../../net/url_request/url_request_test_job.cc"

From f22282acabe73163a038711eb877f33004a5742e Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Mon, 18 May 2020 13:36:40 -0400
Subject: [PATCH 129/161] Upgrade patches from Chromium 83.0.4103.56 to
 Chromium 83.0.4103.61.

---
 patches/chrome-VERSION.patch                                  | 4 ++--
 ...-chromium-chrome-browser-toolbar-ToolbarManager.java.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index 53b1e6fb8253..c9749b6c5142 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 42886fa8b091963f03835c8ceadb1343d5e087b2..897ec3948ad8133cf5238d35803537469346f474 100644
+index 07080fbf46a01d484563f39453de329026005e74..1179402dd3ae70fd77377a3a1e56f77546789ff2 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=83
 -MINOR=0
 -BUILD=4103
--PATCH=56
+-PATCH=61
 +MINOR=1
 +BUILD=11
 +PATCH=28
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
index b93aac2900a7..2537a4d38ff7 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-index 2430766283e8008369b502b920a37687cc098f48..0cf2602a27cb6553d35c73035f0c3aee825ecf20 100644
+index 20fc3bd3c8b392ea43fa95b9c09c2080ad1de32a..c3a06bd2ab69d1c87d8fa8c8c7646e7fb3f59813 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -1671,6 +1671,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
+@@ -1672,6 +1672,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
          boolean editingAllowed = currentTab == null || mBookmarkBridge == null
                  || mBookmarkBridge.isEditBookmarksEnabled();
          mToolbar.updateBookmarkButton(isBookmarked, editingAllowed);

From daff413b412ad5039a5af4e65d2fd84610f06d26 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 13 May 2020 11:43:50 -0400
Subject: [PATCH 130/161] Lint fixes

---
 .../brave_spelling_menu_observer_browsertest.cc          | 5 +++--
 .../ui/views/tabs/brave_browser_tab_strip_controller.cc  | 2 ++
 .../browser/permissions/permission_manager_factory.cc    | 3 ++-
 chromium_src/chrome/browser/profiles/profile_manager.h   | 5 +++++
 .../install_static/brave_install_details_unittest.cc     | 4 ++--
 .../chrome/install_static/chromium_install_modes.h       | 9 +++++----
 chromium_src/chrome/installer/setup/install_worker.cc    | 2 +-
 .../core/browser/content_settings_registry.cc            | 4 ++--
 .../weblayer/renderer/content_renderer_client_impl.cc    | 7 ++++---
 test/base/brave_test_launcher_delegate.cc                | 3 ++-
 10 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc b/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc
index 52de431bc92b..2bc680cf9c6e 100644
--- a/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc
+++ b/browser/renderer_context_menu/brave_spelling_menu_observer_browsertest.cc
@@ -1,4 +1,5 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
@@ -40,7 +41,7 @@ class BraveSpellingMenuObserverTest : public InProcessBrowserTest {
     observer_.reset(new SpellingMenuObserver(menu_.get()));
     menu_->SetObserver(observer_.get());
     // Uncomment to print the menu to standard output for each test.
-    //menu_->EnablePrintMenu();
+    // menu_->EnablePrintMenu();
   }
 
   void InitMenu(const char* word, const char* suggestion) {
diff --git a/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc b/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc
index c2c18b34a5ce..48f3d8ee3884 100644
--- a/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc
+++ b/browser/ui/views/tabs/brave_browser_tab_strip_controller.cc
@@ -5,6 +5,8 @@
 
 #include "brave/browser/ui/views/tabs/brave_browser_tab_strip_controller.h"
 
+#include <utility>
+
 #include "brave/browser/ui/views/tabs/brave_tab_context_menu_contents.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
diff --git a/chromium_src/chrome/browser/permissions/permission_manager_factory.cc b/chromium_src/chrome/browser/permissions/permission_manager_factory.cc
index f9e8b48651c9..4913e9292e74 100644
--- a/chromium_src/chrome/browser/permissions/permission_manager_factory.cc
+++ b/chromium_src/chrome/browser/permissions/permission_manager_factory.cc
@@ -30,7 +30,8 @@ BraveCreatePermissionContexts(Profile* profile) {
 }  // namespace
 
 #define BuildServiceInstanceFor BuildServiceInstanceFor_ChromiumImpl
-#define GeolocationPermissionContextDelegate BraveGeolocationPermissionContextDelegate
+#define GeolocationPermissionContextDelegate \
+  BraveGeolocationPermissionContextDelegate
 #include "../../../../../chrome/browser/permissions/permission_manager_factory.cc"
 #undef GeolocationPermissionContextDelegate
 #undef BuildServiceInstanceFor
diff --git a/chromium_src/chrome/browser/profiles/profile_manager.h b/chromium_src/chrome/browser/profiles/profile_manager.h
index 9f243297c169..36022fae60f0 100644
--- a/chromium_src/chrome/browser/profiles/profile_manager.h
+++ b/chromium_src/chrome/browser/profiles/profile_manager.h
@@ -3,6 +3,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
+#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
+
 #define GetLastUsedProfileName virtual GetLastUsedProfileName
 #define InitProfileUserPrefs virtual InitProfileUserPrefs
 #define DoFinalInitForServices virtual DoFinalInitForServices
@@ -21,3 +24,5 @@
 #undef DoFinalInitForServices
 #undef InitProfileUserPrefs
 #undef GetLastUsedProfileName
+
+#endif  // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
diff --git a/chromium_src/chrome/install_static/brave_install_details_unittest.cc b/chromium_src/chrome/install_static/brave_install_details_unittest.cc
index ce540c75a638..51067c9e5404 100644
--- a/chromium_src/chrome/install_static/brave_install_details_unittest.cc
+++ b/chromium_src/chrome/install_static/brave_install_details_unittest.cc
@@ -57,8 +57,8 @@ class FakeInstallDetails : public InstallDetails {
 TEST(InstallDetailsTest, GetClientStateKeyPath) {
   FakeInstallDetails details;
 #if defined(OFFICIAL_BUILD)
-    EXPECT_THAT(details.GetClientStateKeyPath(),
-                StrEq(L"Software\\BraveSoftware\\Update\\ClientState\\testguid"));
+  EXPECT_THAT(details.GetClientStateKeyPath(),
+              StrEq(L"Software\\BraveSoftware\\Update\\ClientState\\testguid"));
 #else
     EXPECT_THAT(details.GetClientStateKeyPath(),
                 StrEq(std::wstring(L"Software\\").append(kProductPathName)));
diff --git a/chromium_src/chrome/install_static/chromium_install_modes.h b/chromium_src/chrome/install_static/chromium_install_modes.h
index 8c717f9560c3..65dd61465e80 100644
--- a/chromium_src/chrome/install_static/chromium_install_modes.h
+++ b/chromium_src/chrome/install_static/chromium_install_modes.h
@@ -1,11 +1,12 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Brand-specific types and constants for Google Chrome.
 
-#ifndef CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
-#define CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
+#ifndef BRAVE_CHROMIUM_SRC_CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
+#define BRAVE_CHROMIUM_SRC_CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
 
 namespace install_static {
 
@@ -25,4 +26,4 @@ enum InstallConstantIndex {
 
 }  // namespace install_static
 
-#endif  // CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
+#endif  // BRAVE_CHROMIUM_SRC_CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
diff --git a/chromium_src/chrome/installer/setup/install_worker.cc b/chromium_src/chrome/installer/setup/install_worker.cc
index 219be55c6ddd..590018eb923e 100644
--- a/chromium_src/chrome/installer/setup/install_worker.cc
+++ b/chromium_src/chrome/installer/setup/install_worker.cc
@@ -14,4 +14,4 @@
 
 #if defined(OFFICIAL_BUILD)
 #undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
-#endif
\ No newline at end of file
+#endif
diff --git a/chromium_src/components/content_settings/core/browser/content_settings_registry.cc b/chromium_src/components/content_settings/core/browser/content_settings_registry.cc
index a8720b092ba1..0eafedd2373c 100644
--- a/chromium_src/components/content_settings/core/browser/content_settings_registry.cc
+++ b/chromium_src/components/content_settings/core/browser/content_settings_registry.cc
@@ -66,8 +66,8 @@
              ContentSettingsInfo::INHERIT_IN_INCOGNITO,                        \
              ContentSettingsInfo::PERSISTENT,                                  \
              ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);  \
-    /* We need 62, 63, 64 for ContentSettingsTypes for Android tabs            \
-     * migration*/                                                             \
+    /* We need 62, 63, 64 for ContentSettingsTypes for Android tabs */         \
+    /* migration*/                                                             \
     /* We read only from these settings*/                                      \
     Register(                                                                  \
         static_cast<ContentSettingsType>(62), "desktop-view",                  \
diff --git a/chromium_src/weblayer/renderer/content_renderer_client_impl.cc b/chromium_src/weblayer/renderer/content_renderer_client_impl.cc
index cc41b4466764..fe4323aef0e9 100644
--- a/chromium_src/weblayer/renderer/content_renderer_client_impl.cc
+++ b/chromium_src/weblayer/renderer/content_renderer_client_impl.cc
@@ -10,9 +10,10 @@
 #include "third_party/widevine/cdm/buildflags.h"
 
 // In components/cdm/renderer/android_key_systems.h the declaration of
-// AddAndroidWidevine is guarded by ENABLE_WIDEVINE, but in content_renderer_client_impl below
-// it is used without a guard. Instead of patching we can add an empty
-// definition of the same function here for when ENABLE_WIDEVINE is not true.
+// AddAndroidWidevine is guarded by ENABLE_WIDEVINE, but in
+// content_renderer_client_impl below it is used without a guard. Instead of
+// patching we can add an empty definition of the same function here for when
+// ENABLE_WIDEVINE is not true.
 
 #if !BUILDFLAG(ENABLE_WIDEVINE)
 namespace cdm {
diff --git a/test/base/brave_test_launcher_delegate.cc b/test/base/brave_test_launcher_delegate.cc
index 0005abf93aaa..56fac1c800e3 100644
--- a/test/base/brave_test_launcher_delegate.cc
+++ b/test/base/brave_test_launcher_delegate.cc
@@ -1,4 +1,5 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 

From f3524b83d7dcc617aae0a240490df6f71903a87e Mon Sep 17 00:00:00 2001
From: Max Karolinskiy <max@brave.com>
Date: Wed, 13 May 2020 12:10:34 -0400
Subject: [PATCH 131/161] Lint fixes II.

---
 common/render_messages.h        | 1 +
 content/common/frame_messages.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/common/render_messages.h b/common/render_messages.h
index e730a2136c3c..37e13ab4777d 100644
--- a/common/render_messages.h
+++ b/common/render_messages.h
@@ -1,3 +1,4 @@
+// NOLINT(build/header_guard)
 /* Copyright 2019 The Brave Authors. All rights reserved.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index ff115f9bac03..7f26ba52e52f 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h
@@ -1,3 +1,4 @@
+// NOLINT(build/header_guard)
 /* Copyright 2019 The Brave Authors. All rights reserved.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,

From b7be5c2ca8ea613d57e59fe76d1278a83bbf0446 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 3 Apr 2020 17:56:59 -0400
Subject: [PATCH 132/161] Updated strings for Chromium 83.0.4103.14.

---
 app/brave_strings.grd                         |   31 +
 app/extensions_strings.grdp                   |    6 -
 app/generated_resources.grd                   |  661 ++--
 app/os_settings_search_tag_strings.grdp       |   39 +
 app/os_settings_strings.grdp                  | 2499 ++++++++++++-
 app/printing_strings.grdp                     |    5 +-
 app/settings_brave_strings.grdp               |   25 +-
 app/settings_strings.grdp                     | 3172 +++--------------
 app/shared_settings_strings.grdp              |  254 ++
 app/web_time_limit_error_page_strings.grdp    |    4 +-
 .../strings/android_chrome_strings.grd        |  246 +-
 components/autofill_strings.grdp              |    4 +-
 components/components_brave_strings.grd       |    1 +
 components/components_settings_strings.grdp   |    3 +
 components/components_strings.grd             |    4 +-
 components/crash_strings.grdp                 |   46 +-
 components/dom_distiller_strings.grdp         |   27 +-
 components/flags_strings.grdp                 |    4 +-
 ...s.grdp => javascript_dialogs_strings.grdp} |    0
 components/management_strings.grdp            |   23 +-
 components/new_or_sad_tab_strings.grdp        |    6 +-
 components/omnibox_strings.grdp               |    9 +
 components/page_info_strings.grdp             |   89 +-
 components/password_manager_strings.grdp      |    9 +
 components/payments_strings.grdp              |    6 +
 components/pdf_strings.grdp                   |   17 +-
 components/permissions_strings.grdp           |  137 +
 components/policy_strings.grdp                |   20 +-
 .../security_interstitials_strings.grdp       |   25 +-
 29 files changed, 4210 insertions(+), 3162 deletions(-)
 create mode 100644 app/os_settings_search_tag_strings.grdp
 create mode 100644 app/shared_settings_strings.grdp
 rename components/{app_modal_strings.grdp => javascript_dialogs_strings.grdp} (100%)
 create mode 100644 components/permissions_strings.grdp

diff --git a/app/brave_strings.grd b/app/brave_strings.grd
index 210b84f41ebf..7ac4846153a3 100644
--- a/app/brave_strings.grd
+++ b/app/brave_strings.grd
@@ -159,6 +159,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
     <file path="resources/chromium_strings_sl.xtb" lang="sl" />
     <file path="resources/chromium_strings_sq.xtb" lang="sq" />
     <file path="resources/chromium_strings_sr.xtb" lang="sr" />
+    <file path="resources/chromium_strings_sr-Latn.xtb" lang="sr-Latn" />
     <file path="resources/chromium_strings_sv.xtb" lang="sv" />
     <file path="resources/chromium_strings_sw.xtb" lang="sw" />
     <file path="resources/chromium_strings_ta.xtb" lang="ta" />
@@ -231,6 +232,24 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
           Brave - <ph name="PAGE_TITLE">$1<ex>Brave</ex></ph>
         </message>
       </if>
+      <if expr="not chromeos and not is_macosx">
+        <!-- Captive Portal Browser Window Title Format -->
+        <message name="IDS_CAPTIVE_PORTAL_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in captive portal popup windows">
+          <ph name="PAGE_TITLE">$1<ex>Brave</ex></ph> - Network Sign-in - Brave
+        </message>
+      </if>
+      <if expr="chromeos">
+        <!-- Captive Portal Browser Window Title Format -->
+        <message name="IDS_CAPTIVE_PORTAL_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in captive portal popup windows">
+          Brave - Network Sign-in - <ph name="PAGE_TITLE">$1<ex>Brave</ex></ph>
+        </message>
+      </if>
+      <if expr="is_macosx">
+        <!-- Captive Portal Browser Window Title Format -->
+        <message name="IDS_CAPTIVE_PORTAL_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in captive portal popup windows">
+          <ph name="PAGE_TITLE">$1<ex>Brave</ex></ph> - Network Sign-in
+        </message>
+      </if>
       <!-- Accessible window title format - includes the channel, and the same
            on all browser platforms rather than different on Chrome OS. -->
       <message name="IDS_ACCESSIBLE_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for the accessible name of a tabbed browser window">
@@ -363,6 +382,12 @@ Brave is unable to recover your settings.
         <message name="IDS_PASSWORDS_PAGE_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before revealing plaintext passwords on the password page.">
           Brave is trying to show passwords.
         </message>
+        <message name="IDS_PASSWORDS_PAGE_COPY_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before copying plaintext passwords into the clipboard.">
+          Brave is trying to copy passwords.
+        </message>
+        <message name="IDS_PASSWORDS_PAGE_EDIT_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before editing plaintext passwords on the password page.">
+          Brave is trying to edit passwords.
+        </message>
         <message name="IDS_PASSWORDS_PAGE_EXPORT_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before exporting passwords to a file.">
           Brave wants to export your passwords.
         </message>
@@ -371,6 +396,12 @@ Brave is unable to recover your settings.
         <message name="IDS_PASSWORDS_PAGE_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before revealing plaintext passwords on the password page.">
           Brave is trying to show passwords. Type your Windows password to allow this.
         </message>
+        <message name="IDS_PASSWORDS_PAGE_COPY_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before copying plaintext passwords into the clipboard.">
+          Brave is trying to copy passwords. Type your Windows password to allow this.
+        </message>
+        <message name="IDS_PASSWORDS_PAGE_EDIT_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before editing plaintext passwords on the password page.">
+          Brave is trying to edit passwords. Type your Windows password to allow this.
+        </message>
         <message name="IDS_PASSWORDS_PAGE_EXPORT_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before exporting passwords to a file.">
           Brave wants to export your passwords. Type your Windows password to allow this.
         </message>
diff --git a/app/extensions_strings.grdp b/app/extensions_strings.grdp
index 64a0cc8300da..e83719046b55 100644
--- a/app/extensions_strings.grdp
+++ b/app/extensions_strings.grdp
@@ -17,15 +17,9 @@
   <message name="IDS_EXTENSIONS_BACKGROUND_PAGE" desc="Display name for an autogenerated background page.">
     background page
   </message>
-  <message name="IDS_EXTENSIONS_DISABLED_BLOCKED_MATURE" desc="The tooltip displayed when the extension is blocked due to mature content for child users.">
-    This is blocked due to mature content.
-  </message>
   <message name="IDS_EXTENSIONS_CORRUPTED_EXTENSION" desc="The warning for the user that an extension may have been tampered with on disk.">
     This extension may have been corrupted.
   </message>
-  <message name="IDS_EXTENSIONS_ENABLE_BUTTON" desc="The text displayed on the enable button when the extension is disabled pending custodian approval on the chrome://extensions page">
-    Enable
-  </message>
   <message name="IDS_EXTENSIONS_ENABLE_ERROR_COLLECTION" desc="The checkbox for enabling error collection for an extension.">
     Collect errors
   </message>
diff --git a/app/generated_resources.grd b/app/generated_resources.grd
index a64cf2392f6c..543a99cf5c77 100644
--- a/app/generated_resources.grd
+++ b/app/generated_resources.grd
@@ -249,6 +249,7 @@ are declared in tools/grit/grit_rule.gni.
     <file path="resources/generated_resources_sl.xtb" lang="sl" />
     <file path="resources/generated_resources_sq.xtb" lang="sq" />
     <file path="resources/generated_resources_sr.xtb" lang="sr" />
+    <file path="resources/generated_resources_sr-Latn.xtb" lang="sr-Latn" />
     <file path="resources/generated_resources_sv.xtb" lang="sv" />
     <file path="resources/generated_resources_sw.xtb" lang="sw" />
     <file path="resources/generated_resources_ta.xtb" lang="ta" />
@@ -285,11 +286,13 @@ are declared in tools/grit/grit_rule.gni.
       <if expr="chromeos">
         <part file="chromeos_strings.grdp" />
         <part file="os_settings_strings.grdp" />
+        <part file="os_settings_search_tag_strings.grdp" />
       </if>
 
       <!-- Settings specific strings -->
       <if expr="not is_android">
         <part file="settings_strings.grdp" />
+        <part file="shared_settings_strings.grdp" />
       </if>
 
       <!-- MD Extensions specific strings -->
@@ -360,23 +363,19 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_PERMISSIONS_BUBBLE_PROMPT" desc="The label that is used to introduce permission request details to the user in a popup.">
         <ph name="SITE_NAME">$1<ex>google.com</ex></ph> wants to
       </message>
-      <message name="IDS_PERMISSION_ALLOW" desc="Label on button to allow a permissions request.">
-        Allow
+      <message name="IDS_PERMISSIONS_BUBBLE_PROMPT_ACCESSIBLE_TITLE_ONE_PERM" desc="The label that is read by a screen reader to describe the permissions prompt bubble. This will be followed by the short name of a single permission.">
+        <ph name="SITE_NAME">$1<ex>google.com</ex></ph> wants to: <ph name="PERMISSION">$2<ex>use your microphone</ex></ph>
       </message>
-      <message name="IDS_PERMISSION_DENY" desc="Label on button to deny a permissions request.">
-        Block
+      <message name="IDS_PERMISSIONS_BUBBLE_PROMPT_ACCESSIBLE_TITLE_TWO_PERMS" desc="The label that is read by a screen reader to describe the permissions prompt bubble. This will be followed by the short names of two permissions.">
+        <ph name="SITE_NAME">$1<ex>google.com</ex></ph> wants to: <ph name="FIRST_PERMISSION">$2<ex>use your microphone</ex></ph> and <ph name="SECOND_PERMISSION">$3<ex>use your location</ex></ph>
+      </message>
+      <message name="IDS_PERMISSIONS_BUBBLE_PROMPT_ACCESSIBLE_TITLE_TWO_PERMS_MORE" desc="The label that is read by a screen reader to describe the permissions prompt bubble. This will be followed by the short names of two permissions, then an &quot;and more&quot; descriptive text indicating that the dialog's body contains the entire list of requested permissions.">
+        <ph name="SITE_NAME">$1<ex>google.com</ex></ph> wants to: <ph name="FIRST_PERMISSION">$2<ex>use your microphone</ex></ph>, <ph name="SECOND_PERMISSION">$3<ex>use your location</ex></ph>, and more
       </message>
       <message name="IDS_PERMISSION_CUSTOMIZE" desc="Label on text button to allow the user to customize a permissions request.">
         Customize
       </message>
 
-      <!-- Runtime permission infobar strings -->
-      <if expr="is_android">
-        <message name="IDS_INFOBAR_UPDATE_PERMISSIONS_BUTTON_TEXT" desc="Button text shown when Brave does not have the necessary permission required to complete the requested tasks (e.g. a website has request location information, but Brave is missing that Android permission)." formatter_data="android_java">
-          Continue
-        </message>
-      </if>
-
       <message name="IDS_ALTERNATE_NAV_URL_VIEW_LABEL" desc="Label displayed in an infobar when a user searches for a term they may have meant to navigate to.">
         Did you mean to go to <ph name="SITE">$1<ex>http://intranetsite/</ex></ph>?
       </message>
@@ -1086,8 +1085,8 @@ are declared in tools/grit/grit_rule.gni.
           <message name="IDS_SAVE_PAGE" desc="In Title Case: The text label of the Save Page As menu item">
             Save Page &amp;As...
           </message>
-          <message name="IDS_DISTILL_PAGE" desc="The text label of the 'Reader mode' menu item">
-            Reader mode
+          <message name="IDS_DISTILL_PAGE" desc="The text label of the 'Toggle Reader Mode' menu item">
+            Toggle Reader Mode
           </message>
           <message name="IDS_MORE_TOOLS_MENU" desc="In Title Case: The text label of the Tools submenu for touch">
             More Too&amp;ls
@@ -1582,6 +1581,9 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_DOWNLOAD_STATUS_INTERRUPTED" desc="Status text for a download item that was interrupted.">
         Failed - <ph name="INTERRUPT_REASON">$1<ex>Disk full</ex></ph>
       </message>
+      <message name="IDS_DOWNLOAD_STATUS_SCANNED" desc="Status text for a download item that being scanned.">
+        Being scanned
+      </message>
       <message name="IDS_DOWNLOAD_UNCONFIRMED_PREFIX" desc="The prefix used in the unconfirmed download file.">
         Unconfirmed
       </message>
@@ -1638,7 +1640,7 @@ are declared in tools/grit/grit_rule.gni.
         <ph name="FILE_NAME">$1<ex>bla.exe</ex></ph> can't be downloaded securely.
       </message>
       <message name="IDS_PROMPT_APP_DEEP_SCANNING" desc="Message shown in the download shelf when Brave recommends uploading the file for additional scanning">
-        Advanced Protection recommends sending <ph name="FILE_NAME">$1<ex>bla.exe</ex></ph> to Brave to check for malware.
+        <ph name="FILE_NAME">$1<ex>bla.exe</ex></ph> may be dangerous. Send to Brave Advanced Protection for scanning?
       </message>
       <message name="IDS_BLOCK_REASON_UNCOMMON_DOWNLOAD" desc="Message shown to the user on chrome://downloads page to explain that this download is blocked because it is uncommon.">
         This file is not commonly downloaded and may be dangerous.
@@ -1652,6 +1654,9 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_BLOCK_REASON_MIXED_CONTENT" desc="Message shown to the user on chrome://downloads page to explain that this download is blocked because it is mixed-content.">
         This file can't be downloaded securely.
       </message>
+      <message name="IDS_BLOCK_REASON_DEEP_SCANNING" desc="Message shown on chrome://downloads when a download is being scanned">
+        This file is being scanned.
+      </message>
       <message name="IDS_DEEP_SCANNED_SAFE_DESCRIPTION" desc="Message shown to the user on chrome://downloads page to explain this this download was deep scanned, and found to be safe.">
         Scan complete, no issues identified.
       </message>
@@ -1671,6 +1676,12 @@ are declared in tools/grit/grit_rule.gni.
         This file is encrypted and has been blocked from opening.
       </message>
 
+      <if expr="chromeos">
+        <message name="IDS_PROMPT_BLOCKED_MIXED_DOWNLOAD_TITLE" desc="In the download notification, a title of the message shown on a download blocked for being insecure.">
+          Insecure download blocked
+        </message>
+      </if>
+
       <if expr="chromeos">
         <message name="IDS_PROMPT_BLOCKED_MALICIOUS_DOWNLOAD_TITLE" desc="In the download notification, a title of message shown for blocked download">
           Dangerous download blocked
@@ -1720,7 +1731,7 @@ are declared in tools/grit/grit_rule.gni.
         Open now
       </message>
       <message name="IDS_SCAN_DOWNLOAD" desc="Text shown to upload a file for deep scanning.">
-        Scan
+        Send
       </message>
 
       <!-- Download Tab Items -->
@@ -1844,6 +1855,18 @@ are declared in tools/grit/grit_rule.gni.
           </message>
         </else>
       </if>
+      <if expr="is_macosx">
+        <then>
+          <message name="IDS_PROMPT_APP_DEEP_SCANNING_ACCESSIBLE_ALERT" desc="The title of a download notification inidcating that the file may be malicious, and the Advanced Protection Program recommends sending the file to Brave. This message is for screen reader users">
+            <ph name="FILE_NAME">$1<ex>file.exe</ex></ph> may be dangerous. Send to Brave Advanced Protection for scanning?
+          </message>
+        </then>
+        <else>
+          <message name="IDS_PROMPT_APP_DEEP_SCANNING_ACCESSIBLE_ALERT" desc="The title of a download notification inidcating that the file may be malicious, and the Advanced Protection Program recommends sending the file to Brave. This message is for screen reader users">
+            <ph name="FILE_NAME">$1<ex>file.exe</ex></ph> may be dangerous. Send to Brave Advanced Protection for scanning? Press Shift+F6 to cycle to the downloads bar area.
+          </message>
+        </else>
+      </if>
 
       <!-- Download Notification Labels -->
       <message name="IDS_DOWNLOAD_NOTIFICATION_COPY_TO_CLIPBOARD" desc="In the download notification, the text of 'Copy to clipboard' button, which is to copy the file content (eg. an image for image files) to the clipboard">
@@ -2328,18 +2351,12 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_LIST_BULLET" desc="Unicode bullet for list items in permission bubbles.">
         •  <ph name="LIST_ITEM_TEXT">$1<ex>You might need permission to continue ...</ex></ph>
       </message>
-      <message name="IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL" desc="Header for multiple automatic downloads page on Content Settings dialog">
-        Automatic Downloads
-      </message>
       <message name="IDS_BLOCKED_DOWNLOAD_NO_ACTION" desc="Radio button to keep blocking automatic downloads">
         Continue blocking automatic downloads of multiple files
       </message>
       <message name="IDS_BLOCKED_DOWNLOAD_UNBLOCK" desc="Radio button to unblock automatic downloads">
         Always allow <ph name="HOST">$1<ex>example.com</ex></ph> to download multiple files
       </message>
-      <message name="IDS_BLOCKED_DOWNLOADS_LINK" desc="Link to downloads section of content blocking management dialog, displayed in bubble when a page tries to download files automatically.">
-        Manage download settings...
-      </message>
       <message name="IDS_ALLOWED_DOWNLOAD_TITLE" desc="Title for the page action when automatic downloads were allowed">
         This site downloaded multiple files automatically
       </message>
@@ -2368,9 +2385,6 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_ACCESSED_COOKIES_MESSAGE" desc="Tooltip and bubble info header text when a page wrote cookies or other site data.">
         This page set cookies.
       </message>
-      <message name="IDS_BLOCKED_COOKIES_LINK" desc="Link to cookie section of content blocking management dialog, displayed in bubble when a page tries to write cookies or other site data.">
-        Manage cookie blocking...
-      </message>
       <message name="IDS_BLOCKED_COOKIES_INFO" desc="Info link to a dialog showing the blocked/allowed cookies, displayed in bubble when a page tries to write cookies or other site data.">
         Show cookies and other site data...
       </message>
@@ -2410,9 +2424,6 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_BLOCKED_POPUPS_REDIRECTS_NO_ACTION" desc="Radio button choice to continue blocking a site from showing popups and redirects, displayed in bubble when a page tries to display popups or redirects.">
         Continue blocking
       </message>
-      <message name="IDS_BLOCKED_POPUPS_LINK" desc="Link to popups section of content blocking management dialog, displayed in bubble when a page tries to display popups.">
-        Manage pop-up blocking...
-      </message>
       <message name="IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_ALLOW" desc="Radio button choice to allow a site to access microphone and camera, displayed in bubble when a page tries to access microphone and camera.">
         Always allow <ph name="HOST">$1<ex>mail.google.com</ex></ph> to access your camera and microphone
       </message>
@@ -2530,16 +2541,16 @@ are declared in tools/grit/grit_rule.gni.
         Block cookies
       </message>
       <message name="IDS_COOKIE_CONTROLS_TURN_OFF_BUTTON" desc="Label shown on a button that turns off cookie blocking for a specific site.">
-        Turn off for this site
+        Allow cookies
       </message>
       <message name="IDS_COOKIE_CONTROLS_NOT_WORKING_TITLE" desc="Label shown on a dialog that allows users to turn off third-party cookie blocking for a specific site.">
         Site not working?
       </message>
      <message name="IDS_COOKIE_CONTROLS_NOT_WORKING_DESCRIPTION" desc="Label shown on a dialog that allows users to turn off third-party cookie blocking for a specific site.">
-        Some sites use third-party cookies to load their pages. If a site isn't working, you can try turning off cookie blocking.
+        Some sites use third-party cookies to load their pages. If a site isn't working, you can try allowing cookies.
       </message>
       <message name="IDS_COOKIE_CONTROLS_BLOCKED_MESSAGE" desc="Text shown in the dialog that allows users to control cookie blocking.">
-        Sites can’t use your browsing activity across different sites to personalize ads
+        Sites can't use cookies that track you across the web
       </message>
       <message name="IDS_COOKIE_CONTROLS_TOOLTIP" desc="Tooltip shown on a page action icon that is shown when cookie blocking is enabled.">
         Third-party cookie blocking
@@ -2564,51 +2575,6 @@ are declared in tools/grit/grit_rule.gni.
         </message>
       </if>
 
-      <!-- Certificate viewer dialog strings that are shared across all the platforms -->
-      <message name="IDS_CERT_INFO_SUBJECT_GROUP" desc="The label of the Issued To group in the general page of the certificate info dialog">
-        Issued To
-      </message>
-      <message name="IDS_CERT_INFO_ISSUER_GROUP" desc="The label of the Issued By group in the general page of the certificate info dialog">
-        Issued By
-      </message>
-      <message name="IDS_CERT_INFO_COMMON_NAME_LABEL" desc="The label of the Common Name field in the general page of the certificate info dialog.  (CN) is the name of this field in the standard">
-        Common Name (CN)
-      </message>
-      <message name="IDS_CERT_INFO_ORGANIZATION_LABEL" desc="The label of the Organization field in the general page of the certificate info dialog.  (O) is the name of this field in the standard">
-        Organization (O)
-      </message>
-      <message name="IDS_CERT_INFO_ORGANIZATIONAL_UNIT_LABEL" desc="The label of the Organizational Unit field in the general page of the certificate info dialog.  (OU) is the name of this field in the standard">
-        Organizational Unit (OU)
-      </message>
-      <message name="IDS_CERT_INFO_SERIAL_NUMBER_LABEL" desc="The label of the Serial Number field in the general page of the certificate info dialog.">
-        Serial Number
-      </message>
-      <message name="IDS_CERT_INFO_VALIDITY_GROUP" desc="The label of the group showing the validity (issued and expired dates) in the general page of the certificate info dialog">
-        Validity Period
-      </message>
-      <message name="IDS_CERT_INFO_ISSUED_ON_LABEL" desc="The label of the Issued On field in the general page of the certificate info dialog">
-        Issued On
-      </message>
-      <message name="IDS_CERT_INFO_EXPIRES_ON_LABEL" desc="The label of the Issued On field in the general page of the certificate info dialog">
-        Expires On
-      </message>
-      <message name="IDS_CERT_INFO_FINGERPRINTS_GROUP" desc="The label of the group showing the certificate fingerprints in the general page of the certificate info dialog">
-        Fingerprints
-      </message>
-      <message name="IDS_CERT_INFO_SHA256_FINGERPRINT_LABEL" desc="The label of the SHA-256 Fingerprint field in the general page of the certificate info dialog">
-        SHA-256 Fingerprint
-      </message>
-      <message name="IDS_CERT_INFO_SHA1_FINGERPRINT_LABEL" desc="The label of the SHA-1 Fingerprint field in the general page of the certificate info dialog">
-        SHA-1 Fingerprint
-      </message>
-
-      <message name="IDS_CERT_DETAILS_EXTENSIONS" desc="The label of the Extensions element in the details page of the certificate info dialog.">
-        Extensions
-      </message>
-      <message name="IDS_CERT_X509_SUBJECT_ALT_NAME" desc="description of extension Certificate Subject Alternative Name">
-        Certificate Subject Alternative Name
-      </message>
-
       <message name="IDS_CERT_EXPORT_TYPE_BASE64" desc="The description of saving a single certificate in base64 encoding.">
         Base64-encoded ASCII, single certificate
       </message>
@@ -3385,6 +3351,12 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_TASK_MANAGER_RENDERER_PREFIX" desc="The prefix for a Task Manager renderer row, only is visible when no other task claims that process">
           Renderer: <ph name="RENDERER_URL">$1<ex>http://www.google.com</ex></ph>
         </message>
+        <message name="IDS_TASK_MANAGER_DEDICATED_WORKER_PREFIX" desc="The prefix for a Task Manager dedicated worker row">
+          Dedicated Worker: <ph name="SCRIPT_URL">$1<ex>https://googlechrome.github.io/samples/dedicated-worker/basic/dedicated-worker.js</ex></ph>
+        </message>
+        <message name="IDS_TASK_MANAGER_SHARED_WORKER_PREFIX" desc="The prefix for a Task Manager shared worker row">
+          Shared Worker: <ph name="SCRIPT_URL">$1<ex>https://googlechrome.github.io/samples/shared-worker/basic/shared-worker.js</ex></ph>
+        </message>
         <message name="IDS_TASK_MANAGER_SERVICE_WORKER_PREFIX" desc="The prefix for a Task Manager service worker row">
           Service Worker: <ph name="SCRIPT_URL">$1<ex>https://googlechrome.github.io/samples/service-worker/basic/service-worker.js</ex></ph>
         </message>
@@ -3451,6 +3423,9 @@ are declared in tools/grit/grit_rule.gni.
           Profile Importer
         </message>
       </if>
+      <message name="IDS_UTILITY_PROCESS_QRCODE_GENERATOR_SERVICE_NAME" desc="The name of the utility process used for encoding QR codes.">
+        QR Code Generator
+      </message>
       <if expr="is_win">
         <message name="IDS_UTILITY_PROCESS_WIFI_CREDENTIALS_GETTER_NAME" desc="The name of the utility process used for getting the WiFi credentials">
           WiFi Credentials Getter
@@ -3510,9 +3485,6 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_APP_UNINSTALL_PROMPT_TITLE" desc="Titlebar of the non-platform app and ARC(App Runtime for Brave) app uninstallation prompt window">
         Uninstall app?
       </message>
-      <message name="IDS_NON_PLATFORM_APP_UNINSTALL_PROMPT_HEADING" desc="First bold line in the content area of the non-platform app uninstallation prompt. Tells the user the app will be uninstalled if confirmed.">
-        "<ph name="APP_NAME">$1<ex>Gmail Checker</ex></ph>" will be uninstalled.
-      </message>
       <message name="IDS_ARC_APP_UNINSTALL_PROMPT_DATA_REMOVAL_WARNING" desc="Line in the content area of the ARC(App Runtime for Brave) app uninstallation prompt. Tells the user that local data associated with the app will be removed from this device.">
         Data associated with this app will be removed from this device.
       </message>
@@ -3531,6 +3503,15 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_EXTENSION_UNINSTALL_PROMPT_HEADING" desc="First bold line in the content area of the extension or app uninstallation prompt. Asks the user if they want to uninstall a particular extension or app.">
         Remove "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>"?
       </message>
+      <message name="IDS_EXTENSION_REQUEST_PROMPT_TITLE" desc="Titlebar of the extension or app request prompt. Asks the user if they want to send installation request for a particular extension or app to their admin.">
+        Send a request to your administrator to install "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>"?
+      </message>
+      <message name="IDS_EXTENSION_PENDING_REQUEST_PROMPT_TITLE" desc="Titlebar of the extension or app request prompt. Tells the user their installation request for a particular extension or app is still pending review.">
+        You already requested "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>"
+      </message>
+      <message name="IDS_EXTENSION_BLOCKED_BY_POLICY_PROMPT_TITLE" desc="Title of the extension or app install blocked prompt. Tells the user they can't install this extension as it's blocked by policy.">
+        Your admin has blocked "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>"
+      </message>
       <message name="IDS_EXTENSION_PROGRAMMATIC_UNINSTALL_PROMPT_HEADING" desc="First bold line in the content area of the extension or app uninstallation prompt when the uninstallation is programmatically triggered by another extension. Asks the user if they want to uninstall a particular extension or app.">
         "<ph name="TRIGGERING_EXTENSION_NAME">$1<ex>Extension Manager</ex></ph>" would like to remove "<ph name="EXTENSION_NAME">$2<ex>Gmail Checker</ex></ph>".
       </message>
@@ -3633,6 +3614,9 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_EXTENSION_WITHHOLD_PERMISSIONS" desc="Label next to the checkbox in the extension or app installation prompt, which indicates if a user wants to manually control which sites the extension can access.">
         Manually control site permissions.
       </message>
+      <message name="IDS_EXTENSION_PROMPT_MESSAGE_FROM_ADMIN" desc="Second line in the content area of the extension of app blocked prompt. It gives user the additional message which comes from their administrator.">
+        From your administrator: <ph name="ADMIN_MESSAGE">$1<ex>Please visit www.example.com/extension for more information.</ex></ph>
+      </message>
 
       <message name="IDS_EXTENSION_PERMISSION_LINE" desc="Template for item in list of privileges that an extension or app has">
           • <ph name="PERMISSION">$1<ex>Read and change all your data on the websites you visit</ex></ph>
@@ -3926,9 +3910,6 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_EXTENSION_PROMPT_WARNING_SCREENLOCK_PRIVATE" desc="Permission string for locking an unlocking the screen.">
           Lock and unlock the screen
         </message>
-        <message name="IDS_EXTENSION_PROMPT_WARNING_OVERRIDE_BOOKMARKS_UI" desc="Permission string for overriding elements of the bookmarks user interface.">
-          Change the bookmarks user interface
-        </message>
         <message name="IDS_EXTENSION_PROMPT_WARNING_ACTIVITY_LOG_PRIVATE" desc="Permission string for the observing other extensions' API calls">
           Monitor the behavior of other extensions, including visited URLs
         </message>
@@ -4030,12 +4011,6 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_EXTENSION_INVALID_IMAGE_PATH" desc="">
         Could not load '<ph name="IMAGE_PATH">$1<ex>/path/to/file</ex></ph>' for theme.
       </message>
-      <message name="IDS_EXTENSION_LOAD_ICON_FOR_PAGE_ACTION_FAILED" desc="">
-        Could not load icon '<ph name="ICON">$1<ex>icon.png</ex></ph>' for page action.
-      </message>
-      <message name="IDS_EXTENSION_LOAD_ICON_FOR_BROWSER_ACTION_FAILED" desc="">
-        Could not load icon '<ph name="ICON">$1<ex>icon.png</ex></ph>' for browser action.
-      </message>
 
       <if expr="chromeos">
         <message name="IDS_EXTENSION_NOTIFICATION_INSTALLED" desc="Notification message shown in the message center when an application is successfully install.">
@@ -4279,6 +4254,42 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_EXTENSION_INSTALL_PROMPT_ACCEPT_BUTTON_THEME" desc="Text for the install button on the extension install prompt, for a theme.">
         Add theme
       </message>
+      <message name="IDS_EXTENSION_INSTALL_PROMPT_ASK_A_PARENT_BUTTON" desc="Text for the ask-a-parent button on the extension install prompt.">
+        Ask a parent
+      </message>
+      <message name="IDS_PARENT_PERMISSION_PROMPT_GO_GET_A_PARENT_FOR_EXTENSION_LABEL" desc="Text for the title section of the parent permission dialog asking child to get a parent to approve.">
+        Go get a parent to approve "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>"
+      </message>
+      <message name="IDS_PARENT_PERMISSION_PROMPT_EXTENSION_TYPE_EXTENSION" desc="The 'extension' extension type">
+        extension
+      </message>
+      <message name="IDS_PARENT_PERMISSION_PROMPT_EXTENSION_TYPE_APP" desc="The 'app' extension type">
+        app
+      </message>
+      <message name="IDS_PARENT_PERMISSION_PROMPT_CHILD_WANTS_TO_INSTALL_LABEL" desc="Text for the header section of the parent permission dialog explaining that the child is installing a extension that is requesting permissions.">
+        <ph name="CHILD_NAME">$1<ex>Junior</ex></ph> wants to install an <ph name="EXTENSION_TYPE">$2<ex>extension</ex></ph> that can:
+      </message>
+      <message name="IDS_PARENT_PERMISSION_PROMPT_APPROVE_BUTTON" desc="Text for the approve button on the parent permission prompt.">
+        Approve
+      </message>
+      <message name="IDS_PARENT_PERMISSION_PROMPT_CANCEL_BUTTON" desc="Text for the cancel button on the parent permission prompt.">
+        Cancel
+      </message>
+      <message name="IDS_PARENT_PERMISSION_PROMPT_SELECT_PARENT_LABEL" desc="Text for the label shown above the parent selector.">
+        Choose parent account for approval
+      </message>
+      <message name="IDS_PARENT_PERMISSION_PROMPT_PARENT_ACCOUNT_LABEL" desc="Text for the label shown above a single parent account email.">
+        Parent account
+      </message>
+      <message name="IDS_PARENT_PERMISSION_PROMPT_ENTER_PASSWORD_LABEL" desc="Text for the label shown above the parent password entry field.">
+        Enter password
+      </message>
+      <message name="IDS_PARENT_PERMISSION_PROMPT_PASSWORD_INCORRECT_LABEL" desc="Text for the label shown when the previously entered password was incorrect.">
+        Password incorrect
+      </message>
+      <message name="IDS_EXTENSION_INSTALL_PROMPT_REQUEST_BUTTON" desc="Text for the request button on the extension request prompt.">
+        Send
+      </message>
       <message name="IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON" desc="Text for the uninstall button on the extension uninstall prompt">
         Remove
       </message>
@@ -4684,25 +4695,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       </message>
       <!-- End of Sync Promo strings for Desktop Identity Consistency. -->
 
-      <!-- Desktop iOS promotion. -->
-      <if expr="is_win">
-        <message name="IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TITLE" desc="Title for Brave iOS promotion appearing in the password bubble after a password is saved.">
-          Sync this password to your iPhone
-        </message>
-        <message name="IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TITLE_V2" desc="Title for Brave iOS promotion appearing in the password bubble after a password is saved.">
-          Get this password on your iPhone
-        </message>
-        <message name="IDS_PASSWORD_MANAGER_DESKTOP_TO_IOS_PROMO_TITLE_V3" desc="Title for Brave iOS promotion appearing in the password bubble after a password is saved.">
-          Share this password with your iPhone
-        </message>
-        <message name="IDS_DESKTOP_TO_IOS_PROMO_SEND_TO_PHONE" desc="The title of the send to phone button in the bubble promoting Brave for iphone.">
-          Send to phone
-        </message>
-        <message name="IDS_DESKTOP_TO_IOS_PROMO_NO_THANKS" desc="The title of the No Thanks button in the bubble promoting Brave for iPhone.">
-          No thanks
-        </message>
-      </if>
-
       <!-- Preview Stale Page UI -->
       <message name="IDS_PREVIEWS_INFOBAR_TIMESTAMP_MINUTES" desc="The desciption stating how old a preview version of a page is in minutes. This is shown on the UI notifying the user that a preview page has been shown. The number of minutes will always be at least two so 'minutes' should be translated in the plural.">
          Updated <ph name="MINUTES">$1<ex>30</ex></ph> min ago
@@ -5083,6 +5075,16 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Remove suggestion from clipboard?
       </message>
       </if>
+      <if expr="use_titlecase">
+        <message name="IDS_CONTEXT_MENU_SHOW_FULL_URLS" desc="In Title Case: The text label of the omnibox context menu option to show full URLs">
+          Always Show Full URLs
+        </message>
+      </if>
+      <if expr="not use_titlecase">
+        <message name="IDS_CONTEXT_MENU_SHOW_FULL_URLS" desc="The text label of the omnibox context menu option to show full URLs">
+          Always show full URLs
+        </message>
+      </if>
 
       <!-- NTP -->
       <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, and Brave is the default search engine.">
@@ -5512,31 +5514,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Reset to default zoom level
       </message>
 
-      <!-- Accessibility permission -->
-      <message name="IDS_ACCESSIBILITY_EVENTS_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to respond to accessibility events, for example if the user is using a screen reader and the site has custom accessibility features. Follows a prompt: 'This site would like to:'">
-        Respond to Accessibility Events
-      </message>
-      <if expr="is_android">
-        <message name="IDS_ACCESSIBILITY_EVENTS_INFOBAR_TEXT" desc="Text requesting permission for a site to listen to accessibility events, for example if the user has a screen reader or braille device enabled">
-          <ph name="URL">$1<ex>maps.google.com</ex></ph> wants to respond to accessibility events
-        </message>
-        <message name="IDS_ACCESSIBILITY_EVENTS_PERMISSION_TITLE" desc="Title text for dialog requesting permission for a site to listen to accessibility events, for example if the user has a screen reader or braille device enabled">
-          Accessibility Events
-        </message>
-      </if>
-
       <!-- Clipboard permission -->
-      <message name="IDS_CLIPBOARD_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to read data from the system clipboard. Follows a prompt: 'This site would like to:'">
-        See text and images copied to the clipboard
-      </message>
-      <if expr="is_android">
-        <message name="IDS_CLIPBOARD_INFOBAR_TEXT" desc="Text requesting permission for a site to read data from the system clipboard">
-          <ph name="URL">$1<ex>maps.google.com</ex></ph> wants to see text and images copied to the clipboard
-        </message>
-        <message name="IDS_CLIPBOARD_PERMISSION_TITLE" desc="Title text for dialog requesting permission for a site to read data from the system clipboard">
-          Clipboard
-        </message>
-      </if>
       <message name="IDS_ALLOWED_CLIPBOARD_TITLE" desc="Title of the info bubble shown when a site has been allowed access to read the contents of the system clipboard.">
         Clipboard read access allowed
       </message>
@@ -5736,6 +5714,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_PASSWORD_MANAGER_UPDATE_BUTTON" desc="Label for the 'update' button in the Update Password infobar. This infobar asks if the user wishes to update the saved password for a site to a new password the user has just entered; the button applies the suggested update.">
           Update
         </message>
+        <message name="IDS_PASSWORD_SAVING_STATUS_TOGGLE" desc="Label for the toggle that shows whether saving passwords for the current site is enabled or disabled.">
+          Save passwords for this site
+        </message>
         <message name="IDS_PASSWORD_MANAGER_ACCESSORY_PASSWORD_DESCRIPTION" desc="Description for a field containing a password that belongs to a user.">
           Password for <ph name="username">$1<ex>Alexander</ex></ph>
         </message>
@@ -5929,9 +5910,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_CLEAR_BROWSING_DATA_TITLE" desc="Dialog title">
         Clear browsing data
       </message>
-      <message name="IDS_FLASH_PERMISSION_FRAGMENT" desc="Permission asked in the permission bubble when a URL wants to use Flash Plugins on the page. Preceded by the prompt 'This site would like to:'. 'Flash' is the name of a plugin and should not be translated.">
-        Run Flash
-      </message>
       <message name="IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE" desc="A dialog informing the user that their Brave browsing history was deleted, but other forms of history can still be found on Brave My Activity.">
         The selected data has been removed from Brave and synced devices. Your Brave Account may have other forms of browsing history like searches and activity from other Brave services at <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/a&gt;</ph>.
       </message>
@@ -5960,9 +5938,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
           {NUM_POPUPS,plural,=1{Pop-up blocked} other{# pop-ups blocked}}
         </message>
       </if>
-      <message name="IDS_HANDLERS_BUBBLE_MANAGE_LINK" desc="Link on the register protocol handler bubble that opens up the Content Settings management dialog.">
-        Manage handler settings...
-      </message>
 
       <message name="IDS_ZOOMLEVELS_CHROME_ERROR_PAGES_LABEL" desc="Label for zoom level list entry for Brave error pages.">
         (Brave error pages)
@@ -6232,6 +6207,14 @@ Keep your key file in a safe place. You will need it to create new versions of y
           =1 {Move tab to new window}
           other {Move tabs to new window}}
         </message>
+        <message name="IDS_TAB_CXMENU_MOVETOANOTHERWINDOW" desc="The label of the 'Move tabs to another window' Tab context menu item. NOTE: If having no explicit # makes the phrasing awkward, feel free to add a # as necessary. [ICU Syntax]">
+          {NUM_TABS, plural,
+          =1 {Move tab to another window}
+          other {Move tabs to another window}}
+        </message>
+        <message name="IDS_TAB_CXMENU_MOVETOANOTHERNEWWINDOW" desc="The label for the Tab context item to move items to a new window from the 'Move tabs to another window' submenu.">
+          New window
+        </message>
       </if>
       <if expr="use_titlecase">
         <message name="IDS_TAB_CXMENU_NEWTABTORIGHT" desc="In Title Case: The label of the 'New Tab to the Right' Tab context menu item.">
@@ -6284,6 +6267,32 @@ Keep your key file in a safe place. You will need it to create new versions of y
           =1 {Move Tab to New Window}
           other {Move Tabs to New Window}}
         </message>
+        <message name="IDS_TAB_CXMENU_MOVETOANOTHERWINDOW" desc="In Title Case: The label of the 'Move tabs to another window' Tab context menu item. NOTE: If having no explicit # makes the phrasing awkward, feel free to add a # as necessary. [ICU Syntax]">
+          {NUM_TABS, plural,
+          =1 {Move Tab to Another Window}
+          other {Move Tabs to Another Window}}
+        </message>
+        <message name="IDS_TAB_CXMENU_MOVETOANOTHERNEWWINDOW" desc="In Title Case: The label for the Tab context item to move items to a new window from the 'Move tabs to another window' submenu.">
+          New Window
+        </message>
+      </if>
+
+      <!-- Strings for Window Titles in Menus -->
+      <if expr="not use_titlecase">
+        <message name="IDS_BROWSER_WINDOW_TITLE_MENU_ENTRY" desc="The format for details of the title displayed in tabs and popup windows. [ICU Syntax]">
+          {NUM_PAGES, plural,
+            =0 {<ph name="PAGE_TITLE">$1<ex>Brave</ex></ph>}
+            =1 {<ph name="PAGE_TITLE">$1<ex>Brave</ex></ph> and 1 other tab}
+            other {<ph name="PAGE_TITLE">$1<ex>Brave</ex></ph> and # other tabs}}
+        </message>
+      </if>
+      <if expr="use_titlecase">
+        <message name="IDS_BROWSER_WINDOW_TITLE_MENU_ENTRY" desc="In Title Case: The format for details of the title displayed in tabs and popup windows. [ICU Syntax]">
+          {NUM_PAGES, plural,
+            =0 {<ph name="PAGE_TITLE">$1<ex>Brave</ex></ph>}
+            =1 {<ph name="PAGE_TITLE">$1<ex>Brave</ex></ph> and 1 Other Tab}
+            other {<ph name="PAGE_TITLE">$1<ex>Brave</ex></ph> and # Other Tabs}}
+        </message>
       </if>
 
       <!-- Tab Group Editor Bubble -->
@@ -6297,6 +6306,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_TAB_GROUP_HEADER_CXMENU_CLOSE_GROUP" desc="The label of the tab group header context menu item for closing all tabs in the current group.">
           Close group
         </message>
+        <message name="IDS_TAB_GROUP_HEADER_CXMENU_MOVE_GROUP_TO_NEW_WINDOW" desc="The label of the tab group header context menu item for moving the entire group to a new window.">
+          Move group to new window
+        </message>
         <message name="IDS_TAB_GROUP_HEADER_CXMENU_SEND_FEEDBACK" desc="The label of the tab group header context menu item for sending feedback for tab groups.">
           Send feedback
         </message>
@@ -6314,6 +6326,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_TAB_GROUP_HEADER_CXMENU_CLOSE_GROUP" desc="In Title Case: The label of the tab group header context menu item for closing all tabs in the current group.">
           Close Group
         </message>
+        <message name="IDS_TAB_GROUP_HEADER_CXMENU_MOVE_GROUP_TO_NEW_WINDOW" desc="In Title Case: The label of the tab group header context menu item for moving the entire group to a new window.">
+          Move Group to New Window
+        </message>
         <message name="IDS_TAB_GROUP_HEADER_CXMENU_SEND_FEEDBACK" desc="In Title Case: The label of the tab group header context menu item for sending feedback for tab groups.">
           Send Feedback
         </message>
@@ -6660,8 +6675,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
       </if>
 
       <if expr="is_android">
-        <message name="IDS_OPTIONS_HOMEPAGE_TITLE" desc="The title of the home page overlay on Android" formatter_data="android_java">
-          Home page
+        <message name="IDS_OPTIONS_HOMEPAGE_TITLE" desc="The title of Brave's homepage setting screen on Android. " formatter_data="android_java">
+          Homepage
         </message>
       </if>
 
@@ -6764,19 +6779,25 @@ Keep your key file in a safe place. You will need it to create new versions of y
 
       <!-- Sharing features. -->
       <message name="IDS_SHARING_REMOTE_COPY_NOTIFICATION_TITLE_TEXT_CONTENT_UNKNOWN_DEVICE" desc="Title text displayed in a Remote Copy (for text content) notification when the source device name is unknown.">
-        Text shared from other device
+        Text copied from other device
       </message>
       <message name="IDS_SHARING_REMOTE_COPY_NOTIFICATION_TITLE_TEXT_CONTENT" desc="Title text displayed in a Remote Copy (for text content) notification when the source device name is known.">
-        Text shared from <ph name="DEVICE_NAME">$1<ex>Jimmy's Pixel</ex></ph>
+        Text copied from <ph name="DEVICE_NAME">$1<ex>Jimmy's Pixel</ex></ph>
       </message>
       <message name="IDS_SHARING_REMOTE_COPY_NOTIFICATION_TITLE_IMAGE_CONTENT_UNKNOWN_DEVICE" desc="Title text displayed in a Remote Copy (for image content) notification when the source device name is unknown.">
-        Image shared from other device
+        Image copied from other device
       </message>
       <message name="IDS_SHARING_REMOTE_COPY_NOTIFICATION_TITLE_IMAGE_CONTENT" desc="Title text displayed in a Remote Copy (for image content) notification when the source device name is known.">
-        Image shared from <ph name="DEVICE_NAME">$1<ex>Jimmy's Pixel</ex></ph>
+        Image copied from <ph name="DEVICE_NAME">$1<ex>Jimmy's Pixel</ex></ph>
       </message>
       <message name="IDS_SHARING_REMOTE_COPY_NOTIFICATION_DESCRIPTION" desc="Second line of text displayed in a Remote Copy notification.">
-        Copied to your clipboard
+        Press <ph name="MODIFIER_KEY_DESCRIPTION">$1<ex>Ctrl+V</ex></ph> to paste
+      </message>
+      <message name="IDS_SHARING_REMOTE_COPY_NOTIFICATION_PREPARING_DOWNLOAD" desc="Subtext shown in a Remote Copy notification while preparing the image download.">
+        Preparing download
+      </message>
+      <message name="IDS_SHARING_REMOTE_COPY_NOTIFICATION_PROCESSING_IMAGE" desc="Subtext shown in a Remote Copy notification while processing the received image.">
+        Processing image
       </message>
       <if expr="not use_titlecase">
         <message name="IDS_CONTENT_CONTEXT_SHARING_CLICK_TO_CALL_MULTIPLE_DEVICES" desc="The label of item for click to call in context menu when multiple devices are available.">
@@ -6871,17 +6892,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_COLLECTED_COOKIES_SESSION_RULE_CREATED" desc="A notification that is displayed when a content exception to allow cookies for session only was created.">
         Cookies from <ph name="DOMAIN">$1<ex>example.com</ex></ph> will be cleared on exit
       </message>
-      <if expr="is_macosx">
-        <message name="IDS_COLLECTED_COOKIES_MULTIPLE_ALLOW_RULES_CREATED" desc="A notification that is displayed when multiple content exceptions to allow cookies were created.">
-          Cookies from multiple sites allowed.
-        </message>
-        <message name="IDS_COLLECTED_COOKIES_MULTIPLE_BLOCK_RULES_CREATED" desc="A notification that is displayed when multiple content exceptions to block cookies were created.">
-          Cookies from multiple sites blocked.
-        </message>
-        <message name="IDS_COLLECTED_COOKIES_MULTIPLE_SESSION_RULES_CREATED" desc="A notification that is displayed when multiple content exceptions to allow cookies for session only were created.">
-          Cookies from multiple sites will be cleared on exit.
-        </message>
-      </if>
       <message name="IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_TAB_LABEL" desc="The label in a tabbed pane that holds the UI controls for the cookies allowed while loading the page.">
         Allowed
       </message>
@@ -7034,23 +7044,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_COOKIES_COOKIE_NONESELECTED" desc="Field value when no cookie is selected">
         no cookie selected
       </message>
-      <if expr="is_macosx">
-        <message name="IDS_COOKIES_LOCAL_STORAGE_KEY_LABEL" desc="The label of the Local Storage key being set">
-          Key:
-        </message>
-        <message name="IDS_COOKIES_LOCAL_STORAGE_VALUE_LABEL" desc="The label of the Local Storage value being set">
-          Value:
-        </message>
-      </if>
-      <message name="IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL" desc="The Local Storage Origin label">
-        Origin:
-      </message>
-      <message name="IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL" desc="The Local Storage Size on disk label">
-        Size on disk:
-      </message>
-      <message name="IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL" desc="The Local Storage Last modified label">
-        Last modified:
-      </message>
       <message name="IDS_COOKIES_COOKIES" desc="Label for folder under which a list of cookies appear">
         Cookies
       </message>
@@ -7060,14 +7053,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_COOKIES_APPLICATION_CACHE" desc="The text shown when there is an Application Cache (name of an HTML standard) in the Cookies table">
         Application cache
       </message>
-      <message name="IDS_COOKIES_APPLICATION_CACHE_MANIFEST_LABEL" desc="The Manifest label (manifest is a URL specified by the application cache)">
-        Manifest:
-      </message>
-      <if expr="is_macosx">
-        <message name="IDS_COOKIES_SIZE_LABEL" desc="The Size label, to indicate how much space is taken by a database or application cache">
-          Size:
-        </message>
-      </if>
       <message name="IDS_COOKIES_WEB_DATABASES" desc="Label for the folder under which a list of web databases (name of an HTML standard) are displayed">
         Web databases
       </message>
@@ -7095,9 +7080,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_COOKIES_FILE_SYSTEM_USAGE_NONE" desc="Value displayed when no file system of a particular type exists.">
         None
       </message>
-      <message name="IDS_COOKIES_LAST_ACCESSED_LABEL" desc="The last access date label">
-        Last accessed:
-      </message>
       <message name="IDS_COOKIES_SERVICE_WORKER" desc="The text shown when there is data for Service Workers within an origin (name of a Web standard) in the Cookies table">
         Service Workers
       </message>
@@ -7484,6 +7466,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_SAVE_PAGE_DESC_COMPLETE" desc="In the Save Page dialog, the description of saving both the HTML and all shown resources.">
         Webpage, Complete
       </message>
+      <message name="IDS_SAVE_PAGE_DESC_WEB_BUNDLE_FILE" desc="In the Save Page dialog, the description of saving both the HTML and all shown resources into a single Web Bundle file.">
+        Webpage, Single File (Web Bundle)
+      </message>
 
       <!-- General app failure messages -->
       <message name="IDS_PROFILE_ERROR_DIALOG_TITLE" desc="The title of the dialog shown when there's an error page">
@@ -7526,11 +7511,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
       <message name="IDS_MULTI_DOWNLOAD_WARNING" desc="Warning invoked if multiple downloads are attempted without user interaction.">
         <ph name="ORIGIN">$1<ex>https://backgroundfetch.com</ex></ph> wants to download multiple files
       </message>
-      <if expr="is_android">
-        <message name="IDS_MULTI_DOWNLOAD_WARNING_TITLE" desc="Title text for warning dialog invoked if multiple downloads are attempted without user interaction.">
-          Download
-        </message>
-      </if>
       <message name="IDS_MULTI_DOWNLOAD_PERMISSION_FRAGMENT" desc="Permission request shown if multiple downloads are attempted without user interaction and there are multiple permissions requested. Follows a prompt: 'This site would like to:'">
         Download multiple files
       </message>
@@ -7981,17 +7961,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
       </if>
 
       <!-- Web and message center notifications -->
-      <message name="IDS_NOTIFICATIONS_INFOBAR_TEXT" desc="Text requesting permission for Web Notifications.">
-        <ph name="site">$1<ex>mail.google.com</ex></ph> wants to send you notifications
-      </message>
-      <if expr="is_android">
-        <message name="IDS_NOTIFICATIONS_PERMISSION_TITLE" desc="Title text for dialog requesting permission for Web Notifications.">
-          Notifications
-        </message>
-      </if>
-      <message name="IDS_NOTIFICATION_PERMISSIONS_FRAGMENT" desc="Permission sentence fragment to show following the prompt 'This site wants to:' in a permissions request">
-        Show notifications
-      </message>
       <message name="IDS_NOTIFICATION_BUTTON_SETTINGS" desc="Short button label to go to the notification settings panel">
         Settings
       </message>
@@ -8017,12 +7986,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
         <message name="IDS_NOTIFICATION_QUIET_PERMISSION_INFOBAR_TITLE" desc="Title of an infobar that informs the user that notifications are blocked. [CHAR_LIMIT=32]">
           Notifications blocked
         </message>
-        <message name="IDS_NOTIFICATION_QUIET_PERMISSION_PROMPT_TITLE" desc="Text used as notification title when requesting permission for Web Notifications via a notification.">
-          Notifications for <ph name="ORIGIN">$1<ex>example.com</ex></ph> are blocked
-        </message>
-        <message name="IDS_NOTIFICATION_QUIET_PERMISSION_PROMPT_MESSAGE" desc="Text used as notification message when requesting permission for Web Notifications via a notification.">
-          Notifications are automatically blocked for all sites except ones you allow
-        </message>
       </if>
 
       <!-- Mac AppleScript -->
@@ -8455,22 +8418,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
       </if>
 
       <!-- Geolocation messages -->
-      <if expr="not is_android">
-        <message name="IDS_GEOLOCATION_INFOBAR_TEXT" desc="Text requesting permission for a site to access the user's physical location">
-          <ph name="URL">$1<ex>maps.google.com</ex></ph> wants to use your computer's location
-        </message>
-      </if>
-      <if expr="is_android">
-        <message name="IDS_GEOLOCATION_INFOBAR_TEXT" desc="Mobile: Text requesting permission for a site to access the user's physical location">
-          <ph name="URL">$1<ex>maps.google.com</ex></ph> wants to use your device's location
-        </message>
-        <message name="IDS_GEOLOCATION_PERMISSION_TITLE" desc="Mobile: Title text for dialog requesting permission for a site to access the user's physical location">
-          Location
-        </message>
-      </if>
-      <message name="IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT" desc="Permission fragment used in the permission bubble, after 'This site wants to:' asking for permission to access the user's physical location.">
-        Know your location
-      </message>
       <message name="IDS_GEOLOCATION_BUBBLE_SECTION_ALLOWED" desc="Heading for a section in the geolocation bubble listing all sites which are currently tracking the user's location.">
         This page contains elements from the following sites that are tracking your location:
       </message>
@@ -8483,9 +8430,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
       <message name="IDS_GEOLOCATION_BUBBLE_CLEAR_LINK" desc="Link on the geolocation bubble that resets the list of allowed and blocked sites.">
         Clear these settings for future visits
       </message>
-      <message name="IDS_GEOLOCATION_BUBBLE_MANAGE_LINK" desc="Link on the geolocation bubble that opens up the Content Settings management dialog.">
-        Manage location settings...
-      </message>
       <message name="IDS_GEOLOCATION_ALLOWED_TOOLTIP" desc="Location bar icon tooltip text when a page is allowed to use geolocation.">
         This page is tracking your location.
       </message>
@@ -8494,17 +8438,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
       </message>
 
       <!-- Web MIDI messages -->
-      <message name="IDS_MIDI_SYSEX_INFOBAR_TEXT" desc="Text requesting permission for a site to access MIDI devices with system exclusive messages.">
-        <ph name="URL">$1<ex>www.google.com</ex></ph> wants to get full control of your MIDI devices
-      </message>
-      <if expr="is_android">
-        <message name="IDS_MIDI_SYSEX_PERMISSION_TITLE" desc="Title text for dialog requesting permission for a site to access MIDI devices with system exclusive messages.">
-          MIDI Devices
-        </message>
-      </if>
-      <message name="IDS_MIDI_SYSEX_PERMISSION_FRAGMENT" desc="Permission asked in the permission bubble when a URL wants to access MIDI devices with system exclusive messages, along with other permissions requests. Preceded by the prompt 'This site would like to:'">
-        Use your MIDI devices
-      </message>
       <message name="IDS_MIDI_SYSEX_ALLOWED_TOOLTIP" desc="Location bar icon tooltip text when a page is allowed to use MIDI system exclusive messages.">
         This page has full control of MIDI devices.
       </message>
@@ -8523,9 +8456,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
       <message name="IDS_MIDI_SYSEX_BUBBLE_CLEAR_LINK" desc="Link on the MIDI bubble that resets the list of allowed and blocked sites.">
         Clear these settings for future visits
       </message>
-      <message name="IDS_MIDI_SYSEX_BUBBLE_MANAGE_LINK" desc="Link on the MIDI bubble that opens up the Content Settings management dialog.">
-        Manage MIDI settings...
-      </message>
 
       <!-- Protocol Handler -->
       <message name="IDS_REGISTER_PROTOCOL_HANDLER_TOOLTIP" desc="Location bar icon tooltip text when a page wants to use registerProtocolHandler.">
@@ -8533,9 +8463,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
       </message>
 
       <!-- Media Stream -->
-      <message name="IDS_MEDIASTREAM_BUBBLE_MANAGE_LINK" desc="Link on the media (camera and microphone) bubble that opens up the Content Settings management dialog for media settings.">
-        Manage media settings...
-      </message>
       <message name="IDS_MICROPHONE_CAMERA_ALLOWED" desc="Status text that is used as location bar icon tooltip text and as media settings bubble status text when a page is allowed to use the camera and microphone.">
         This page is accessing your camera and microphone.
       </message>
@@ -8609,20 +8536,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
       </if>
 
       <!-- Protected media identifier permission infobar -->
-      <if expr="is_android or chromeos">
-        <message name="IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT" desc="Permission fragment shown in the permissions bubble when a web page requests access to the computer's protected media identifier.">
-          Know your unique device identifier
-        </message>
-        <message name="IDS_PROTECTED_MEDIA_IDENTIFIER_PER_ORIGIN_PROVISIONING_INFOBAR_TEXT" desc="Text requesting permission for a site to access protected media identifier. It shows the origin of the URL.">
-          <ph name="URL">$1<ex>https://www.youtube.com</ex></ph> wants to play protected content. Your device’s identity will be verified by Brave.
-        </message>
-        <message name="IDS_PROTECTED_MEDIA_IDENTIFIER_PER_DEVICE_PROVISIONING_INFOBAR_TEXT" desc="Text requesting permission for a site to access protected media identifier. It shows the origin of the URL.">
-          <ph name="URL">$1<ex>https://www.youtube.com</ex></ph> wants to play protected content. Your device's identity will be verified by Brave and may be accessed by this site.
-        </message>
-        <message name="IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_TITLE" desc="Title text for dialog requesting permission for a site to access protected media identifier.">
-          Protected Media Identifier
-        </message>
-      </if>
       <message name="IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT" desc="A message that the browser shows after saving a password it has autogenerated for the user. This message appears in a bubble and contains a link to all the user's saved autogenerated passwords. The link text is a separate string in the translation console and appears here as placeholder text.">
         View and manage saved passwords in your <ph name="SAVED_PASSWORDS_STORE">$1<ex>Brave Account</ex></ph>
       </message>
@@ -8828,65 +8741,9 @@ Please help our engineers fix this problem. Tell us what happened right before y
       </message>
 
       <!-- Media Capture messages -->
-      <message name="IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO_INFOBAR_TEXT" desc="Text requesting permission for a site to access the computer's microphone and camera.">
-        <ph name="HOST">$1<ex>html5rocks.com</ex></ph> wants to use your camera and microphone
-      </message>
-      <message name="IDS_MEDIA_CAPTURE_AUDIO_ONLY_INFOBAR_TEXT" desc="Text requesting permission for a site to access the computer's microphone.">
-        <ph name="HOST">$1<ex>html5rocks.com</ex></ph> wants to use your microphone
-      </message>
-      <message name="IDS_MEDIA_CAPTURE_VIDEO_ONLY_INFOBAR_TEXT" desc="Text requesting permission for a site to access the computer's camera.">
-        <ph name="HOST">$1<ex>html5rocks.com</ex></ph> wants to use your camera
-      </message>
       <message name="IDS_MEDIA_CAPTURE_SCREEN_INFOBAR_TEXT" desc="Text requesting permission for a site to access the device's screen.">
         <ph name="HOST">$1<ex>html5rocks.com</ex></ph> wants to share your screen
       </message>
-      <message name="IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_FRAGMENT" desc="Permission fragment shown in the permissions bubble when a web page requests access to the computer's microphone.">
-        Use your microphone
-      </message>
-      <message name="IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_FRAGMENT" desc="Permission fragment shown in the permissions bubble when a web page requests access to the computer's camera.">
-        Use your camera
-      </message>
-      <if expr="is_android">
-        <message name="IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_TITLE" desc="Title text for dialog requesting permission for a site to access the device's microphone.">
-          Microphone
-        </message>
-        <message name="IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_TITLE" desc="Title text for dialog requesting permission for a site to access the device's camera.">
-          Camera
-        </message>
-        <message name="IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO_PERMISSION_TITLE" desc="Title text for dialog requesting permission for a site to access the device's microphone and camera.">
-          Media
-        </message>
-      </if>
-
-      <!-- NFC permission -->
-      <message name="IDS_NFC_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to use NFC. Follows a prompt: 'This site would like to:'">
-        Use NFC devices
-      </message>
-      <if expr="is_android">
-        <message name="IDS_NFC_INFOBAR_TEXT" desc="Text requesting permission for a site to use NFC">
-          <ph name="URL">$1<ex>google.com</ex></ph> wants to send and receive info when you tap your phone on an NFC device
-        </message>
-        <message name="IDS_NFC_PERMISSION_TITLE" desc="Title text for dialog requesting permission for a site to use NFC">
-          NFC
-        </message>
-      </if>
-
-      <!-- WebXr permissions -->
-      <!-- TODO(crbug.com/1041009): Finalize WebXr Permissions strings -->
-      <message name="IDS_VR_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to use VR. Follows a prompt: 'This site would like to:">
-        Access Virtual Reality devices and data
-      </message>
-      <message name="IDS_AR_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to use AR. Follows a prompt: 'This site would like to:">
-        Track camera position and map your room
-      </message>
-      <if expr="is_android">
-        <message name="IDS_VR_INFOBAR_TEXT" desc="Text requesting permission for a site to use VR">
-          <ph name="URL">$1<ex>google.com</ex></ph> wants to be able to start virtual reality sessions
-        </message>
-        <message name="IDS_AR_INFOBAR_TEXT" desc="Text requesting permission for a site to use AR">
-          <ph name="URL">$1<ex>google.com</ex></ph> wants to track camera position and map your room
-        </message>
-      </if>
 
       <!-- Sensor messages -->
       <message name="IDS_SENSORS_ALLOWED_TOOLTIP" desc="Location bar icon tooltip text when a page is allowed to use device's sensors.">
@@ -8932,30 +8789,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
         Always block <ph name="HOST">$1<ex>mail.google.com</ex></ph> from accessing sensors
       </message>
 
-      <!-- Quota messages -->
-      <if expr="is_android">
-        <message name="IDS_REQUEST_QUOTA_INFOBAR_TEXT" desc="Mobile: For Android device. Text requesting permission for a site to use a new (larger) quota to persistently store data on the device (e.g. for persistent-type filesystem).">
-          <ph name="URL">$1<ex>html5rocks.com</ex></ph> wants to permanently store data on your device
-        </message>
-        <message name="IDS_REQUEST_LARGE_QUOTA_INFOBAR_TEXT" desc="Mobile: For Android device. Text requesting permission for a site to use a new (larger) quota to persistently store large data on the user's device (e.g. for persistent-type filesystem).">
-          <ph name="URL">$1<ex>html5rocks.com</ex></ph> wants to permanently store large data on your device
-        </message>
-        <message name="IDS_REQUEST_QUOTA_PERMISSION_TITLE" desc="Mobile: For Android device. Title text for dialog requesting permission for a site to use a new (larger) quota to persistently store large data on the user's device (e.g. for persistent-type filesystem).">
-          Storage
-        </message>
-      </if>
-      <if expr="not is_android">
-        <message name="IDS_REQUEST_QUOTA_INFOBAR_TEXT" desc="Text requesting permission for a site to use a new (larger) quota to persistently store data on the user's local computer (e.g. for persistent-type filesystem).">
-          <ph name="URL">$1<ex>html5rocks.com</ex></ph> wants to permanently store data on your local computer
-        </message>
-        <message name="IDS_REQUEST_LARGE_QUOTA_INFOBAR_TEXT" desc="Text requesting permission for a site to use a new (larger) quota to persistently store large data on the user's local computer (e.g. for persistent-type filesystem).">
-          <ph name="URL">$1<ex>html5rocks.com</ex></ph> wants to permanently store large data on your local computer
-        </message>
-      </if>
-      <message name="IDS_REQUEST_QUOTA_PERMISSION_FRAGMENT" desc="Permission fragment presented in the permission bubble when the webapp requests new larger quota to persistently store data on the device. Follows a 'This site would like to:' prompt.">
-        Store files on this device
-      </message>
-
       <!-- Shelf strings -->
       <if expr="chromeos">
         <message name="IDS_SHELF_CONTEXT_MENU_CLOSE" desc="Title text for the 'close' context menu item of the shelf">
@@ -9071,6 +8904,9 @@ Please help our engineers fix this problem. Tell us what happened right before y
         <message name="IDS_APP_LIST_CONTEXT_MENU_NEW_WINDOW" desc="Title text for the 'open new' context menu item of an app list item configured to open windowed">
           New window
         </message>
+        <message name="IDS_APP_LIST_CONTEXT_MENU_NEW_TABBED_WINDOW" desc="Title text for the 'open new' context menu item of an app list item configured to open in a tabbed window">
+          New tabbed window
+        </message>
         <message name="IDS_APP_LIST_CONTEXT_MENU_PIN" desc="Title text for the 'pin' context menu item of an app list item.">
           Pin to shelf
         </message>
@@ -9375,7 +9211,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
           Command unavailable. Press control-N to open a new window.
         </message>
         <message name="IDS_A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED" desc="The accessible text read when the user enters window overview mode in Ash.">
-          Entered window overview mode. Press tab to navigate.
+          Entered window overview mode. Swipe to navigate, or press tab if using a keyboard.
         </message>
         <message name="IDS_A11Y_ALERT_WORKSPACE_FULLSCREEN_STATE_ENTERED" desc="The accessible text read when the current workspace state changes to fullscreen, which means the window in current workspace is fullcreen.">
           Entered full screen
@@ -9406,28 +9242,31 @@ Please help our engineers fix this problem. Tell us what happened right before y
       <message name="IDS_DEVICE_AUTO_REFRESH" desc="Instructions for how to auto-refresh the page">
         Add a query param in URL to auto-refresh the page: chrome://device-log/?refresh=&lt;sec&gt;
       </message>
-      <message name="IDS_DEVICE_LOG_REFRESH" desc="Button to refresh device log">
+      <message name="IDS_DEVICE_LOG_REFRESH" desc="Button to refresh device log entries">
         Refresh
       </message>
-      <message name="IDS_DEVICE_LOG_CLEAR" desc="Button to clear device log">
+      <message name="IDS_DEVICE_LOG_CLEAR" desc="Button to clear device log entries">
         Clear
       </message>
+      <message name="IDS_DEVICE_LOG_CLEAR_TYPES" desc="Button to clear device type checkboxes">
+        Clear Types
+      </message>
       <message name="IDS_DEVICE_LOG_NO_ENTRIES" desc="Text shown when device log is empty">
         No log entries
       </message>
-      <message name="IDS_DEVICE_LOG_LEVEL_SHOW" desc="'Show' label before logging level checkboxes">
-        Show:
+      <message name="IDS_DEVICE_LOG_LEVEL_LABEL" desc="Label for the logging level select dropdown">
+        Log Level:
       </message>
-      <message name="IDS_DEVICE_LOG_LEVEL_ERROR" desc="Error logging level checkbox">
+      <message name="IDS_DEVICE_LOG_LEVEL_ERROR" desc="Error logging level label">
         Error
       </message>
-      <message name="IDS_DEVICE_LOG_LEVEL_USER" desc="User logging level checkbox">
+      <message name="IDS_DEVICE_LOG_LEVEL_USER" desc="User logging level label">
         User
       </message>
-      <message name="IDS_DEVICE_LOG_LEVEL_EVENT" desc="Event logging level checkbox">
+      <message name="IDS_DEVICE_LOG_LEVEL_EVENT" desc="Event logging level label">
         Event
       </message>
-      <message name="IDS_DEVICE_LOG_LEVEL_DEBUG" desc="Debug logging level checkbox">
+      <message name="IDS_DEVICE_LOG_LEVEL_DEBUG" desc="Debug logging level label">
         Debug
       </message>
       <message name="IDS_DEVICE_LOG_TYPE_LOGIN" desc="Checkbox to enable showing events of type LOGIN">
@@ -9857,6 +9696,44 @@ Please help our engineers fix this problem. Tell us what happened right before y
       Save changes
     </message>
 
+    <!-- New Native File System permission dialog -->
+    <message name="IDS_NATIVE_FILE_SYSTEM_ORIGIN_SCOPED_WRITE_PERMISSION_FILE_TEXT" desc="Text of the dialog for confirming origin scoped write access to files using the Native File System API">
+      <ph name="ORIGIN">$1<ex>example.com</ex></ph> will be able to edit <ph name="FILENAME">$2<ex>README.md</ex></ph> until you close all tabs for this site
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_ORIGIN_SCOPED_WRITE_PERMISSION_DIRECTORY_TEXT" desc="Text of the dialog for confirming origin scoped write access to a directory using the Native File System API">
+      <ph name="ORIGIN">$1<ex>example.com</ex></ph> will be able to edit files in <ph name="FOLDERNAME">$2<ex>My Project</ex></ph> until you close all tabs for this site
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_ORIGIN_SCOPED_READ_PERMISSION_FILE_TEXT" desc="Text of dialog for confirming read access to files using the Native File System API">
+      <ph name="ORIGIN">$1<ex>example.com</ex></ph> will be able to view <ph name="FILENAME">$2<ex>README.md</ex></ph> until you close all tabs for this site
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_ORIGIN_SCOPED_READ_PERMISSION_DIRECTORY_TEXT" desc="Text of dialog asking user if they intended to share a particular directory">
+      <ph name="ORIGIN">$1<ex>example.com</ex></ph> will be able to view files in <ph name="FOLDERNAME">$2<ex>My Project</ex></ph> until you close all tabs for this site
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_EDIT_FILE_PERMISSION_TITLE" desc="Title of dialog asking user to confirm giving read and write access to a file using the Native File System API">
+      Let site edit <ph name="FILE_NAME">$1<ex>README.md</ex></ph>?
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_EDIT_DIRECTORY_PERMISSION_TITLE" desc="Title of dialog asking user to confirm giving read and write access to (files in) a directory using the Native File System API">
+      Let site edit files?
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_READ_FILE_PERMISSION_TITLE" desc="Title of dialog asking user to confirm giving read access to a file using the Native File System API">
+      Let site view <ph name="FILE_NAME">$1<ex>README.md</ex></ph>?
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_READ_DIRECTORY_PERMISSION_TITLE" desc="Title of dialog asking user if they intended to share a particular directory">
+      Let site view files?
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_EDIT_FILE_PERMISSION_ALLOW_TEXT" desc="Text of the 'allow' button in the dialog for confirming write access to a file using the Native File System API">
+      Edit file
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_EDIT_DIRECTORY_PERMISSION_ALLOW_TEXT" desc="Text of the 'allow' button in the dialog for confirming write access to a directory (and the files in it) using the Native File System API">
+      Edit files
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_VIEW_FILE_PERMISSION_ALLOW_TEXT" desc="Text of the 'allow' button in the dialog for confirming read access to a file using the Native File System API">
+      View file
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_VIEW_DIRECTORY_PERMISSION_ALLOW_TEXT" desc="Text of the 'allow' button in the dialog for confirming read access to a directory (and the files in it) using the Native File System API">
+      View files
+    </message>
+
     <!-- Native File System usage indicator -->
     <message name="IDS_NATIVE_FILE_SYSTEM_WRITE_USAGE_TOOLTIP" desc="Tooltip for the omnibox Native File System API file write access usage indicator.">
       This page is allowed to edit files
@@ -9879,12 +9756,21 @@ Please help our engineers fix this problem. Tell us what happened right before y
     <message name="IDS_NATIVE_FILE_SYSTEM_USAGE_BUBBLE_WRITABLE_FILES_AND_DIRECTORIES_TEXT" desc="Text of the bubble showing what files and directories an origin can currently write to">
       <ph name="ORIGIN">$1<ex>example.com</ex></ph> can edit the following files and folders
     </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_USAGE_BUBBLE_SINGLE_READABLE_FILE_TEXT" desc="Text of the bubble showing what file an origin can currently access">
+      <ph name="ORIGIN">$1<ex>example.com</ex></ph> can view <ph name="FILENAME">$2<ex>README.md</ex></ph>
+    </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_USAGE_BUBBLE_READABLE_FILES_TEXT" desc="Text of the bubble showing what files an origin can currently access">
+      <ph name="ORIGIN">$1<ex>example.com</ex></ph> can view the following files
+    </message>
     <message name="IDS_NATIVE_FILE_SYSTEM_USAGE_BUBBLE_SINGLE_READABLE_DIRECTORY_TEXT" desc="Text of the bubble showing what files and directories an origin can currently access">
       <ph name="ORIGIN">$1<ex>example.com</ex></ph> can view files in <ph name="FOLDERNAME">$2<ex>My Project</ex></ph>
     </message>
     <message name="IDS_NATIVE_FILE_SYSTEM_USAGE_BUBBLE_READABLE_DIRECTORIES_TEXT" desc="Text of the bubble showing what files and directories an origin can currently access">
       <ph name="ORIGIN">$1<ex>example.com</ex></ph> can view files in the following folders
     </message>
+    <message name="IDS_NATIVE_FILE_SYSTEM_USAGE_BUBBLE_READABLE_FILES_AND_DIRECTORIES_TEXT" desc="Text of the bubble showing what files and directories an origin can currently access">
+      <ph name="ORIGIN">$1<ex>example.com</ex></ph> can view the following files and folders
+    </message>
     <message name="IDS_NATIVE_FILE_SYSTEM_USAGE_BUBBLE_READ_AND_WRITE" desc="Text of the bubble showing what files and directories an origin can currently read and write to">
       <ph name="ORIGIN">$1<ex>example.com</ex></ph> can view and edit the following files and folders
     </message>
@@ -10185,6 +10071,22 @@ Please help our engineers fix this problem. Tell us what happened right before y
         Reinsert your security key and try again
       </message>
 
+      <!-- WebAuthn authenticator internal user verification -->
+      <message name="IDS_WEBAUTHN_UV_RETRY_TITLE" desc="The title on a dialog shown to the user when a previous attempt to verify their identity through fingerprints failed, and they are being asked to try again.">
+       Fingerprint not recognized
+      </message>
+      <message name="IDS_WEBAUTHN_UV_RETRY_DESCRIPTION" desc="The description on a dialog shown to the user when a previous attempt to verify their identity through fingerprints failed, and they are being asked to try again.">
+        Your fingerprint couldn't be recognized. Try again.
+      </message>
+      <message name="IDS_WEBAUTHN_UV_RETRY_ERROR_FAILED_RETRIES" desc="Error message displayed when the user's fingerprint is not recognized, and they are being asked to try again.">
+        {NUM_ATTEMPTS, plural,
+          =1 {You have one attempt remaining.}
+          other {You have # attempts remaining.}}
+      </message>
+      <message name="IDS_WEBAUTHN_UV_ERROR_LOCKED" desc="Error message. Displayed when the user's authenticator has been locked due to too many failed attempts to read their fingerprint, and they are required to enter a PIN to unlock it.">
+        Your security key is locked because your fingerprint couldn't be recognized. To unlock it, enter your PIN.
+      </message>
+
       <!-- WebAuthn account selection for resident keys -->
       <message name="IDS_WEBAUTHN_ACCOUNT_COLUMN" desc="The title of a column in a table under which will be a list of usernames or email addresses, e.g. joe@gmail.com.">
         Account
@@ -10303,12 +10205,36 @@ Please help our engineers fix this problem. Tell us what happened right before y
     <message name="IDS_DEEP_SCANNING_DIALOG_DRAG_FILES_FAILURE_MESSAGE" desc="Message shown in tab modal dialog after performing a deep scan of dragged files when they doesn't comply with enterprise security policies">
       These files violate your organization's security policies and can't be dropped.
     </message>
+    <message name="IDS_DEEP_SCANNING_DIALOG_UPLOAD_WARNING_MESSAGE" desc="Message shown in tab modal dialog after performing a deep scan of uploaded data when it doesn't comply with enterprise security policies to warn the user and allow them to proceed or not">
+      This upload violates your organization's security policies. Do you want to proceed anyway?
+    </message>
+    <message name="IDS_DEEP_SCANNING_DIALOG_PASTE_WARNING_MESSAGE" desc="Message shown in tab modal dialog after performing a deep scan of pasted data when it doesn't comply with enterprise security policies to warn the user and allow them to proceed or not">
+      This pasted data violates your organization's security policies. Do you want to proceed anyway?
+    </message>
+    <message name="IDS_DEEP_SCANNING_DIALOG_DRAG_DATA_WARNING_MESSAGE" desc="Message shown in tab modal dialog after performing a deep scan of dragged data when it doesn't comply with enterprise security policies to warn the user and allow them to proceed or not">
+      This dropped data violates your organization's security policies. Do you want to proceed anyway?
+    </message>
+    <message name="IDS_DEEP_SCANNING_DIALOG_DRAG_FILES_WARNING_MESSAGE" desc="Message shown in tab modal dialog after performing a deep scan of dragged files when they doesn't comply with enterprise security policies to warn the user and allow them to proceed or not">
+      These dropped files violate your organization's security policies. Do you want to proceed anyway?
+    </message>
     <message name="IDS_DEEP_SCANNING_DIALOG_TIMEOUT_MESSAGE" desc="Message shown in tab modal dialog after a deep scan times out.">
       Something went wrong. Scanning could not be completed. Please try again.
     </message>
+    <message name="IDS_DEEP_SCANNING_DIALOG_PROCEED_BUTTON" desc="Text shown in the proceed button of a tab modal dialog after performing a deep scan of data to ignore the obtained warning and proceed with the upload.">
+      Proceed anyway
+    </message>
+    <message name="IDS_DEEP_SCANNING_DIALOG_CANCEL_WARNING_BUTTON" desc="Text shown in the cancel button of a tab modal dialog after performing a deep scan of data to acknowledge the obtained warning and close the dialog.">
+      Cancel
+    </message>
     <message name="IDS_DEEP_SCANNING_DIALOG_CANCEL_UPLOAD_BUTTON" desc="Text shown in the cancel button of a tab modal dialog while performing a deep scan of data to see if it complies with enterprise policies">
       Cancel upload
     </message>
+    <message name="IDS_DEEP_SCANNING_DIALOG_LARGE_FILE_FAILURE_MESSAGE" desc="Message shown in the tab modal dialog when the file to be scanned is too large according to the enterprise policies">
+      Your organization can scan files up to 50 MB. Try uploading a smaller file.
+    </message>
+    <message name="IDS_DEEP_SCANNING_DIALOG_ENCRYPTED_FILE_FAILURE_MESSAGE" desc="Message shown in the tab modal dialog when the uploaded file to be scanned is encrypted and when this is not allowed by enterprise policies">
+      This upload is encrypted and violates your organization's security policies.
+    </message>
 
 
     <!-- Deep scanning open now dialog strings -->
@@ -10327,10 +10253,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
       Scan before opening?
     </message>
     <message name="IDS_DEEP_SCANNING_INFO_DIALOG_MESSAGE" desc="Message shown in tab modal dialog when the user opens a download that recommends deep scanning">
-      The selected file is unknown and may be dangerous. Advanced Protection recommends sending this file to Brave to check for malware.
+        The selected file is unknown and may be dangerous. Send to Brave Advanced Protection for scanning?
     </message>
     <message name="IDS_DEEP_SCANNING_INFO_DIALOG_ACCEPT_BUTTON" desc="The text on the accept button in tab modal dialog when the user opens a download that recommends deep scanning">
-      Scan
+      Send
     </message>
     <message name="IDS_DEEP_SCANNING_INFO_DIALOG_CANCEL_BUTTON" desc="The text on the cancel button in tab modal dialog when the user opens a download that recommends deep scanning">
       Cancel
@@ -10370,13 +10296,54 @@ Please help our engineers fix this problem. Tell us what happened right before y
       Verify
     </message>
 
+    <!-- App uninstall prompt title -->
+    <message name="IDS_PROMPT_APP_UNINSTALL_TITLE" desc="Title text for uninstalling an app.">
+      Uninstall "<ph name="APP_NAME">$1<ex>Gmail Checker</ex></ph>"?
+    </message>
+
+    <!-- App uninstall prompt for non-Brave -->
+    <message name="IDS_APP_UNINSTALL_PROMPT_REMOVE_DATA_CHECKBOX_FOR_NON_GOOGLE" desc="Checkbox text to ask the user whether they want to remove associated data at uninstall time. Only used when uninstalling an app associated with a particular website.">
+      Also clear browsing data (<ph name="URL">$1<ex>pinterest.com</ex></ph>) which will sign you out of <ph name="DOMAIN">$2<ex>Pinterest.com</ex></ph>. <ph name="LEARN_MORE">$3<ex>Learn more</ex></ph>
+    </message>
+
+    <!-- App uninstall prompt for Brave -->
+    <message name="IDS_APP_UNINSTALL_PROMPT_REMOVE_DATA_CHECKBOX_FOR_GOOGLE" desc="Checkbox text to ask the user whether they want to remove associated data at uninstall time for Brave hostnames. Only used when uninstalling an app associated with a Brave hostname.">
+      Also clear browsing data (<ph name="URL">$1<ex>www.google.com</ex></ph>) which may sign you out of Brave.com. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ph>
+    </message>
+
+    <message name="IDS_APP_UNINSTALL_PROMPT_LEARN_MORE" desc="The label that the user can click to learn more about removing associated data at uninstall time.">
+      Learn more
+    </message>
+
+    <!-- Speech On-Device API -->
+    <message name="IDS_UTILITY_PROCESS_SODA_SERVICE_NAME" desc="The name of the service process used to interface with the Speech On-Demand API.">
+      SODA Service
+    </message>
+
     <!-- App pause prompt -->
     <message name="IDS_APP_PAUSE_PROMPT_TITLE" desc="Titlebar of the app pause prompt window">
-      App paused
+      <ph name="APP_NAME">$1<ex>Gmail Checker</ex></ph> is paused
     </message>
 
     <message name="IDS_APP_PAUSE_HEADING" desc="Tells the user the app will be paused.">
-      The limit on "<ph name="APP_NAME">$1<ex>Brave Photos</ex></ph>" that your parent set ran out. You can use it for <ph name="TIME_LIMIT">$2<ex>2 hours and 30 minutes</ex></ph> tomorrow.
+      You reached the time limit your parent set for <ph name="APP_NAME">$1<ex>Brave Photos</ex></ph>. You can use it for <ph name="TIME_LIMIT">$2<ex>2 hours and 30 minutes</ex></ph> tomorrow.
+    </message>
+
+    <message name="IDS_APP_PAUSE_HEADING_FOR_WEB_APPS" desc="Tells the user the app will be paused.">
+      You reached the time limit your parent set for <ph name="APP_NAME">$1<ex>Brave Photos</ex></ph> Brave app. You can use it for <ph name="TIME_LIMIT">$2<ex>2 hours and 30 minutes</ex></ph> tomorrow.
+    </message>
+
+    <!-- App block prompt -->
+    <message name="IDS_APP_BLOCK_PROMPT_TITLE" desc="Titlebar of the app block prompt window">
+      <ph name="APP_NAME">$1<ex>Gmail Checker</ex></ph> is blocked
+    </message>
+
+    <message name="IDS_APP_BLOCK_HEADING_FOR_CHILD" desc="Tells the child the app is blocked.">
+      <ph name="APP_NAME">$1<ex>Brave Photos</ex></ph> is blocked by your parent. Ask your parent for permission to use this app.
+    </message>
+
+    <message name="IDS_APP_BLOCK_HEADING" desc="Tells the user the app is blocked.">
+      <ph name="APP_NAME">$1<ex>Brave Photos</ex></ph> is blocked by admin. Ask admin for permission to use this app.
     </message>
 
     <!-- Extension request -->
diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp
new file mode 100644
index 000000000000..f5e241511348
--- /dev/null
+++ b/app/os_settings_search_tag_strings.grdp
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Search tags used for CrOS settings search (go/cros-settings-search). -->
+<!--This file is created by l10nUtil.js. Do not edit manually.-->
+<grit-part>
+  <!-- Internet Page -->
+  <message name="IDS_SETTINGS_TAG_NETWORK_SETTINGS" desc="Search result item which, when clicked, navigates the user to network settings.">
+    Network settings
+  </message>
+  <message name="IDS_SETTINGS_TAG_NETWORK_SETTINGS_ALT1" desc="Search result item which, when clicked, navigates the user to network settings. Alternate phrase for 'Network settings'.">
+    Internet settings
+  </message>
+  <message name="IDS_SETTINGS_TAG_ETHERNET_SETTINGS" desc="Search result item which, when clicked, navigates the user to Ethernet settings.">
+    Ethernet settings
+  </message>
+  <message name="IDS_SETTINGS_TAG_ETHERNET_SETTINGS_ALT1" desc="Search result item which, when clicked, navigates the user to Ethernet settings. Alternate phrase for 'Ethernet settings'.">
+    Configure Ethernet
+  </message>
+  <message name="IDS_SETTINGS_TAG_WIFI_SETTINGS" desc="Search result item which, when clicked, navigates the user to Wi-Fi settings.">
+    Wi-Fi settings
+  </message>
+  <message name="IDS_SETTINGS_TAG_TURN_ON_WIFI" desc="Search result item which, when clicked, navigates the user to settings where they can turn on Wi-Fi.">
+    Turn on Wi-Fi
+  </message>
+  <message name="IDS_SETTINGS_TAG_TURN_ON_WIFI_ALT1" desc="Search result item which, when clicked, navigates the user to settings where they can turn on Wi-Fi. Alternate phrase for 'Turn on Wi-Fi'.">
+    Enable Wi-Fi
+  </message>
+  <message name="IDS_SETTINGS_TAG_TURN_OFF_WIFI" desc="Search result item which, when clicked, navigates the user to settings where they can turn off Wi-Fi.">
+    Turn off Wi-Fi
+  </message>
+  <message name="IDS_SETTINGS_TAG_TURN_OFF_WIFI_ALT1" desc="Search result item which, when clicked, navigates the user to settings where they can turn off Wi-Fi. Alternate phrase for 'Turn off Wi-Fi'.">
+    Disable Wi-Fi
+  </message>
+  <message name="IDS_SETTINGS_TAG_CONNECT_WIFI" desc="Search result item which, when clicked, navigates the user to settings where they can connect to a Wi-Fi network.">
+    Connect Wi-Fi
+  </message>
+  <message name="IDS_SETTINGS_TAG_DISCONNECT_WIFI" desc="Search result item which, when clicked, navigates the user to settings where they can disconnect from a Wi-Fi network.">
+    Disconnect Wi-Fi
+  </message>
+</grit-part>
diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp
index a41b73924dbb..1068c4570e67 100644
--- a/app/os_settings_strings.grdp
+++ b/app/os_settings_strings.grdp
@@ -3,6 +3,12 @@
 <!--This file is created by l10nUtil.js. Do not edit manually.-->
 <grit-part>
 <if expr="chromeos">
+
+  <!-- Shared across multiple pages -->
+  <message name="IDS_SETTINGS_TURN_ON" desc="Label for turn on buttons.">
+    Turn on
+  </message>
+
   <!-- About (OS Settings) -->
   <message name="IDS_OS_SETTINGS_ABOUT_PAGE_BUILD_DETAILS" desc="Label of the row button that clicks into Build details">
     Build Details
@@ -19,6 +25,123 @@
   <message name="IDS_OS_SETTINGS_ABOUT_DEVELOPER_MODE" desc="The title label for developer mode.">
     Developer Mode
   </message>
+    <message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH" desc="The label for the relaunch button that relaunches the browser once update is complete">
+    Restart
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH_AND_POWERWASH" desc="The label for the button that relaunches and powerwashes the browser once update is complete">
+    Restart and reset
+  </message>
+  <message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated BraveOS/BraveOS">
+    Nearly up to date! Restart your device to finish updating.
+  </message>
+  <message name="IDS_SETTINGS_UPGRADE_UPDATING" desc="Status label: Updating BraveOS or BraveOS">
+    Updating your device
+  </message>
+  <message name="IDS_SETTINGS_UPGRADE_UPDATING_PERCENT" desc="Status label: Updating BraveOS or BraveOS (90%)">
+    Updating your device (<ph name="PROGRESS_PERCENT">$1<ex>90%</ex></ph>)
+  </message>
+  <message name="IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH" desc="Status label: Updating BraveOS/BraveOS to a specified channel">
+    Updating your device to <ph name="CHANNEL_NAME">$1<ex>stable</ex></ph> channel (<ph name="PROGRESS_PERCENT">$2<ex>90%</ex></ph>)
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_END_OF_LIFE_TITLE" desc="Title used for End of Life section on the About Page.">
+    Update schedule
+  </message>
+  <message name="IDS_SETTINGS_UPGRADE_ROLLBACK_IN_PROGRESS" desc="Status label: Rolling back BraveOS or Chrome OS.">
+    Your administrator is rolling back this device (<ph name="PROGRESS_PERCENT">$1<ex>90%</ex></ph>)
+  </message>
+  <message name="IDS_SETTINGS_UPGRADE_ROLLBACK_SUCCESS" desc="Status label: Successfully rolled back Chrome OS. All data on the device will be deleted during the next reboot.">
+    Your administrator rolled back this device. Please save important files, then restart. All data on the device will be deleted.
+  </message>
+  <message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH" desc="Status label: Channel was successfully switched on BraveOS/BraveOS">
+    Channel changed. Restart your device to apply changes.
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_TPM_FIRMWARE_UPDATE_TITLE" desc="Title for the line item on the about page that allows the user to trigger a device hardware reset and request installation of a TPM firmware update.">
+    Powerwash for added security
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_TPM_FIRMWARE_UPDATE_DESCRIPTION" desc="Descriptive text shown alongside the line item on the about page that allows the user to trigger a device hardware reset and request installation of a TPM firmware update.">
+    This upgrade resets your Bravebook and removes current user data.
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_CHANGE_CHANNEL" desc="Button label for channel switch.">
+    Change channel
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_CHANGE_CHANNEL_AND_POWERWASH" desc="Button label for channel switch and powerwash.">
+    Change channel and Powerwash
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_MESSAGE" desc="Message that notifies user that channel change will be applied later.">
+    You are changing to a channel with an older version of <ph name="PRODUCT_NAME">$1<ex>Chrome OS</ex></ph>. The channel change will be applied when the channel version matches the version currently installed on your device.
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_TITLE" desc="Title for the message that the channel change will be applied later.">
+    Channel change will be applied later
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_MESSAGE" desc="Message that warns user about powerwash.">
+    This will remove all local users, files, data, and other settings after your next restart. All users will need to sign in again.
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_TITLE" desc="The title for the message that warns user about powerwash.">
+    Powerwash required on next reboot
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_MESSAGE" desc="Warning about switching to developer (unstable) channel.">
+    You are updating to an unstable version of <ph name="PRODUCT_NAME">$1<ex>Chrome OS</ex></ph> which contains features that are in progress. Crashes and unexpected bugs will occur. Please proceed with caution.
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_TITLE" desc="The title of the warning about switching to developer (unstable) channel.">
+    Warning: you are switching to developer channel
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_BETA" desc="The beta option in the channel select.">
+    Beta
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_DEV" desc="The development option in the channel select.">
+    Developer - unstable
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_STABLE" desc="The stable option in the channel select.">
+    Stable
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_UPDATE_WARNING_MESSAGE" desc="Warning about update over mobile data, specifying the size in megabytes.">
+    Update will be downloaded using <ph name="UPDATE_SIZE_MB">$1<ex>0</ex></ph> MB of mobile data. Would you like to continue?
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_UPDATE_WARNING_TITLE" desc="The title of the warning about update over mobile data.">
+    Download update using mobile data
+  </message>
+    <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_BETA" desc="The beta label in the message about current channel.">
+    beta
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_CANARY" desc="The canary label in the message about current channel.">
+    canary
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_DEV" desc="The dev label in the message about current channel.">
+    dev
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_CHANNEL" desc="The channel label under Detailed build info.">
+    Channel
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_STABLE" desc="The stable label in the message about current channel.">
+    stable
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_CHECK_FOR_UPDATES" desc="The button label to check for updates and apply (download and install) if found">
+    Check for updates
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL" desc="The message about current channel.">
+    Currently on <ph name="CHANNEL_NAME">$1<ex>stable</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_DETAILED_BUILD_INFO" desc="Label describing the section that shows detailed information about the current Brave build.">
+    Additional details
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_RELEASE_NOTES" desc="Warning that internet connection is required to display Chrome OS release notes.">
+      Internet connection required
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_SHOW_RELEASE_NOTES" desc="Text of the button which shows user the release notes.">
+    See what's new
+  </message>
+  <message name="IDS_SETTINGS_UPGRADE_UP_TO_DATE" desc="Status label: Already up to date (BraveOS/BraveOS)">
+    Your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> is up to date
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_END_OF_LIFE_MESSAGE_FUTURE" desc="Message used when end of life has not yet past current date in End of Life section on the About Page.">
+    This device will get automatic software and security updates until <ph name="MONTH_AND_YEAR">$1<ex>September 2020</ex></ph>. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$2<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_END_OF_LIFE_MESSAGE_PAST" desc="Message used when End of Life is past current date in END OF LIFE section on the About Page.">
+    This device stopped getting automatic software and security updates in <ph name="MONTH_AND_YEAR">$1<ex>September 2020</ex></ph>. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$2<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_ABOUT_PAGE_LAST_UPDATE_MESSAGE" desc="Message shown on the top level about page to inform the user that this device will no longer receive latest software updates.">
+    This is the last automatic software and security update for this <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>. To get future updates, upgrade to a newer model. &lt;a target="_blank" href="<ph name="URL">$2<ex>https://google.com/</ex></ph>"&gt;Learn more&lt;/a&gt;
+  </message>
 
   <!-- Profiles (OS settings) -->
   <message name="IDS_OS_SETTINGS_PEOPLE" desc="Name of a section in the OS settings page." meaning="Profiles and their accounts.">
@@ -33,11 +156,14 @@
   <message name="IDS_OS_SETTINGS_SYNC_PAGE_TITLE" desc="Settings sub-page title for sync.">
     Sync your settings
   </message>
-  <message name="IDS_OS_SETTINGS_SYNC_TURN_ON" desc="Button label for turning on sync. Sync is capitalized because it is the proper name of a feature.">
-    Turn on Sync
+  <message name="IDS_OS_SETTINGS_SYNC_TURN_ON" desc="Button label for turning on synchronization of settings across Chrome OS devices.">
+    Turn on
   </message>
-  <message name="IDS_OS_SETTINGS_SYNC_TURN_OFF" desc="Button label for turning off sync. Sync is capitalized because it is the proper name of a feature.">
-    Turn off Sync
+  <message name="IDS_OS_SETTINGS_SYNC_TURN_OFF" desc="Button label for turning off synchronization of settings across Chrome OS devices.">
+    Turn off
+  </message>
+  <message name="IDS_OS_SETTINGS_SYNC_FEATURE_LABEL" desc="Label describing the OS sync feature.">
+    Your apps and settings will sync across all Chrome OS devices where you are signed in with your Brave account. For browser sync options, go to<ph name="LINK_BEGIN">&lt;a&gt;</ph>Brave settings<ph name="LINK_END">&lt;/a&gt;</ph>.
   </message>
   <message name="IDS_OS_SETTINGS_SYNC_APPS_CHECKBOX_LABEL" desc="Label for the checkbox which enables syncing of apps across devices.">
     Apps
@@ -51,6 +177,18 @@
   <message name="IDS_OS_SETTINGS_WALLPAPER_CHECKBOX_LABEL" desc="Label for the checkbox which enables syncing of wallpaper across devices.">
     Wallpaper
   </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_SUBMENU_LABEL" desc="Label of Account Manager submenu in Settings page.">
+    Brave Accounts
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_PAGE_TITLE" desc="Title of Account Manager Settings page.">
+    My accounts
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE" desc="Title of the fingerprint subpage.">
+    Fingerprint
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE" desc="Label for the button that opens the multi-profile user manager.">
+    Manage other profiles
+  </message>
 
   <!-- Languages and Inputs (OS settings) -->
   <message name="IDS_OS_SETTINGS_LANGUAGES_AND_INPUT_PAGE_TITLE" desc="Name of the OS settings page which displays language method preferences.">
@@ -59,16 +197,101 @@
   <message name="IDS_OS_SETTINGS_LANGUAGES_LIST_TITLE" desc="Title for the list of the user's preferred written languages.">
     Languages
   </message>
+  <message name="IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_ORDERING_INSTRUCTIONS" desc="Explanatory message about ordering the list of languages.">
+    Add languages or reorder list. <ph name="BEGIN_LINK">&lt;a&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_LANGUAGES_INPUT_METHODS_LIST_TITLE" desc="Title for the current input method in the header for the collapsible list of enabled input methods (keyboard layouts and input method editors).">
+    Input method
+  </message>
+  <message name="IDS_SETTINGS_LANGUAGES_INPUT_METHOD_ENABLED" desc="Label underneath the currently active input method in the list of enabled input methods.">
+    Enabled
+  </message>
+  <message name="IDS_SETTINGS_LANGUAGES_INPUT_METHODS_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the input options (keyboard and keyboard layouts). Only visible by screen reader software.">
+    Show input options
+  </message>
+  <message name="IDS_SETTINGS_LANGUAGES_INPUT_METHODS_MANAGED_BY_POLICY" desc="Label which is shown on the manage input methods page if input methods are managed by policy.">
+    Your administrator has limited the available input methods.
+  </message>
+  <message name="IDS_SETTINGS_LANGUAGES_INPUT_METHODS_MANAGE" desc="Button under the list of input methods which opens a sub-page that lets the user enable or disable keyboard layouts and input method editors.">
+    Manage input methods
+  </message>
+  <message name="IDS_SETTINGS_LANGUAGES_MANAGE_INPUT_METHODS_TITLE" desc="Name of the settings sub-page which allows enabling and disabling input methods.">
+    Manage input methods
+  </message>
+  <message name="IDS_SETTINGS_LANGUAGES_SHOW_IME_MENU" desc="The label for the toggle button controlling showing the IME menu in the shelf.">
+    Show input options in the shelf
+  </message>
+  <message name="IDS_SETTINGS_LANGUAGES_RESTART_TO_DISPLAY_LANGUAGE" desc="The aria label to be read aloud to describe a button for restarting the device to change the device's UI language.">
+    Restart device to show system text in <ph name="LANGUAGE">$1<ex>English</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE" desc="The label used for a button that changes the UI language.">
+    Show system text in this language
+  </message>
+  <!-- The non-Chrome OS string is in settings_google_chrome_strings.grdp -->
+  <message name="IDS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE" desc="The label for a language that is currently used as the UI display language.">
+    System text is shown in this language
+  </message>
 
   <!-- Device Page (OS Settings) -->
   <message name="IDS_OS_SETTINGS_TOUCHPAD_REVERSE_SCROLL_LABEL">
     Reverse scrolling <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
   </message>
+  <message name="IDS_SETTINGS_DEVICE_TITLE" desc="Name of the settings page which displays device and peripheral settings.">
+    Device
+  </message>
+  <message name="IDS_SETTINGS_SCROLL_LABEL" desc="In Device Settings, the title above the radio buttons to choose the scrolling behavior.">
+    Scrolling
+  </message>
 
   <!-- Personalization Page (OS settings) -->
   <message name="IDS_OS_SETTINGS_PERSONALIZATION" desc="Name of the OS settings page which displays personalization preferences.">
     Personalization
   </message>
+  <message name="IDS_SETTINGS_CHANGE_PICTURE_TAKE_PHOTO" desc="The text on the button to take photo of the current user.">
+    Take photo
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PICTURE_CAPTURE_VIDEO" desc="The text on the button to capture video of the current user.">
+    Capture video
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PICTURE_DISCARD_PHOTO" desc="The text on the button to discard the captured photo or video of the current user.">
+    Discard photo or video
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PICTURE_PREVIEW_ALT" desc="Alt text for the big preview of user image.">
+    User image preview
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PICTURE_SWITCH_MODE_TO_VIDEO" desc="The text on the button to switch the mode of the camera to video.">
+    Switch to video recorder
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PICTURE_DIALOG_TEXT" desc="Text with description of what to do on Change picture subpage.">
+    Choose a picture to display for your account on the sign-in screen
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PICTURE_SWITCH_MODE_TO_CAMERA" desc="The text on the button to switch the mode of the camera to photo.">
+    Switch to camera mode
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PICTURE_CHOOSE_FILE" desc="Text on a button that shows file dialog to choose a picture from file.">
+    Choose a file
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PICTURE_OLD_PHOTO" desc="The text on the existing photo, which was either taken by the webcam or read from a file.">
+    Existing photo from camera or file
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PICTURE_OLD_VIDEO" desc="The text on the existing video, which was either taken by the webcam or read from a file.">
+    Existing video from camera or file
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PICTURE_AUTHOR_CREDIT_TEXT" desc="Label in the profile picture picker for the photo credit for the selected image.">
+    Photo by <ph name="NAME">$1<ex>John Doe</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_PHOTO_CAPTURE_ACCESSIBLE_TEXT" desc="The accessible message to speak to announce that a photo was captured.">
+    Photo was captured
+  </message>
+  <message name="IDS_SETTINGS_PHOTO_DISCARD_ACCESSIBLE_TEXT" desc="The accessible message to speak to announce that a photo was discarded.">
+    Photo was discarded
+  </message>
+  <message name="IDS_SETTINGS_PHOTO_MODE_ACCESSIBLE_TEXT" desc="The accessible message to speak to announce a switch to photo mode for camera.">
+    Photo mode entered
+  </message>
+  <message name="IDS_SETTINGS_VIDEO_MODE_ACCESSIBLE_TEXT" desc="The accessible message to speak to announce a switch to video mode for camera.">
+    Video mode entered
+  </message>
 
   <!-- Personalization Page (OS settings) and Appearance Page (Browser settings) -->
   <message name="IDS_OS_SETTINGS_SET_WALLPAPER" desc="Name of the control which allows the user to set the wallpaper.">
@@ -80,6 +303,30 @@
   <message name="IDS_OS_SETTINGS_CHANGE_PICTURE_TITLE" desc="Label for row in settings page that shows the user image picker.">
     Change device account image
   </message>
+  <message name="IDS_OS_SETTINGS_AMBIENT_MODE_TITLE" desc="Label for row in settings page that opens the ambient mode settings page to customize what you see on your screen when the device is idle.">
+    Ambient mode
+  </message>
+  <message name="IDS_OS_SETTINGS_AMBIENT_MODE_ENABLED" desc="Sub label for the ambient mode row in settings page when it is enabled.">
+    Enabled
+  </message>
+  <message name="IDS_OS_SETTINGS_AMBIENT_MODE_DISABLED" desc="Sub label for the ambient mode row in settings page when it is disabled.">
+    Disabled
+  </message>
+  <message name="IDS_OS_SETTINGS_AMBIENT_MODE_ON" desc="Label for the toggle row in ambient mode settings page when it is enabled.">
+    On
+  </message>
+  <message name="IDS_OS_SETTINGS_AMBIENT_MODE_OFF" desc="Label for the toggle row in ambient mode settings page when it is disabled.">
+    Off
+  </message>
+  <message name="IDS_OS_SETTINGS_AMBIENT_MODE_TOPIC_SOURCE_TITLE" desc="Label for the radio button group of topic source, where the screen contents come from.">
+    Choose what you see on your screen
+  </message>
+  <message name="IDS_OS_SETTINGS_AMBIENT_MODE_TOPIC_SOURCE_GOOGLE_PHOTOS" desc="Label for the radio button to choose the topic source from Brave Photos.">
+    Brave Photos
+  </message>
+  <message name="IDS_OS_SETTINGS_AMBIENT_MODE_TOPIC_SOURCE_ART_GALLERY" desc="Label for the radio button to choose the topic source from art gallery.">
+    Art gallery
+  </message>
 
   <!-- Search and Assistant section. -->
   <message name="IDS_OS_SETTINGS_SEARCH_ENGINE_LABEL" desc="Label in OS settings describing search engine behavior.">
@@ -88,10 +335,2254 @@
   <message name="IDS_OS_SETTINGS_SEARCH_ENGINE_TOOLTIP" desc="Tooltip in OS settings explaining that search engine is used in both the Brave browser and the Chrome OS app launcher.">
     Used by Brave browser and <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> Launcher
   </message>
+  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT" desc="Label for the Brave Assistant button.">
+    Brave Assistant
+  </message>
+  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_ENABLED" desc="Sub label for the Brave Assistant button when Assistant is enabled.">
+    Enabled
+  </message>
+  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_DISABLED" desc="Sub label for the Brave Assistant button when Assistant is disabled.">
+    Disabled
+  </message>
+  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_ON" desc="Row label in Brave Assistant settings." meaning="Brave Assistant is on.">
+    On
+  </message>
+  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_OFF" desc="Row label in Brave Assistant settings." meaning="Brave Assistant is off.">
+    Off
+  </message>
+   <message name="IDS_SETTINGS_SEARCH_AND_ASSISTANT" desc="Name of the settings page which displays search engine and assistant preferences on Chrome OS.">
+    Search and Assistant
+  </message>
 
   <!-- Files Page (OS settings) -->
   <message name="IDS_OS_SETTINGS_FILES" desc="Name of the settings page which displays file preferences.">
     Files
   </message>
+  <message name="IDS_SETTINGS_DISCONNECT_GOOGLE_DRIVE" desc="Label for the checkbox which enables disconnecting from Google Drive account.">
+    Disconnect Google Drive account
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SMB_SHARES" desc="In Downloads Settings, the title of the SMB shares setting section.">
+    Network file shares
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SMB_SHARES_LEARN_MORE_LABEL" desc="Label for the link that teaches users how to setup SMB shares.">
+    Set up or manage network file shares. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SMB_SHARES_ADD_SHARE" desc="In SMB shares settings subpage, text for the link to add a new SMB share.">
+    Add file share
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_ERROR_MESSAGE" desc="The message shown when mounting a new SMB share fails.">
+    Error mounting share. Check the file share URL and try again.
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_AUTH_FAILED_MESSAGE" desc="The message shown when mounting a new SMB share fails due to an authentication failure.">
+    Error mounting share. Please check your credentials and try again.
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_NOT_FOUND_MESSAGE" desc="The message shown when mounting a new SMB share fails because the share cannot be found.">
+    Error mounting share. The specified share was not found on the network.
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_UNSUPPORTED_DEVICE_MESSAGE" desc="The message shown when mounting a new SMB share fails because the specified device is not supported.">
+    Error mounting share. Please check that the file server you are connecting to supports SMBv2 or later.
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_EXISTS_MESSAGE" desc="The message shown when mounting a new SMB share fails because the share is already mounted.">
+    Error mounting share. The specified share is already mounted.
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_TOO_MANY_MOUNTS_MESSAGE" desc="The message shown when mounting a new SMB share fails because too many SMB shares are already mounted.">
+    Error mounting share. Too many SMB shares are already mounted.
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_INVALID_URL_MESSAGE" desc="The message shown when mounting a new SMB share fails because the URL is an invalid format.">
+    Invalid URL format. Supported formats are \\server\share and smb://server/share.
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_INVALID_SSO_URL_MESSAGE" desc="The message shown when mounting a new SMB share fails because the URL is an invalid format when SSO authentication is used.">
+    Invalid URL format. Server must be specified as a host name when SSO authentication is used.
+  </message>
+  <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_SUCCESS_MESSAGE" desc="The message shown when a new SMB share is successfully mounted.">
+    Share mounted successfully.
+  </message>
+
+  <!-- Accessibility -->
+  <message name="IDS_SETTINGS_A11Y_TABLET_MODE_SHELF_BUTTONS_LABEL" desc="The name of a setting within accessibility settings that controls whether Chrome OS system shelf navigation buttons (for going back, home, or to overview) should be shown when the device is in tablet mode.">
+    Show navigation buttons
+  </message>
+  <message name="IDS_SETTINGS_A11Y_TABLET_MODE_SHELF_BUTTONS_DESCRIPTION" desc="The description for the setting within accessibility settings that controls whether Chrome OS system shelf navigation buttons should be shown when the device is in tablet mode. The buttons whose visibility the setting controls are the button to go home (to launcher), the button to go back, and the button to go to overview.">
+    Navigate home, back, and switch apps with buttons in tablet mode. Turned on when BraveVox or Automatic clicks is enabled.
+  </message>
+
+  <!-- A11y (OS Settings) -->
+  <message name="IDS_SETTINGS_OPTIONS_IN_MENU_LABEL" desc="Label for checkbox which enables showing accessibility options in the system menu.">
+    Always show accessibility options in the system menu
+  </message>
+  <message name="IDS_SETTINGS_LARGE_MOUSE_CURSOR_LABEL" desc="Label for checkbox which enables showing a larger mouse cursor than normal.">
+    Show large mouse cursor
+  </message>
+  <message name="IDS_SETTINGS_LARGE_MOUSE_CURSOR_SIZE_LABEL" desc="Label for a slider which changes the size of large mouse cursor.">
+    Adjust cursor size
+  </message>
+  <message name="IDS_SETTINGS_LARGE_MOUSE_CURSOR_SIZE_DEFAULT_LABEL" desc="Label in the slider which indicates that this side makes the cursor to its default size.">
+    Default
+  </message>
+  <message name="IDS_SETTINGS_LARGE_MOUSE_CURSOR_SIZE_LARGE_LABEL" desc="Label in the slider which indicates that this side makes the cursor large.">
+    Large
+  </message>
+  <message name="IDS_SETTINGS_HIGH_CONTRAST_LABEL" desc="Label for checkbox which enables high-contrast UI.">
+      Use high contrast mode
+  </message>
+  <message name="IDS_SETTINGS_STICKY_KEYS_LABEL" desc="Label for checkbox which enables sticky keys, with an explanation of the term 'sticky keys'.">
+      Enable sticky keys (to perform keyboard shortcuts by typing them sequentially)
+  </message>
+  <message name="IDS_SETTINGS_CHROMEVOX_LABEL" desc="Label for checkbox which enables BraveVox, with a description of what BraveVox is.">
+      Enable BraveVox (spoken feedback)
+  </message>
+  <message name="IDS_SETTINGS_CHROMEVOX_OPTIONS_LABEL" desc="Label for button to open BraveVox options.">
+      Open BraveVox settings
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_LABEL" desc="Label for checkbox which enables the fullscreen magnifier">
+      Enable fullscreen magnifier
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_LABEL" desc="Label for dropdown menu which contains zoom levels for the fullscreen magnifier">
+    Fullscreen zoom level:
+  </message>
+  <message name="IDS_SETTINGS_DOCKED_MAGNIFIER_LABEL" desc="Label for checkbox which enables the docked magnifier">
+    Enable docked magnifier
+  </message>
+  <message name="IDS_SETTINGS_DOCKED_MAGNIFIER_ZOOM_LABEL" desc="Label for dropdown menu which contains zoom levels for the docked magnifier">
+    Docked zoom level:
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_2_X" desc="Desription of a 2x zoom level">
+    2x
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_4_X" desc="Desription of a 4x zoom level">
+    4x
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_6_X" desc="Desription of a 6x zoom level">
+    6x
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_8_X" desc="Desription of a 8x zoom level">
+    8x
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_10_X" desc="Desription of a 10x zoom level">
+    10x
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_12_X" desc="Desription of a 12x zoom level">
+    12x
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_14_X" desc="Desription of a 14x zoom level">
+    14x
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_16_X" desc="Desription of a 16x zoom level">
+    16x
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_18_X" desc="Desription of a 18x zoom level">
+    18x
+  </message>
+  <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_20_X" desc="Desription of a 20x zoom level">
+    20x
+  </message>
+  <message name="IDS_SETTINGS_TAP_DRAGGING_LABEL" desc="Label for checkbox which enables tap dragging.">
+    Enable tap dragging
+  </message>
+  <message name="IDS_SETTINGS_CLICK_ON_STOP_LABEL" desc="Label for checkbox which enables automatically do a mouse action when the mouse cursor stops.">
+    Automatically click when the cursor stops
+  </message>
+  <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_LABEL" desc="Label for dropdown menu which contains various time delays for mouse action.">
+    Delay before click
+  </message>
+  <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_EXTREMELY_SHORT" desc="Description of an extremely short delay before mouse action, at .6 seconds.">
+    0.6 seconds
+  </message>
+  <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_SHORT" desc="Description of a very short delay before mouse action, at .8 seconds.">
+    0.8 seconds
+  </message>
+  <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_SHORT" desc="Description of a short delay before mouse action, at 1 second.">
+    1 second
+  </message>
+  <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_LONG" desc="Description of a long delay before mouse action, at 2 seconds.">
+    2 seconds
+  </message>
+  <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_LONG" desc="Description of a very long delay before mouse action, at 4 seconds.">
+    4 seconds
+  </message>
+  <message name="IDS_SETTINGS_AUTOCLICK_REVERT_TO_LEFT_CLICK" desc="Description of a checkbox that gives the option to return to the default left click action after taking another action.">
+    Revert to left click after action
+  </message>
+  <message name="IDS_SETTINGS_AUTOCLICK_STABILIZE_CURSOR_POSITION" desc="Description of a checkbox that gives the option to turn on cursor movmeent stablization.">
+    Stabilize click location
+  </message>
+  <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_LABEL" desc="Label for a dropdown menu which that has options for how much mouse movement can occur before a new autoclick is initiated.">
+    Movement threshold
+  </message>
+  <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_EXTRA_SMALL" desc="Description of an extra small mouse movement threshold for autoclick mouse movements.">
+    Extra small
+  </message>
+  <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_SMALL" desc="Description of a small mouse movement threshold for autoclick mouse movements">
+    Small
+  </message>
+  <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_DEFAULT" desc="Description of the default mouse movement threshold for autoclick mouse movements">
+    Default
+  </message>
+  <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_LARGE" desc="Description of a large mouse movement threshold for autoclick mouse movements">
+    Large
+  </message>
+  <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_EXTRA_LARGE" desc="Description of an extra large mouse movement threshold for autoclick mouse movements">
+    Extra large
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_DICTATION_DESCRIPTION" desc="Description explaining that Dictation sends audio data to Brave for transcription">
+    Send your voice to Brave to allow dictation into any text field.
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_DICTATION_LABEL" desc="Label for checkbox which enables the ability to speak into text fields">
+    Enable dictation (speak to type)
+  </message>
+  <message name="IDS_SETTINGS_ON_SCREEN_KEYBOARD_LABEL" desc="Label for checkbox which enables an on-screen keyboard.">
+    Enable on-screen keyboard
+  </message>
+  <message name="IDS_SETTINGS_MONO_AUDIO_LABEL" desc="Label for checkbox which enables mono audio output.">
+    Play the same audio through all speakers (mono audio)
+  </message>
+  <message name="IDS_SETTINGS_STARTUP_SOUND_LABEL" desc="Label for checkbox which enables startup sound.">
+    Play sound on startup
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_DISPLAY_HEADING" desc="In the settings tab, the heading for accessibility features related to the computer's display.">
+    Display
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_EXPLANATION" desc="Informational message at the top of the accessibility section of the settings page about enabling additional accessibility-related features.">
+    Enable accessibility features to make your device easier to use. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_CARET_HIGHLIGHT_DESCRIPTION" desc="In the settings tab, the text next to the checkbox to highlight the caret (the text insertion point) to make it easier to see.">
+    Highlight the text caret when it appears or moves
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_CURSOR_HIGHLIGHT_DESCRIPTION" desc="In the settings tab, the text next to the checkbox to highlight the mouse cursor when it's moving to make it easier to see.">
+    Highlight the mouse cursor when it's moving
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION" desc="In the settings tab, the text next to the checkbox to highlight the focused object to make it easier to see.">
+    Highlight the object with keyboard focus when it changes
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_TITLE" desc="In the settings tab, the text next to the checkbox to enable an option to hold a key and click to speak any on-screen text out loud.">
+    Enable select-to-speak
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_DISABLED_DESCRIPTION" desc="In the settings tab, the description of a feature that will read on-screen text out loud. This text is shown when that feature is disabled.">
+    Hear text read aloud
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_DESCRIPTION" desc="For devices with a hardware keyboard. In the settings tab, the description of an option to hold a key and click or drag a box with the mouse to speak any on-screen text out loud.">
+    Highlight what you want to hear, then press Search + S. You can also press and hold the Search key, or tap the Select-to-Speak icon near your profile image to make a selection.
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_DESCRIPTION_WITHOUT_KEYBOARD" desc="For devices that do not have a hardware keyboard. In the settings tab, the description of an option to highlight text to be read out loud.">
+    Tap the Select-to-Speak icon near your profile image, then select what you want to hear.
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_OPTIONS_LABEL" desc="In the settings tab, the label for the button that opens the Options page for the Select-to-Speak feature.">
+    Open select-to-speak settings
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION" desc="In the settings tab, the text next to the checkbox to enable Switch Access (for users with limited motor control).">
+    Switch Access (control the computer with just one or two switches)
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_OPTIONS_LABEL" desc="In the settings tab, the label for the button that opens the Options page for the Switch Access feature.">
+    Switch Access options
+  </message>
+  <message name="IDS_SETTINGS_MANAGE_SWITCH_ACCESS_SETTINGS" desc="Title of the page to manage Switch Access settings.">
+    Switch Access settings
+  </message>
+  <message name="IDS_SETTINGS_SWITCH_ASSIGNMENT_HEADING" desc="Heading for the settings section for Switch Access to assign switches to actions">
+    Switch action assignment
+  </message>
+  <message name="IDS_SETTINGS_SWITCH_ASSIGN_OPTION_NONE" desc="Label for the option to have no switch assigned to an action.">
+    None
+  </message>
+  <message name="IDS_SETTINGS_SWITCH_ASSIGN_OPTION_SPACE" desc="Label for the option to assign the spacebar as a switch.">
+    Space
+  </message>
+  <message name="IDS_SETTINGS_SWITCH_ASSIGN_OPTION_ENTER" desc="Label for the option to assign the enter key as a switch.">
+    Enter
+  </message>
+  <message name="IDS_SETTINGS_ASSIGN_SELECT_SWITCH_LABEL" desc="Label for the setting to assign a switch to the action 'Select', which selects the currently focused element and begins an interaction (which varies depending on the element/other settings).">
+    Select
+  </message>
+  <message name="IDS_SETTINGS_ASSIGN_NEXT_SWITCH_LABEL" desc="Label for the setting to assign a switch to the action 'Next', which moves focus to the next element.">
+    Next
+  </message>
+  <message name="IDS_SETTINGS_ASSIGN_PREVIOUS_SWITCH_LABEL" desc="Label for the setting to assign a switch to the action 'Previous', which moves focus to the previous element.">
+    Previous
+  </message>
+  <message name="IDS_SETTINGS_SWITCH_ACCESS_AUTO_SCAN_HEADING" desc="Heading for the settings section containing preferences around Switch Access automatically scanning between elements.">
+    Auto-scan
+  </message>
+  <message name="IDS_SETTINGS_SWITCH_ACCESS_AUTO_SCAN_LABEL" desc="Label for the toggle which enables automatic scanning between elements in Switch Access.">
+    Enable auto-scan
+  </message>
+  <message name="IDS_SETTINGS_SWITCH_ACCESS_AUTO_SCAN_SPEED_LABEL" desc="Label for slider which sets the time interval for Switch Access to automatically scan to the next element.">
+    Scanning speed
+  </message>
+  <message name="IDS_SETTINGS_SWITCH_ACCESS_AUTO_SCAN_KEYBOARD_SPEED_LABEL" desc="Label for slider which sets the time interval for Switch Access to automatically scan to the next element while navigating in the keyboard. Switch Access is an alternative input method designed for users with limited mobility, where the user has as little as one switch (for example, a button) to control the computer.">
+    Keyboard scanning speed
+  </message>
+  <message name="IDS_SETTINGS_DURATION_IN_SECONDS" desc="A duration in seconds. Should be short.">
+    <ph name="DURATION">$1<ex>1.5</ex></ph>s
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_TEXT_TO_SPEECH_HEADING" desc="In the settings tab, the heading for accessibility features that enable the computer to speak text from the computer screen.">
+    Text-to-Speech
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_DISPLAY_SETTINGS_TITLE" desc="In the settings tab, the title of a link to open display settings.">
+    Open display device settings
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_DISPLAY_SETTINGS_DESCRIPTION" desc="In the settings tab, an explanation that the display settings have options to adjust the screen resolution.">
+    Allows you to adjust your screen resolution
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_APPEARANCE_SETTINGS_TITLE" desc="In the settings tab, the title of a link to open appearance settings.">
+    Open appearance settings
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_APPEARANCE_SETTINGS_DESCRIPTION" desc="In the settings tab, an explanation that the appearance settings allows you to change the size of text on the screen.">
+    Customize your text size
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_KEYBOARD_AND_TEXT_INPUT_HEADING" desc="In the settings tab, the heading above settings related to the keyboard and other text input.">
+    Keyboard and text input
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_KEYBOARD_SETTINGS_TITLE" desc="In the settings tab, the title of a link to open keyboard settings.">
+    Open keyboard device settings
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_KEYBOARD_SETTINGS_DESCRIPTION" desc="In the settings tab, an explanation that the keyboard settings let you adjust the rate at which keys automatically repeat when held down, automatic prediction of words, and more.">
+    Allows you to adjust your keyboard repeat rate, word prediction, and more
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_MOUSE_AND_TOUCHPAD_HEADING" desc="In the settings tab, the heading for the section on mouse and touchpad settings.">
+    Mouse and touchpad
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_MOUSE_SETTINGS_TITLE" desc="In the settings tab, the title of a link to open mouse and touchpad settings.">
+    Open mouse and touchpad device settings
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_MOUSE_SETTINGS_DESCRIPTION" desc="In the settings tab, an explanation that the mouse and touchpad settings allows you to turn the tap-to-click and tap dragging features on and off.">
+    Allows you to enable/disable tap-to-click and tap dragging
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_AUDIO_AND_CAPTIONS_HEADING" desc="In the settings tab, the heading for the section on audio / sound and caption settings.">
+    Audio and captions
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_ADDITIONAL_FEATURES_TITLE" desc="In the settings tab, the title of a link that adds additional accessibility features not found in the built-in settings.">
+    Add additional features
+  </message>
+  <message name="IDS_SETTINGS_MANAGE_TTS_SETTINGS" desc="Link to manage text-to-speech settings">
+    Text-to-Speech voice settings
+  </message>
+  <message name="IDS_SETTINGS_TTS_LINK_DESCRIPTION" desc="Description of link to manage text-to-speech settings">
+    Select and customize text-to-speech voices
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_VOICES" desc="Heading describing a collection of listboxes on the text-to-speech settings page. Each listbox is associated with a language, and contains all possible voices for that language">
+    Preferred Voices
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_NO_VOICES_MESSAGE" desc="Message when no text-to-speech voices are found on the Chrome OS device.">
+    No voices found
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_MORE_LANGUAGES" desc="Label for a toggle button letting users know they can pick default voices for more languages which are not shown by default">
+    More languages
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PROPERTIES" desc="Heading describing a collection of input controls for a section of text-to-speech settings on speech properties, including speech pitch and rate">
+    Speech Properties
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_RATE" desc="The rate (speed) of speech in text-to-speech settings.">
+    Rate
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_RATE_MINIMUM_LABEL" desc="A label for the minimum side of a slider allowing users to change their text-to-speech speech rate">
+    Slowest
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_RATE_MAXIMUM_LABEL" desc="A label for the maximum side of a slider allowing users to change their text-to-speech speech rate">
+    Fastest
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PITCH" desc="The pitch of speech in text-to-speech settings.">
+    Pitch
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PITCH_MINIMUM_LABEL" desc="A label for the minimum side of a slider allowing users to change their text-to-speech speech pitch">
+    Lowest
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PITCH_MAXIMUM_LABEL" desc="A label for the maximum side of a slider allowing users to change their text-to-speech speech pitch">
+    Highest
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_VOLUME" desc="The volume of speech compared to system volume in text-to-speech settings.">
+    Volume
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_VOLUME_MINIMUM_LABEL" desc="A label for the minimum side of a slider allowing users to change their text-to-speech speech volume">
+    Quietest
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_VOLUME_MAXIMUM_LABEL" desc="A label for the maximum side of a slider allowing users to change their text-to-speech speech volume">
+    Loudest
+  </message>
+  <message name="IDS_SETTINGS_PERCENTAGE" desc="A number displayed as a percentage">
+    <ph name="PERCENTAGE">$1<ex>120</ex></ph>%
+  </message>
+  <message name="IDS_SETTINGS_DEFAULT_PERCENTAGE" desc="A number displayed as a percentage, which is the normal or default.">
+    <ph name="PERCENTAGE">$1<ex>120</ex></ph>% (default)
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PREVIEW_HEADING" desc="The heading for a section of the text-to-speech settings page where a user can preview text to speech">
+    Preview
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PREVIEW_INPUT_LABEL" desc="The label for sample input for a section of the text-to-speech settings page where a user can preview text to speech.">
+    Text to preview
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PREVIEW_INPUT" desc="The sample input for a section of the text-to-speech settings page where a user can preview text to speech. Users will hear this read aloud.">
+    Hi there! I'm your text-to-speech voice.
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PREVIEW_VOICE" desc="Label for a dropdown to select preview voice in the section of the text-to-speech settings page where a user can preview text to speech.">
+    Voice to preview
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PREVIEW_PLAY" desc="A button on the text-to-speech settings page to start playing a preview of text to speech">
+    Play
+  </message>
+  <message name="IDS_SETTINGS_TEXT_TO_SPEECH_ENGINES" desc="Heading for a section of text-to-speech settings to do per-engine settings">
+    Speech Engines
+  </message>
+  <message name="IDS_SETTINGS_ACCESSIBILITY_MANAGE_ACCESSIBILITY_FEATURES" desc="In the settings tab, the title of a link that opens a screen allowing the user to change accessibility features.">
+    Manage accessibility features
+  </message>
+
+  <!-- Account Manager (OS settings) -->
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_DESCRIPTION" desc="Description of the Account Manager Settings page. Shown just below the title of the page.">
+    Manage your signed-in accounts. Websites, apps, and extensions in Brave and Google Play may use these accounts to customize your experience, depending on permissions. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_CHILD_DESCRIPTION" desc="Description of the Account Manager Settings page for child users. Shown just below the title of the page.">
+    Add a school account or manage child accounts here. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_LIST_HEADER" desc="List header for Account List in Account Manager Settings page.">
+    Accounts
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_PRIMARY_ACCOUNT_TOOLTIP" desc="Tooltip for the primary account in accounts list in Settings describing how to sign out.">
+    To sign out of the primary account on this device, click the time on your screen. In the menu that appears, click "Sign out".
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_CHILD_MANAGED_BY_ONE_PARENT_TOOLTIP" desc="Tooltip for the primary account in accounts list in Settings showing that this user is managed by parent's account.">
+    Account managed by <ph name="PARENT_EMAIL">$1<ex>user@example.com</ex></ph>. To sign out of the primary account on this device, click the time on your screen. In the menu that appears, click "Sign out".
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_CHILD_MANAGED_BY_TWO_PARENTS_TOOLTIP" desc="Tooltip for the primary account in accounts list in Settings showing that this user is managed by two parents' accounts.">
+    Account managed by <ph name="FIRST_PARENT_EMAIL">$1<ex>first@example.com</ex></ph> and <ph name="SECOND_PARENT_EMAIL">$2<ex>second@example.com</ex></ph>. To sign out of the primary account on this device, click the time on your screen. In the menu that appears, click "Sign out".
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_REMOVE_ACCOUNT_LABEL" desc="Label of the Remove account button in Account Manager.">
+    Remove this account
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_ADD_ACCOUNT_LABEL" desc="Label of the Add account button in Account Manager.">
+    Add account
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_ADD_SCHOOL_ACCOUNT_LABEL" desc="Label of the button to add a school/EDU account in Account Manager.">
+    Add school account
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_SECONDARY_ACCOUNTS_DISABLED_TEXT" desc="Text for 'secondary accounts disabled' message in Settings page.">
+    Your administrator has disabled the addition of more Brave Accounts
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_SECONDARY_ACCOUNTS_DISABLED_CHILD_TEXT" desc="Text for 'secondary accounts disabled' message for child accounts in Settings page.">
+    Addition of more Brave Accounts is disabled
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_SIGNED_OUT_ACCOUNT_PLACEHOLDER" desc="Placeholder text for the full name of a signed out account in Account Manager.">
+    Sign in again
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_UNMIGRATED_ACCOUNT_PLACEHOLDER" desc="Placeholder text for the unmigrated account in Account Manager.">
+    Not updated yet
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_MIGRATION_LABEL" desc="Label of the migration button on Account Manager Settings page.">
+    Update account
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_REAUTHENTICATION_LABEL" desc="Label of the re-authentication button on Account Manager Settings page.">
+    Sign in
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_MIGRATION_TOOLTIP" desc="Tooltip text (shows on hover or for screenreaders) for the migration button on Account Manager Settings page.">
+    Update account, <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_REAUTHENTICATION_TOOLTIP" desc="Tooltip text (shows on hover or for screenreaders) for the re-authentication button on Account Manager Settings page.">
+    Sign in, <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_MORE_ACTIONS_TOOLTIP" desc="Tooltip text (shows on hover or for screenreaders) for a button that shows a menu with more actions when clicked or tapped.">
+    More actions, <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_MANAGEMENT_STATUS_MANAGED_ACCOUNT" desc="Management status label for managed accounts. This will be e.g. 'Managed by google.com' for Enterprise accounts and 'Managed by Family Link' for child accounts.">
+    Managed by <ph name="DOMAIN">$1<ex>google.com</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_ACCOUNT_MANAGER_MANAGEMENT_STATUS_UNMANAGED_ACCOUNT" desc="Management status label for unmanaged accounts.">
+    Primary account
+  </message>
+
+  <!-- Plugin VM page (OS settings) -->
+  <message name="IDS_SETTINGS_PLUGIN_VM_PAGE_TITLE" desc="The title of Plugin VM section.">
+    Plugin VM
+  </message>
+  <message name="IDS_SETTINGS_PLUGIN_VM_PAGE_LABEL" desc="The text associated with the primary section setting for Plugin VM.">
+    Plugin VM
+  </message>
+  <message name="IDS_SETTINGS_PLUGIN_VM_PAGE_SUBTEXT" desc="Description for the section for managing Plugin VM.">
+    Set up permissions
+  </message>
+  <message name="IDS_SETTINGS_PLUGIN_VM_PRINTER_ACCESS" desc="The text in the settings page for allowing printer access from Plugin VM.">
+    Give access to printers
+  </message>
+  <message name="IDS_SETTINGS_PLUGIN_VM_SHARED_PATHS" desc="Label for managing shared folders for Plugin VM.">
+    Manage shared folders
+  </message>
+  <message name="IDS_SETTINGS_PLUGIN_VM_SHARED_PATHS_LIST_HEADING" desc="Label for list of shared folders.">
+    Shared folders
+  </message>
+  <message name="IDS_SETTINGS_PLUGIN_VM_SHARED_PATHS_INSTRUCTIONS_ADD" desc="Instructions for how to add shared folders in Plugin VM.">
+    To share, right-click on a folder in Files app, then select "Share with Plugin VM".
+  </message>
+  <message name="IDS_SETTINGS_PLUGIN_VM_SHARED_PATHS_INSTRUCTIONS_REMOVE" desc="Instructions for removing shared folders in Plugin VM.">
+    Removing folders from here will stop sharing but will not delete files.
+  </message>
+  <message name="IDS_SETTINGS_PLUGIN_VM_SHARED_PATHS_REMOVE_SHARING" desc="Tooltip to show when hovering on the remove icon for a Plugin VM shared folder.">
+    Remove sharing
+  </message>
+  <message name="IDS_SETTINGS_PLUGIN_VM_REMOVE_LABEL" desc="Label for the row to open a dialog confirming removal of Plugin VM.">
+    Uninstall Plugin VM
+  </message>
+  <message name="IDS_SETTINGS_PLUGIN_VM_REMOVE_BUTTON" desc="Label for the button to open a dialog confirming removal of Plugin VM.">
+    Uninstall
+  </message>
+  <message name="IDS_SETTINGS_PLUGIN_VM_CONFIRM_REMOVE_DIALOG_BODY" desc="Message of the confirmation dialog displayed before removal begins.">
+    Removing Plugin VM will delete your VM. This includes its applications, settings, and data. Are you sure you wish to continue?
+  </message>
+
+  <!-- Crostini -->
+  <message name="IDS_SETTINGS_CROSTINI_TITLE" desc="The title of Crostini section.">
+    Linux (Beta)
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_LABEL" desc="The text associated with the primary section setting.">
+    Linux
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS" desc="Label for managing shared folders in Crostini.">
+    Manage shared folders
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_LIST_HEADING" desc="Label for list of shared folders.">
+    Shared folders
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_INSTRUCTIONS_ADD" desc="Instructions for how to add shared folders in Crostini.">
+    To share, right-click on a folder in Files app, then select "Share with Linux".
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_INSTRUCTIONS_REMOVE" desc="Instructions for removing shared folders in Crostini.">
+    Removing folders from here will stop sharing but will not delete files.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_REMOVE_SHARING" desc="Tooltip to show when hovering on the remove icon for a crostini shared folder.">
+    Remove sharing
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_REMOVE_FAILURE_DIALOG_MESSAGE" desc="Message to show user when unsharing a crostini shared folder fails.">
+    Couldn't unshare because an application is using this folder. The folder will be unshared when Linux is next shut down.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_REMOVE_FAILURE_DIALOG_TITLE" desc="Title of the error dialog shown to a user when unsharing a crostini shared folder fails.">
+    Unshare failed
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_REMOVE_FAILURE_TRY_AGAIN" desc="Button text in the dialog shown when unsharing a crostini shared folder fails.  Pressing this button will attempt to unshare the folder again.">
+    Try again
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_LIST_EMPTY_MESSAGE" desc="Message shown when the user has not yet shared any folders in Crostini.">
+    Shared folders will appear here
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_EXPORT_IMPORT_TITLE" desc="Title for crostini container export and imoprt (backup and restore) section">
+    Backup &amp; restore
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_EXPORT" desc="Tile for exporting (backing up) the crostini container.">
+    Backup
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_EXPORT_LABEL" desc="Description shown next to the button to export (backup) Crostini.">
+    Backup Linux apps and files
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_IMPORT" desc="Title for importing (restoring) the crostini container.">
+    Restore
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_IMPORT_LABEL" desc="Description shown next to the button to import (restore) Crostini.">
+    Replace your Linux apps and files with a previous backup
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_CONFIRM_IMPORT_DIALOG_WINDOW_TITLE" desc="Title of the confirmation dialog displayed before container import begins.">
+    Confirm Restore
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_CONFIRM_IMPORT_DIALOG_WINDOW_MESSAGE" desc="Message of the confirmation dialog displayed before container import begins.">
+    Restoring from a backup will delete existing Linux applications and data in your Linux files folder.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_REMOVE_BUTTON" desc="Label for the button to open a dialog confirming removal of Crostini.">
+    Remove
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_USB_DEVICES_LABEL" desc="Label for managing shared USB devices.">
+    USB preferences
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_USB_DEVICES_DESCRIPTION" desc="Description for managing shared USB devices.">
+    Give Linux apps permission to access USB devices. Linux won't remember a USB device after it's removed.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_USB_DEVICES_EXTRA_DESCRIPTION" desc="Extra description for managing shared USB devices.">
+    Only Android devices are currently supported.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_USB_DEVICES_LIST_EMPTY_MESSAGE" desc="Message shown when there are no avaiable USB devices.">
+    Available USB devices will appear here.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_TITLE" desc="Title of ARC ADB sideloading section.">
+    Develop Android apps
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_DESCRIPTION" desc="Description of ARC ADB sideloading in Settings.">
+    To create and test your apps, enable the Android Debug Bridge (ADB). Note that this action allows installation of Android apps that haven't been verified by Brave, and requires a factory reset to disable.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_LABEL" desc="Label for enabling ADB in ARC.">
+    Enable ADB debugging
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_RESTART_BUTTON" desc="Label for the button that initiates the ADB enabling flow by restarting the device.">
+    Restart and continue
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_TITLE_ENABLE" desc="Confirmation dialog title to restart for enabling ADB.">
+    Enable ADB debugging?
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_TITLE_DISABLE" desc="Confirmation dialog title to restart for disabling ADB.">
+    Disable ADB debugging?
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_CONTAINER_UPGRADE_MESSAGE" desc="Message shown when an upgrade to Debian 10 (codenamed Buster) is available.">
+    An upgrade to Debian 10 (Buster) is available
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_CONTAINER_UPGRADE_SUBTEXT" desc="The current version the user has.">
+    Current version is Debian 9 (Stretch)
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_CONTAINER_UPGRADE_BUTTON" desc="Label for the button that launches the upgrade to Debian 10 for Crostini.">
+    Upgrade
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING" desc="Label for managing port forwarding in Linux on BraveOS.">
+    Port forwarding
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_DESCRIPTION" desc="Description for managing port forwarding in Linux on BraveOS.">
+    Make Linux ports available to other devices on your network.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_NO_PORTS" desc="Label for when user has no port forwarding preferences.">
+    Your ports will appear here
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_LIST_PORT_NUMBER" desc="Column heading for the port number of current port preferences.">
+    Port number
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_LIST_LABEL" desc="Column heading for the port label of current port preferences.">
+    Label
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_ADD_PORT_BUTTON" desc="Label for the button to open a dialog to add a new port.">
+    Add
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_ADD_PORT_BUTTON_DESCRIPTION" desc="Accessibility label for the button to open a dialog to add a new port.">
+    Add Port
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_ADD_PORT_DIALOG_TITLE" desc="Title for the add port dialog box.">
+    Add port number
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_ADD_PORT_DIALOG_LABEL" desc="Label for the text input of an optional label.">
+    Label (Optional)
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_TCP" desc="Label for the TCP protocol when forwarding ports.">
+    TCP
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_UDP" desc="Label for the UDP protocol when forwarding ports.">
+    UDP
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_ADD_ERROR" desc="Description for the error when adding an invalid port.">
+    Error forwarding port
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_SHOW_BUTTON" desc="The label of the button/link the user clicks to open the disk resizing dialogue." meaning="The label of the button/link the user clicks to open the disk resizing dialogue.">
+    Change
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_LABEL" desc="The label on the row in settings for managing Crostini's disk size.">
+    Disk size
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_TITLE" desc="The title of the settings dialogue the user uses to resize the Crostini (AKA Linux (Beta)) Disk.">
+    Resize Linux Disk
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_UNSUPPORTED" desc="The message diusplayed to the user when resizing their Crostini disk isn't supported, explaining a workaround.">
+    Your container doesn't support being resized. To adjust the amount of space that is pre-allocated to Linux (Beta), back up and then restore into a new container.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_LOADING" desc="The message shown to the user while fetching the data needed to resize their disk.">
+    Loading data, this may take up to a few seconds.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_ERROR" desc="The message shown to the user when loading data to offer the resize failed. This error is retryable.">
+    Error loading data
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_ERROR_RETRY" desc="The label of the button to retry loading data if the operation previously failed.">
+    Retry
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_CANCEL" desc="The label of the button to close the resize dialogue without making any changes.">
+    Cancel
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_GO_BUTTON" desc="The label of the button to perform the resize operation on the user's Crostini disk">
+    Resize
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_IN_PROGRESS" desc="The message displayed to the user while disk resizing is in progress.">
+    Resizing
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_RESIZING_ERROR" desc="The message displayed to the user when disk resizing failed.">
+    Error resizing disk
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_DISK_RESIZE_DONE" desc="The message displayed to the user once disk resizing has completed successfully.">
+    Done
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_POWERWASH_REQUIRED_SUBLABEL" desc="Sublabel notifying user of powerwash requirement before enabling ARC ADB sideloading.">
+    A factory reset of this Bravebook is required to enable ADB debugging. <ph name="BEGIN_LINK_LEARN_MORE">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK_LEARN_MORE">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_MESSAGE_ENABLE" desc="Describes what will happen if the user enables ADB Sideloading.">
+    To enable ADB debugging, a restart of this <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> is required. Disabling it requires a reset to factory settings.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_MESSAGE_DISABLE" desc="Describes what will happen if the user disables ADB Sideloading.">
+    Disabling ADB debugging will reset this <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> to factory settings. All user accounts and local data will be erased.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_INSTRUCTIONS_LOCATE" desc="Instructions for how to locate shared folders in Crostini.">
+    Shared folders are available in Linux at <ph name="BASE_DIR">$1<ex>/mnt/chromeos</ex></ph>.
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_SUBTEXT" desc="Description for the section for enabling and managing Crostini.">
+    Run Linux tools, editors, and IDEs on your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>. &lt;a target="_blank" href="<ph name="URL">$2<ex>https://google.com/</ex></ph>"&gt;Learn more&lt;/a&gt;
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_REMOVE" desc="Label for the row to open a dialog confirming removal of Crostini.">
+    Remove Linux for <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_PORT_FORWARDING_TABLE_TITLE" desc="Title for the list display of current preferences.">
+    Ports
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_MIC_TITLE" desc="Title for sharing mic with Crostini.">
+    Give access to microphone
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_MIC_DIALOG_TITLE" desc="Dialog title for sharing mic with Crostini.">
+    Linux restart required
+  </message>
+  <message name="IDS_SETTINGS_CROSTINI_MIC_DIALOG_LABEL" desc="Dialog label for sharing mic with Crostini.">
+    Changes to microphone will take effect when Linux is next restarted.
+  </message>
+
+  <!-- Android apps page (OS settings) -->
+  <message name="IDS_SETTINGS_ANDROID_APPS_LABEL" desc="The text associated with the primary section setting.">
+    Google Play Store
+  </message>
+  <message name="IDS_SETTINGS_ANDROID_APPS_MANAGE_APPS" desc="Label for launching Android apps settings.">
+    Manage Android preferences
+  </message>
+  <message name="IDS_SETTINGS_ANDROID_APPS_REMOVE" desc="Label for the control to open a dialog confirming removal of the Google Play Store.">
+    Remove Google Play Store
+  </message>
+  <message name="IDS_SETTINGS_ANDROID_APPS_REMOVE_BUTTON" desc="Label for the button for the removal of the Google Play Store">
+    Remove
+  </message>
+  <message name="IDS_SETTINGS_ANDROID_APPS_DISABLE_DIALOG_TITLE" desc="Title of the confirmation dialog for disabling android apps.">
+    Remove Android apps?
+  </message>
+  <message name="IDS_SETTINGS_ANDROID_APPS_DISABLE_DIALOG_REMOVE" desc="Label for confirmation button in the disable android apps dialog.">
+    Remove Android apps
+  </message>
+  <message name="IDS_SETTINGS_ANDROID_APPS_MANAGE_APP_LINKS" desc="Label for accessing app preferrences on ARC side.">
+    Manage Play app links
+  </message>
+
+  <!-- Device Stylus (OS settings) -->
+  <message name="IDS_SETTINGS_STYLUS_TITLE" desc="Title of the stylus settings page.">
+    Stylus
+  </message>
+  <message name="IDS_SETTINGS_STYLUS_ENABLE_STYLUS_TOOLS" desc="Toggle that lets the user enable or disable the stylus tools.">
+    Show stylus tools in the shelf
+  </message>
+  <message name="IDS_SETTINGS_STYLUS_AUTO_OPEN_STYLUS_TOOLS" desc="Label that tells the user that the stylus tools will be automatically opened and closed when they insert or eject the stylus.">
+    Open stylus tools when the stylus is removed
+  </message>
+  <message name="IDS_SETTINGS_STYLUS_FIND_MORE_APPS_PRIMARY" desc="Primary URL label that opens up the Play Store to a curated list of stylus applications.">
+    Find more stylus apps
+  </message>
+  <message name="IDS_SETTINGS_STYLUS_FIND_MORE_APPS_SECONDARY" desc="Secondary (below the primary) URL label that opens up the Play Store to a curated list of stylus applications.">
+    Open Google Play
+  </message>
+  <message name="IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_LABEL" desc="Label describing a dropdown that lets the user pick their default note-taking applications. The dropdown contains a list of all available choices. The user can install additional apps, so the contents of the dropdown is dynamic.">
+    Note-taking app
+  </message>
+  <message name="IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_LOCK_SCREEN_CHECKBOX" desc="Label for a check box that enables note-taking by selected note-taking application when user session is locked (i.e. when lock screen is shown).">
+    Enable note-taking from lock screen
+  </message>
+  <message name="IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_KEEP_LATEST_NOTE" desc="Label for a check box that, when checked, indicates that the note-taking app should keep the latest note the user took while on the lock screen available to the user whenever the app is launched on the lock screen (i.e. if the active app window is closed, the note should be visible the next time the app is launched).">
+    Keep latest note on lock screen
+  </message>
+  <message name="IDS_SETTINGS_STYLUS_LOCK_SCREEN_NOTES_TITLE" desc="In stylus settings, title of a section that contains settings for controlling note taking on the lock screen.">
+    Lock screen notes
+  </message>
+  <message name="IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_NONE_AVAILABLE" desc="Secondary label used when there are no note-taking applications available.">
+    None available
+  </message>
+  <message name="IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_WAITING_FOR_ANDROID" desc="Secondary label used when the list of note-taking apps is not yet available, because the internal android container has not yet finished starting.">
+    Loading apps...
+  </message>
+
+  <!-- Bluetooth page (OS settings) -->
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECTED" desc="In Bluetooth device list, this label is shown below a device which is already connected.">
+    Connected
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECTED_WITH_BATTERY" desc="In Bluetooth device list, this label is shown below a device which is already connected and has a known battery percentage.">
+    Connected, <ph name="BATTERY_PERCENTAGE">$1<ex>100</ex></ph>% battery
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECTING">
+    Connecting...
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_PAIRED" desc="Title of the settings subsection listing paired Bluetooth devices.">
+    Paired devices
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_PRIMARY_USER_CONTROLLED" desc="Settings &gt; Bluetooth &gt; Text to show when Bluetooth configuration is controlled by the primary user.">
+    Bluetooth configuration is controlled by <ph name="USER_EMAIL">$1<ex>joe@gmail.com</ex></ph>.
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_UNPAIRED" desc="Title of the settings subsection listing unpaired Bluetooth devices.">
+    Unpaired devices
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT" desc="Bluetooth pairing dialog: Text for dropdown meny item to connect to a device.">
+    Connect
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_DISCONNECT" desc="Bluetooth pairing dialog: dropdown meny item to disconnect from a device.">
+    Disconnect
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_TOGGLE_ACCESSIBILITY_LABEL" desc="Accessibility only label for Bluetooth enable/disable toggle.">
+    Bluetooth enable
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing available Bluetooth devices. Only visible by screen reader software.">
+    Show available Bluetooth devices
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_NO_DEVICES" desc="Message displayed when there are no paired Bluetooth devices scan.">
+    No paired devices
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_NO_DEVICES_FOUND" desc="Message displayed when no Bluetooth devices are found after a scan.">
+    No Bluetooth devices found
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_NOT_CONNECTED" desc="In Bluetooth device list, this label is shown below a device which is not connected.">
+    Not connected
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH" desc="Name of the settings page which displays Bluetooth device settings.">
+    Bluetooth
+  </message>
+    <message name="IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE_TITLE" desc="Title of the settings dialog for adding or pairing Bluetooth a device.">
+    Connect to Bluetooth device
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_REMOVE" desc="Label for removing (unpairing) a paired Bluetooth device">
+    Remove from list
+  </message>   <message name="IDS_SETTINGS_BLUETOOTH_PAIR" desc="Label for the settings button to pair a previously paired Bluetooth device.">
+    Pair
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_ENTER_KEY" desc="Bluetooth pairing dialog: Text for enter key when pairing keyboard devices.">
+    enter
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY" desc="Bluetooth pairing dialog: Text for button to accept pairing code.">
+    Accept
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_REJECT_PASSKEY" desc="Bluetooth pairing dialog: Text for button to reject pairing a device.">
+    Reject
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_REQUEST_PINCODE" desc="Bluetooth pairing message typically displayed when the external Bluetooth 2.0 and older device has no display or means of input.">
+    Please enter the PIN for "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>":
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_DISPLAY_PINCODE" desc="Bluetooth pairing message typically displayed when pairing a Bluetooth 2.0 and older wireless keyboard.">
+    Please enter this PIN code on "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>":
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_REQUEST_PASSKEY" desc="Bluetooth pairing message typically displayed when the external Bluetooth 2.1 and later device has no display or means of input, and does not support SSP.">
+    Please enter the passkey for "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>":
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY" desc="Bluetooth pairing message typically displayed when pairing a Bluetooth 2.1 and later wireless keyboard.">
+    Please enter this passkey on "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>":
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONFIRM_PASSKEY" desc="Bluetooth pairing message typically shown when pairing with a device that has a display.">
+    Please confirm this passkey is shown on "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>":
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_START_CONNECTING">
+    Connecting to "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>"
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_IN_PROGRESS">
+    Connection to "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>" still in progress
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_FAILED">
+    Failed to connect to "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_FAILED">
+    Authentication failed while connecting to "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_CANCELED">
+    Authentication canceled while connecting to "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_REJECTED">
+    Authentication code rejected while connecting to "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_TIMEOUT">
+    Authentication timeout while connecting to "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_UNSUPPORTED_DEVICE">
+    Unsupported Bluetooth device: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_ATTRIBUTE_LENGTH_INVALID">
+    Write operation exceeds the maximum length of the attribute to: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_CONNECTION_CONGESTED">
+    Connection is congested to remote device: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_INSUFFICIENT_ENCRYPTION">
+    Insufficient encryption for a given operation on: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_OFFSET_INVALID">
+    Read or write operation was requested with an invalid offset on: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_READ_NOT_PERMITTED">
+    Read operation is not permitted on: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_REQUEST_NOT_SUPPORTED">
+    The given request is not supported to: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+  <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_WRITE_NOT_PERMITTED">
+    Write operation is not permitted on: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
+  </message>
+
+  <!-- Parental Controls -->
+  <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_TITLE" desc="Name of the settings page which manages BraveOS's parental controls.">
+    Parental controls
+  </message>
+  <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_SET_UP_LABEL" desc="Label/description of the settings page which manages BraveOS's parental controls.">
+    Set website restrictions &amp; screen time limits with Family Link
+  </message>
+  <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_CONNECT_TO_INTERNET_LABEL" desc="Label/description shown when the Parental control setup can't be launched because there is no Internet Connection.">
+    Connect to the internet to set up parental controls
+  </message>
+  <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_VIEW_SETTINGS_LABEL" desc="Label/description of the settings page which manages BraveOS's parental controls.">
+    Open the Family Link app to see your supervision settings
+  </message>
+  <message name="IDS_SETTINGS_PARENTAL_CONTROLS_SET_UP_BUTTON_LABEL" desc="Label/description of the button which launches page which enables BraveOS's parental controls.">
+    Set up
+  </message>
+  <message name="IDS_SETTINGS_PARENTAL_CONTROLS_SET_UP_BUTTON_ROLE" desc="Role description of the button which launches page which enables BraveOS's parental controls. Spoken aloud by screen readers when the Set Up button is focused">
+    Set up button
+  </message>
+
+  <!-- Device pointer page (OS settings) -->
+  <message name="IDS_SETTINGS_MOUSE_TITLE" desc="In Device Settings, the title of the mouse settings subpage.">
+    Mouse
+  </message>
+  <message name="IDS_SETTINGS_TOUCHPAD_TITLE" desc="In Device Settings, the title of the touchpad settings subpage.">
+    Touchpad
+  </message>
+    <message name="IDS_SETTINGS_TOUCHPAD_TAP_TO_CLICK_ENABLED_LABEL" desc="In Device Settings, the text next to the checkbox that allows tapping the touchpad to work as a click.">
+    Enable tap-to-click
+  </message>
+  <message name="IDS_SETTINGS_TOUCHPAD_SPEED_LABEL" desc="In Device Settings, the text next to the slider that sets the speed (sensitivity) of the touchpad.">
+    Touchpad speed
+  </message>
+  <message name="IDS_SETTINGS_TOUCHPAD_SCROLL_SPEED_LABEL" desc="In Device Settings, the text next to the slider that sets the speed (sensitivity) of touchpad scrolling.">
+    Touchpad scroll speed
+  </message>
+  <message name="IDS_SETTINGS_POINTER_SPEED_SLOW_LABEL" desc="In Device Settings, the text under the left (less sensitive) side of the slider for the pointer (mouse/touch) speed (sensitivity).">
+    Slow
+  </message>
+  <message name="IDS_SETTINGS_POINTER_SPEED_FAST_LABEL" desc="In Device Settings, the text under the right (more sensitive) side of the slider for the pointer (mouse/touchpad) speed (sensitivity).">
+    Fast
+  </message>
+  <message name="IDS_SETTINGS_MOUSE_SPEED_LABEL" desc="In Device Settings, the text next to the slider that sets the speed (sensitivity) of the mouse.">
+    Mouse speed
+  </message>
+  <message name="IDS_SETTINGS_MOUSE_SCROLL_SPEED_LABEL" desc="In Device Settings, the text next to the slider that sets the speed (sensitivity) of mouse scrolling.">
+    Mouse scroll speed
+  </message>
+  <message name="IDS_SETTINGS_MOUSE_SWAP_BUTTONS_LABEL" desc="In Device Settings, the text next to the checkbox to set the primary mouse button to the right button instead of the left button.">
+    Swap primary mouse button
+  </message>
+  <message name="IDS_SETTINGS_MOUSE_REVERSE_SCROLL_LABEL" desc="In Device Settings, the text next to the checkbox to set reverse scrolling.">
+    Reverse scrolling
+  </message>
+  <message name="IDS_SETTINGS_MOUSE_ACCELERATION_LABEL" desc="In Device Settings, the text next to the checkbox to disable mouse acceleration.">
+    Enable mouse acceleration
+  </message>
+  <message name="IDS_SETTINGS_MOUSE_SCROLL_ACCELERATION_LABEL" desc="In Device Settings, the text next to the toggle for mouse scroll acceleration.">
+    Enable mouse scroll acceleration
+  </message>
+  <message name="IDS_SETTINGS_TOUCHPAD_ACCELERATION_LABEL" desc="In Device Settings, the text next to the checkbox to disable touchpad acceleration.">
+    Enable touchpad acceleration
+  </message>
+  <message name="IDS_SETTINGS_TOUCHPAD_SCROLL_ACCELERATION_LABEL" desc="In Device Settings, the text next to the toggle for touchpad scroll acceleration.">
+    Enable touchpad scroll acceleration
+  </message>
+  <message name="IDS_SETTINGS_MOUSE_AND_TOUCHPAD_TITLE" desc="In Device Settings, the title of the mouse and touchpad settings subpage (when the user has both types of devices).">
+    Mouse and touchpad
+  </message>
+
+  <!-- Printing Page (OS Settings)-->
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER" desc="Label for button that allows the user to access the add print server dialog.">
+    Print server
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS" desc="In Printing Settings, the title of the CUPS printers setting section.">
+    Printers
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_LEARN_MORE_LABEL" desc="Label for the link that teaches users how to use CUPS printing.">
+    Set up or manage CUPS printers. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_ADD_PRINTER" desc="In CUPS printing settings subpage, text for the link adding a new CUPS printer.">
+    Add Printer
+  </message>
+    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_ADD_DETECTED_OR_NEW_PRINTER" desc="In CUPS printing settings subpage, explanatory text for the nearby printers list.">
+    Save detected printers to your profile, or add a new printer. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_AVAILABLE_PRINTERS" desc="In CUPS printing settings subpage, title for the nearby printers list.">
+    Add printers to your profile
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_AVAILABLE_PRINTERS_COUNT_MANY" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them on the number of printers showing on the screen that are available to save.">
+    There are <ph name="PRINTER_COUNT">$1<ex>3</ex></ph> printers available to save.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_AVAILABLE_PRINTER_COUNT_ONE" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them there is only 1 printer available to save.">
+    There is 1 printer available to save.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_AVAILABLE_PRINTER_COUNT_NONE" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them there are no printers available to save.">
+    There are no printers available to save.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_EDIT" desc="Text for the drop down menu which allows the user to edit the printer details.">
+    Edit
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_REMOVE" desc="Text for the drop down menu which allows the user to remove the selected printer.">
+    Remove
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SETUP_BUTTON" desc="Text for the button which allows the user to manually setup a CUPS printer.">
+    Set up
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SETUP_BUTTON_ARIA" desc="Label to be read aloud by the screen reader for the button which allows the user to manually setup a CUPS printer.">
+    Set up <ph name="PRINTER_NAME">$1<ex>HP OfficeJet 500</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SAVE_BUTTON" desc="Text for the button which allows the user to add an automatically discovered printer to the user's saved printer list.">
+    Save
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SAVE_BUTTON_ARIA" desc="Label to be read aloud by the screen reader for the button which allows the user to add an automatically discovered printer to the user's saved printer list.">
+    Save <ph name="PRINTER_NAME">$1<ex>HP OfficeJet 500</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_SEARCH_LABEL" desc="The placeholder text in the printer search field.">
+    Search printers
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_SAVED_PRINTERS_TITLE" desc="Text for the title of the user's saved printers list.">
+    Your saved printers
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_SAVED_PRINTERS_COUNT_MANY" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them on the number of printers previously saved by the user.">
+    You have <ph name="PRINTER_COUNT">$1<ex>3</ex></ph> saved printers.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_SAVED_PRINTERS_COUNT_ONE" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them there is only 1 printer previously saved.">
+    You have 1 saved printer.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_SAVED_PRINTERS_COUNT_NONE" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them they have no printers previously saved.">
+    You have no saved printers.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_SHOW_MORE" desc="Text for the button to show more printers when there are more printers than currently displayed to the user.">
+    Show more
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINTERS_NEARBY_TITLE" desc="Text for the title of the dialog that is used to add nearby printers.">
+    Add a nearby printer
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINTERS_MANUALLY_TITLE" desc="Text for the title of the dialog that is used to manually add a printer instead of automatically finding ones nearby.">
+    Add a printer manually
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINT_SERVER_TITLE" desc="Text for the title of the dialog that is used to manually add a print server.">
+    Add a print server
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_SELECT_MANUFACTURER_AND_MODEL_TITLE" desc="Text for the title of the dialog that is used to select a manufacturer and model from the drop down list.">
+    Advanced printer configuration
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_TITLE" desc="Text for the title of the Printer Details subpage.">
+    Printer details
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADVANCED" desc="Label for the toggle control to show/hide the advanced details of the printer.">
+    Advanced
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADVANCED_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the advanced printer options for a particular printer. Only visible by screen reader software.">
+    Show advanced printer options
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADVANCED_ADDRESS" desc="Label for the CUPS printer address in the Advanced section in the printer details page.">
+    Address
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_ADDRESS" desc="Label for the CUPS print server address in the in the print server details page.">
+    Address
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADVANCED_PROTOCOL" desc="Label for the CUPS printer protocol in the Advanced section in the printer details page.">
+    Protocol
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADVANCED_URI" desc="Label for the CUPS printer URI (uniform resource identifier) in the Advanced section in the printer details page.">
+    URI
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_NAME" desc="Label for the CUPS printer name in the printer details page.">
+    Name
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_MODEL" desc="Label for the CUPS printer model in the printer details page.">
+    Model
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_QUEUE" desc="Label for the CUPS printer queue in the manually add printer dialog.">
+    Queue
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINTER_BUTTON_ADD" desc="Text for the button which allows the user to add a CUPS printer.">
+    Add
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINTER_BUTTON_MANUAL_ADD" desc="Text for the button which allows the user to manually add a CUPS printer.">
+    Add Manually
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINTER_BUTTON_DISCOVER_PRINTERS" desc="Text for the button which allows the user to go back to the printers discovery dialog.">
+    Add Nearby Printers
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_IPP" desc="The dropdown menu of the printer IPP protocol on the manually add printer dialog.">
+    Internet Printing Protocol (IPP)
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_IPPS" desc="The dropdown menu of the printer IPPS protocol on the manually add printer dialog.">
+    Internet Printing Protocol (IPPS)
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_HTTP" desc="The dropdown menu of the printer HTTP protocol on the manually add printer dialog.">
+    Internet Printing Protocol (HTTP)
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_HTTPS" desc="The dropdown menu of the printer HTTPS protocol on the manually add printer dialog.">
+    Internet Printing Protocol (HTTPS)
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_APP_SOCKET" desc="The dropdown menu of the printer TCP/IP protocol on the manually add printer dialog.">
+    AppSocket (TCP/IP)
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_LPD" desc="The dropdown menu of the printer LPD protocol on the manually add printer dialog.">
+    Line Printer Daemon (LPD)
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_USB" desc="The dropdown menu of the printer USB protocol on the manually add printer dialog.">
+    USB
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_IPPUSB" desc="The dropdown menu of the printer IPPUSB protocol on the edit printer dialog.">
+    IPP over USB (IPPUSB)
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_CONFIGURING_MESSAGE" desc="The configuring-in-progress message shown in the configuring printer dialog.">
+    Configuring <ph name="PRINTER_NAME">$1<ex>Acme Printer</ex></ph> ...
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_MANUFACTURER" desc="Label for the dropdown menu to select a manufacturer for the printer.">
+    Manufacturer
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SELECT_DRIVER" desc="Label for the file selector to manually select a PPD file from the user's file system.">
+    Or specify your printer PPD <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_BUTTON_SELECT_DRIVER_ARIA_LABEL" desc="ARIA label for the file selector button to manually select a PPD file from the user's file system. This text will not be visual on any page. It will only be spoken by screen readers.">
+    Browse to specify your printer PPD
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_BUTTON_SELECT_DRIVER" desc="Text for the button which allows user to select a PPD file from the file system.">
+    Browse
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_INVALID_DRIVER" desc="Error message displayed to the user if they select an invalid PPD file.">
+    Invalid file selected. Try again.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_DONE_MESSAGE" desc="The message shown when a new printer is set up successfully.">
+    Added <ph name="PRINTER_NAME">$1<ex>Acme Printer</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_EDITED_PRINTER_DONE_MESSAGE" desc="The message shown when a printer is updated successfully.">
+    Updated <ph name="PRINTER_NAME">$1<ex>Acme Printer</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_UNAVAILABLE_MESSAGE" desc="The message shown when a printer can no longer be contacted while being added.">
+    <ph name="PRINTER_NAME">$1<ex>Acme Printer</ex></ph> is no longer available
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_NO_PRINTER_NEARBY" desc="The message shown when no nearby printers are found.">
+    There are no available printers.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SEARCHING_NEARBY_PRINTER" desc="The searching-in-progress message shown in the auto discovery dialog.">
+    Searching...
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_ERROR_MESSAGE" desc="The message shown when a new printer is not set up successfully.">
+    Unable to add printer. Please check your printer's configuration and try again.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_FATAL_ERROR_MESSAGE" desc="The message shown when a fatal error occurs while trying to add a new printer.">
+    Unable to add printer. Please check your printer's configuration and try again.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_PRINTER_UNREACHABLE_MESSAGE" desc="The message shown when the printer that is to be added is unreachable for configuration.">
+    Can’t connect to printer. Check that the printer is turned on and is connected to your Bravebook by Wi-Fi or USB.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_PPD_TOO_LARGE_MESSAGE" desc="The message shown when the PPD provided while trying to add new printer is too large.">
+    Can’t load large PPD. Maximum size is 250 kB.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_INVALID_PPD_MESSAGE" desc="The message shown when the PPD provided while trying to add a new printer is invalid.">
+    File is the wrong format. Check the PPD file and try again.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_PPD_NOT_FOUND" desc="The message shown when the PPD provided while trying to add a new printer cannot be found.">
+    Can’t find PPD. Make sure your Bravebook is online and try again.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_PPD_UNRETRIEVABLE" desc="The message shown when the PPD provided while trying to add a new printer is unretrievable.">
+    Can’t find PPD. Make sure your Bravebook is online and try again.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_NATIVE_PRINTERS_NOT_ALLOWED_MESSAGE" desc="The message shown when the user is prevented from configuring printers due to an enterprise policy.">
+    Printer configuration is handled by the administrator.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_EDIT_PRINTER_INVALID_PRINTER_UPDATE" desc="The message shown when the user attempts to edit a configured printer in a way that would make it unusable">
+    Requested printer changes would make the printer unusable.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_REQUIRE_INTERNET_MESSAGE" desc="The message shown when there is no internet access to set up a printer.">
+    Connect to the internet to add a printer
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_CHECK_CONNECTION_MESSAGE" desc="The message shown when there is no internet connection for detecting available printers">
+    Please check your connection to see available printers in your network
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_NO_INTERNET_CONNECTION" desc="The message shown when there is no internet connection.">
+    No internet connection
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_CONNECT_TO_NETWORK_SUBTEXT" desc="The message shown when the user needs to connect to a network with connectivity and try again.">
+    Connect to a network and try again
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_EDIT_PRINTER_DIALOG_TITLE" desc="Text for the title of the dialog that is used to edit a CUPS printer's information.">
+    Edit printer
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_EDIT_PRINTER_BUTTON" desc="Text for the button which allows the user to save the modification of a CUPS printer.">
+    Save
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_EDIT_PRINTER_CURRENT_PPD_MESSAGE" desc="Informational text displayed to the user if they have an existing custom PPD.">
+    Current PPD file in use: <ph name="PPD_NAME">$1<ex>example.ppd.gz</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_MANUFACTURER_MODEL_ADDITIONAL_INFORMATION" desc="Informational text displayed to the user when the the user is doing advanced manual printer setup.">
+    <ph name="PRINTER_NAME">$1<ex>Printer</ex></ph> could not be configured automatically. Please specify advanced printer details. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_EULA_NOTICE" desc="The message shown to users if a printer has a EULA agreement attached to it.">
+    End User License Agreement
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_IPP_URI_UNREACHABLE" desc="The message shown on the uri field of the add/edit printer dialogs when attempting to connect to an IPP printer that is not found on the network.">
+    Couldn't detect a printer. Please enter printer address again.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_DIALOG_GENERAL_ERROR" desc="General message shown on the top of the add/edit printer dialogs when adding/editting a printer fails.">
+    Unable to set up printer. Please check configuration and try again.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_FOUND_ZERO_PRINTERS" desc="Message shown on a toast to indicate no printers were found from a print server.">
+    Did not find any printers from the print server
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_FOUND_ONE_PRINTER" desc="Message shown on a toast to indicate that only one printer was found from a print server.">
+    Found 1 printer from the print server
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_FOUND_MANY_PRINTERS" desc="Message shown on a toast to indicate the number of printers found on a print server.">
+    Found <ph name="NUM_PRINTERS">$1<ex>5</ex></ph> printers from the print server
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_INVALID_URL_ADDRESS" desc="Message shown on the address field of the print server dialog when attempting to connect to a print server with an invalid URL.">
+    Invalid address. Please check the address and try again.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_CONNECTION_ERROR" desc="Message shown on the print server dialog when the user has provided a valid URL but the server is unreachable.">
+    Couldn't detect the print server. Please check the address and try again.
+  </message>
+  <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_REACHABLE_BUT_CANNOT_ADD" desc="Message shown on the print server dialog when we are able to reach the print server but still ran into some error with adding the print server.">
+    Couldn't add the print server. Please check the server's configuration and try again.
+  </message>
+
+  <!-- Internet page (OS settings) -->
+  <message name="IDS_SETTINGS_INTERNET_ADD_CONNECTION" desc="Settings &gt; Internet &gt; Add connection expanding section label.">
+    Add connection
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_ADD_CONNECTION_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the options for a new connection. Only visible by screen reader software.">
+    Add network connection
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_ADD_CONNECTION_NOT_ALLOWED" desc="Settings &gt; Internet &gt; Message when Add connection is not allowed.">
+    Add connection is disabled by your administrator
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_ADD_THIRD_PARTY_VPN" desc="Settings &gt; Internet &gt; Add third party (Extension or ARC) VPN label">
+    Add <ph name="PROVIDER_NAME">$1<ex>VPN Demo</ex></ph>...
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_ADD_VPN" desc="Settings &gt; Internet &gt; Add VPN label.">
+    Add OpenVPN / L2TP...
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_ADD_WIFI" desc="Settings &gt; Internet &gt; Add Wi-Fi label.">
+    Add Wi-Fi...
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_CONFIG_NAME" desc="Title for the network configuration dialog for an existing network.">
+    Configure <ph name="NAME">$1<ex>My WiFi network</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_DETAIL" desc="Name of the settings page which displays network details.">
+    Network Details
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_DEVICE_ENABLING" desc="Settings &gt; Internet &gt; Message when a device (e.g a Cellular modem) is enabling.">
+    Enabling
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_DEVICE_INITIALIZING" desc="Settings &gt; Internet &gt; Message when a device (e.g a Cellular modem) is initializing.">
+    Initializing
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_JOIN_TYPE" desc="Title for the network configuration dialog for a new network.">
+    Join <ph name="TYPE">$1<ex>WiFi</ex></ph> network
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_MOBILE_SEARCH" desc="Settings &gt; Internet &gt; Message in Mobile section when searching for mobile networks.">
+    Searching for mobile networks
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS" desc="Name of the settings page which displays the list of known networks.">
+    Known Networks
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NO_NETWORKS" desc="Entry when there are no preferred networks or no networks of a particular type.">
+    None
+  </message>
+  <message name="IDS_SETTINGS_INTERNET" desc="Name of the settings page which displays internet preferences.">
+    Network
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_SUMMARY_BUTTON_ACCESSIBILITY_LABEL" desc="Accessibility only label for network summary item button that opens network details.">
+    <ph name="NETWORK_TYPE">$1<ex>Mobile Data</ex></ph> - <ph name="NETWORK_DISPLAY_NAME">$2<ex>Verizon Wireless</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL" desc="Accessibility only label for mobile data enable/disable toggle .">
+    Mobile data enable
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TOGGLE_TETHER_LABEL" desc="Settings &gt; Internet: Label for Tether enable/disable toggle .">
+    Get data connection
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TOGGLE_TETHER_SUBTEXT" desc="Settings &gt; Internet: Description for Tether enable/disable toggle .">
+    Let this device find other devices with your Brave Account that have a mobile data connection
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TOGGLE_WIFI_ACCESSIBILITY_LABEL" desc="Accessibility only label for WiFi enable/disable toggle .">
+    Wi-Fi enable
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_ALL" desc="Title for list of all other (non preferred) networks.">
+    All networks
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_BUTTON" desc="Text for button that opens the known networks subpage.">
+    Known networks
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_MESSAGE" desc="Message describing the behavior of the known networks page.">
+    Preferred networks will be preferred over other known networks if more than one is available
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_PREFFERED" desc="Title for list of preferred networks.">
+    Preferred networks
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_MENU_ADD_PREFERRED" desc="Settings &gt; Internet &gt; Known networks &gt; Dropdown menu item to add a network to the list of preferred networks.">
+    Add to preferred
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_MENU_REMOVE_PREFERRED" desc="Settings &gt; Internet &gt; Known networks &gt; Dropdown menu item to remove a network from the list of preferred networks.">
+    Remove from preferred
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_MENU_FORGET" desc="Settings &gt; Internet &gt; Known networks &gt; Dropdown menu item to forget a known network.">
+    Forget
+  </message>
+  <message name="IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING" desc="Settings &gt; Internet &gt; Network details: Toggle label to allow mobile data roaming.">
+    Allow mobile data roaming
+  </message>
+  <message name="IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING_ENABLED_HOME" desc="Settings &gt; Internet &gt; Network details: Toggle sublabel when roaming is allowed and it's connected to the home network.">
+    On, not roaming
+  </message>
+  <message name="IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING_ENABLED_ROAMING" desc="Settings &gt; Internet &gt; Network details: Toggle sublabel when roaming is allowed and it's connected to a roaming network">
+    On, roaming
+  </message>
+  <message name="IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING_DISABLED" desc="Settings &gt; Internet &gt; Network details: Toggle sublabel when roaming is not allowed.">
+    Roaming off
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_ALWAYS_ON_VPN" desc="Settings &gt; Internet &gt; Network details: Label for the checkbox determining that all internet traffic has to go through this VPN (virtual private network), and all other network connections are blocked.">
+    Always connect through this VPN
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT" desc="Settings &gt; Internet &gt; Network details: Label for the checkbox determining whether to automatically connect to the network.">
+    Automatically connect to this network
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT_CELLULAR" desc="Settings &gt; Internet &gt; Mobile Data details: Label for the checkbox determining whether to automatically connect to the cellular network.">
+    Automatically connect to cellular network
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_BUTTON_ACTIVATE" desc="Settings &gt; Internet &gt; Network details: The label for the button to activate a Cellular network.">
+    Activate
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_BUTTON_CONFIGURE" desc="Settings &gt; Internet &gt; Network details: The label for the button to configure a network (change its settings).">
+    Configure
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_BUTTON_CONNECT" desc="Settings &gt; Internet &gt; Network details: The label for the button to connect to a network.">
+    Connect
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_BUTTON_DISCONNECT" desc="Settings &gt; Internet &gt; Network details: The label for the button to disconnect from a network.">
+    Disconnect
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_BUTTON_FORGET" desc="Settings &gt; Internet &gt; Network details: The label for the button to forget a network (remove from the list of known networks).">
+    Forget
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_BUTTON_VIEW_ACCOUNT" desc="Settings &gt; Internet &gt; Network details: The label for the button to view the account details for a Cellular network.">
+    View Account
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_CONNECT_NOT_ALLOWED" desc="Settings &gt; Internet &gt; Message when connecting to a non policy network is not allowed.">
+    Connecting to this network is disabled by your administrator
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_IP_ADDRESS" desc="Settings &gt; Internet &gt; Network details: Label for the network IP Address.">
+    IP Address
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO" desc="Settings &gt; Internet &gt; Network details: Label for the checkbox determining whether to automatically configure the network IP config.">
+    Configure IP address automatically
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_PREFER" desc="Settings &gt; Internet &gt; Network details: Label for the checkbox determining whether a network is preferred over other networks.">
+    Prefer this network
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_PRIMARY_USER_CONTROLLED" desc="Settings &gt; Internet &gt; Network details: Text to show when a network configuration is controlled by the primary user.">
+    Network configuration is controlled by <ph name="USER_EMAIL">$1<ex>joe@gmail.com</ex></ph>.
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_ADVANCED" desc="Settings &gt; Internet &gt; Network details: Advanced section label.">
+    Advanced
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_ADVANCED_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the advanced network properties. Only visible by screen reader software.">
+    Show advanced network properties
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_NETWORK" desc="Settings &gt; Internet &gt; Network details: Network section label.">
+    Network
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_NETWORK_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the network address configuration settings. Only visible by screen reader software.">
+    Show network address settings
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_PROXY" desc="Settings &gt; Internet &gt; Network details: Proxy section label.">
+    Proxy
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_PROXY_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the proxy configuration settings. Only visible by screen reader software.">
+    Show proxy settings
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_NETWORK_SHARED" desc="Settings &gt; Internet &gt; Network details: Text to show when a network is shared.">
+    Other users of this device can use this network.
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_WIFI_NETWORK_OUT_OF_RANGE" desc="Text shown when viewing the Wi-Fi network detail page when the currently-viewed Wi-Fi network has been lost (e.g., has gone out of range).">
+    Network out of range
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_CELLULAR_CONTACT_SPECIFIC_CARRIER" desc="Text shown when the Bravebook cannot connect to a cellular network, which alerts the user to contact a specific carrier.">
+    Trouble connecting. Please contact <ph name="CARRIER_NAME">$1<ex>Brave Fi</ex></ph> for assistance.
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_CELLULAR_CONTACT_DEFAULT_CARRIER" desc="Text shown when the Bravebook cannot connect to a cellular network, which alerts the user to contact their carrier.">
+    Trouble connecting. Please contact your carrier for assistance.
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TETHER_PHONE_OUT_OF_RANGE" desc="Text shown when viewing the Tether network detail page when the currently-viewed Tether network has been lost (e.g., has gone out of range). Because Tether networks are provided by Android phones, we use the word 'phone' here instead of 'network'.">
+    Unable to detect your phone
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_TITLE" desc="Title of the section which explains how to enable Google Play Services notifications on an Android phone in order to use Instant Tethering.">
+    To use Instant Tethering, turn on notifications for Google Play Services.
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_ONE_DEVICE_SUBTITLE" desc="Subtitle of the section which explains how to enable Google Play Services notifications. This subtitle is used when only one phone needs to have its notifications enabled.">
+    On your '<ph name="PHONE_NAME">$1<ex>Brave Pixel</ex></ph>':
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_TWO_DEVICES_SUBTITLE" desc="Subtitle of the section which explains how to enable Google Play Services notifications. This subtitle is used when two phones need to have their notifications enabled.">
+    On your '<ph name="PHONE_NAME_1">$1<ex>Brave Pixel</ex></ph>' and '<ph name="PHONE_NAME_2">$2<ex>Brave Pixel 2</ex></ph>':
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_MANY_DEVICES_SUBTITLE" desc="Subtitle of the section which explains how to enable Google Play Services notifications. This subtitle is used when three or more phones need to have their notifications enabled.">
+    On your devices:
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_FIRST_STEP" desc="First instruction for how to enable Google Play Services notifications on an Android phone. This step teaches the user how to look at notification settings.">
+    Go to Settings &gt; Apps &amp; notifications &gt; Notifications.
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_SECOND_STEP" desc="Second instruction for how to enable Google Play Services notifications on an Android phone. This step teaches the user how to look at notification settings for the Google Play Services app.">
+    Tap App notifications &gt; Google Play services.
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_THIRD_STEP" desc="Third instruction for how to enable Google Play Services notifications on an Android phone. This step teaches the user how to enable notifications when already viewing noticiations settings for Google Play Services.">
+    Turn on Google Play services.
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_FOURTH_STEP" desc="Fourth instruction for how to enable Google Play Services notifications on an Android phone. This step teaches the user how to enable the Instant Tethering notification channel for Google Play Services.">
+    Scroll to the bottom of the screen and turn on Instant Tethering, if it appears. If it doesn't, you're all set.
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DIALOG_TITLE" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Title asking the user to create a new hotspot.">
+    Connect to new hotspot?
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_AVAILABLE_DEVICE_TITLE" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Label for explaining that the device following the colon is available for tethering.">
+    Available device:
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_BATTERY_PERCENTAGE" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Description of how much battery a device has.">
+    <ph name="BATTERY_PERCENTAGE">$1<ex>100</ex></ph>% Battery
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_EXPLANATION" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Explanation of what will happen if the user connects to a tether hotspot.">
+    Your <ph name="PHONE_NAME">$1<ex>Brave Pixel XL</ex></ph> will create a private Wi-Fi connection.
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CARRIER_WARNING" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Warning to users that cellular providers may block the use of tethering.">
+    Some carriers might block this feature.
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_TITLE" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Title of the section describing what will happen when tethering is enabled.">
+    While the hotspot is on, your <ph name="PHONE_NAME">$1<ex>Brave Pixel XL</ex></ph> will:
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_MOBILE_DATA" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Bulletpoint alerting the user that tethering will use mobile data.">
+    Use mobile data
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_BATTERY" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Bullet point alerting the user that tethering will use both devices' batteries.">
+    Use the battery more quickly (currently <ph name="BATTERY_PERCENTAGE">$1<ex>100</ex></ph>%)
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_WIFI" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Bullet point alerting the user that the tether host (i.e., the device to which the current device will connect to) will disconnect from Wi-Fi.">
+    Disconnect from Wi-Fi
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_NOT_NOW_BUTTON" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Button which, when tapped, closes the dialog and does not connect the device.">
+    Not now
+  </message>
+ <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CONNECT_BUTTON" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Button which, when tapped, starts a connection attempt to the device.">
+    Connect
+  </message>
+  <message name="IDS_SETTINGS_INTERNET_LOOKING_FOR_MOBILE_NETWORK" desc="Text shown when viewing the Mobile data page when there are no cellular or tether networks available.">
+    Looking for a mobile network. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
+  </message>
+
+  <!-- Users Page (OS Settings) -->
+  <message name="IDS_SETTINGS_USERS_MODIFIED_BY_OWNER_LABEL" desc="Label saying settings may only be modified by the device owner.">
+    These settings may only be modified by the owner:
+  </message>
+  <message name="IDS_SETTINGS_USERS_MANAGED_LABEL" desc="Label saying settings is managed by enterprise and thus can't be modified.">
+    These settings are controlled by enterprise policy. Please contact your administrator for more information.
+  </message>
+  <message name="IDS_SETTINGS_USERS_GUEST_BROWSING_LABEL" desc="Label for the guest browsing setting.">
+    Enable Guest browsing
+  </message>
+  <message name="IDS_SETTINGS_USERS_SHOW_ON_SIGNIN_LABEL" desc="Label for the 'show users on sign-in screen' setting.">
+    Show usernames and photos on the sign-in screen
+  </message>
+  <message name="IDS_SETTINGS_USERS_RESTRICT_SIGNIN_LABEL" desc="Label for the setting for restricting sign in to specific users.">
+    Restrict sign-in to the following users:
+  </message>
+  <message name="IDS_SETTINGS_USERS_DEVICE_OWNER_LABEL" desc="Label for a user who is the device owner.">
+    <ph name="USER_NAME">$1<ex>John Smith</ex></ph> (owner)
+  </message>
+  <message name="IDS_SETTINGS_USERS_REMOVE_USER_TOOLTIP" desc="Tooltip for the button that removes a user from the list of restricted sign in users.">
+    Remove <ph name="USER_NAME">$1<ex>John Smith</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_USERS_ADD_USERS" desc="Label the dialog for adding users.">
+    Add user
+  </message>
+  <message name="IDS_SETTINGS_USERS_ADD_USERS_EMAIL" desc="Label for the email input field for adding users.">
+    Email address
+  </message>
+  <message name="IDS_SETTINGS_USER_EXISTS_ERROR" desc="Error message for attempting to add a user that already exists">
+    This user already exists
+  </message>
+
+  <!-- Multidevice Page (OS settings) -->
+  <message name="IDS_SETTINGS_MULTIDEVICE" desc="Title of a section of settings. This section describes settings for devices that are connected to the Bravebook, like phones.">
+    Connected devices
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_SETUP_BUTTON" desc="Label of the button that opens a menu to the user that allows them to set up a connection between the user's phone and their Bravebook to give them access to special features.">
+    Set up
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_VERIFY_BUTTON" desc="Label for the button to get the Bravebook to verify that it can connect with their phone.">
+    Verify
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_SETUP_ITEM_HEADING" desc="Heading for settings item that allows the user to connect their phone to their Bravebook.">
+    Android phone
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_ENABLED" desc="Text to tell user multidevice features are turned on">
+    Enabled
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_DISABLED" desc="Text to tell user multidevice features are turned off">
+    Disabled
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_INSTANT_TETHERING" desc="Name of a feature. This feature automatically offers the user to tether to their phone if their Bravebook is offline and their phone supports tethering.">
+    Instant Tethering
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_INSTANT_TETHERING_SUMMARY" desc="Description of for the 'Instant Tethering' setting. This feature automatically offers the user to tether to their phone if their Bravebook is offline and their phone supports tethering.">
+    Connect to the internet through your phone
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_ANDROID_MESSAGES" desc="Name of a feature. This feature lets the user read and reply to text messages from their Bravebook. New text messages will appear as notifications.">
+    Messages
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_ANDROID_MESSAGES_SUMMARY" desc="Description of for the 'Android Messages' setting. This feature lets the user read and reply to text messages from their Bravebook. New text messages will appear as notifications.">
+    Send and receive text messages from your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$2<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+
+  <!-- Lock Screen Page (OS settings) -->
+  <message name="IDS_ASH_SETTINGS_LOCK_SCREEN_NOTIFICATION_TITLE" desc="The title of options to change the behavior of notifications on the lock screen.">
+    On the lock screen
+  </message>
+  <message name="IDS_ASH_SETTINGS_LOCK_SCREEN_NOTIFICATION_HIDE_SENSITIVE" desc="One of options of the lock screen notification mode to hide sensitive contents and show the others on the lock screen.">
+    Hide sensitive content
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK" desc="The text on the checkbox to enable screenlocker for current user.">
+    Show lock screen when waking from sleep
+  </message>
+  <message name="IDS_ASH_SETTINGS_LOCK_SCREEN_NOTIFICATION_SHOW" desc="One of options of the lock screen notification mode to show all the notifications and its contents on the lock screen.">
+    Show all notification content
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD" desc="The account password or a custom PIN can be used to unlock the device.">
+    PIN or password
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SETUP_BUTTON" desc="Text on the lock screen button which opens up the fingerprint subpage.">
+    Set up
+  </message>
+  <message name="IDS_ASH_SETTINGS_LOCK_SCREEN_NOTIFICATION_HIDE" desc="One of options of the lock screen notification mode to hide all the notifications on the lock screen.">
+    Don't show notifications at all
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS" desc="Text on the lock screen which opens up the fingerprint subpage.">
+    Edit Fingerprints
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS_DESCRIPTION" desc="Secondary text on the lock screen which opens up the fingerprint subpage.">
+    Set up a faster way to unlock your device
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY" desc="Only the account password can be used to unlock the device.">
+    Password only
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON" desc="Button that the user can click to change an existing already-active PIN.">
+    Change PIN
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS" desc="Text on the lock screen which tells users how many fingerprints they have enrolled.">
+    <ph name="NUM_FINGERPRINTS">$1<ex>1</ex></ph> fingerprints set up
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE" desc="Text on the profiles page which notifies the user that the device will not show lock screen or prompt for auth after waking from sleep.">
+    Sign in automatically
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME" desc="The default name (plus a number for a newly added fingerprint).">
+    Finger <ph name="NEW_FINGER_NUMBER">$1<ex>1</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_DELETE_FINGERPRINT_ARIA_LABEL" desc="Aria label for the button in the fingerprint subpage that deletes a registered fingerprint. Only visible by screen reader software.">
+    delete [<ph name="FINGERPRINT_NAME">$1<ex>Fingerprint 1</ex></ph>]
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_OPTIONS_LOCK" desc="Text on the lock screen which is the subheader for the screen locking options.">
+    Screen lock options
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE" desc="Header to tell the user an action will make their Bravebook forget their phone. This means they will no longer have access to multidevice features.">
+    Forget phone
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE_EXPLANATION" desc="Explanation on a clickable menu item that makes the Bravebook forget the user's phone. It tells the user that the menu item will cause their phone to stop acting as a partner for their Bravebook for multidevice features.">
+    Disconnect your phone from your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_FORGET_DEVICE_DIALOG_MESSAGE" desc="Text of a dialog that lets the user choose if their Bravebook should forget their phone. This means they will no longer have access to multidevice features.">
+    Disconnect your phone from your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>. They will no longer connect automatically.
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE_DISCONNECT" desc="Text for the button that lets the user choose if their Bravebook should forget their phone. This means they will no longer have access to multidevice features.">
+    Disconnect
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_SETUP_SUMMARY" desc="Tells the user to connect their Bravebook to their phone.">
+    Connect your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> with your phone. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$2<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_NO_ELIGIBLE_HOSTS" desc="Tells the user that there is no phone with their account on it that can connect to their Bravebook.">
+    No eligible devices. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_VERIFICATION_TEXT" desc="Text to tell user that their Bravebook needs to verify that it can connect with their phone.">
+    Waiting for verification. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_MULTIDEVICE_SMART_LOCK_SUMMARY" desc="Description of for the 'Smart Lock' setting. This feature automatically unlocks the user's Bravebook if their phone is nearby and unlocked.">
+    Unlock your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> with your phone. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$2<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_OPTIONS_LOGIN_LOCK" desc="Text on the lock screen which is the subheader for the screen locking options.">
+    Lock screen from sleep mode
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON" desc="Button that is used to setup a new PIN when the user does not have a PIN yet.">
+    Set up PIN
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE_LOCK" desc="Text on the profiles page which opens up the quick unlock subpage and the title of the quick unlock subpage.">
+    Screen lock
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE_LOGIN_LOCK" desc="Text on the profiles page which opens up the security and sign-in section.">
+    Security and sign-in
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD_LOCK" desc="Text above a password input field that tells the user they need to submit their password to configure these settings.">
+    Enter your password to configure screen lock
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD_LOGIN_LOCK" desc="Text above a password input field that tells the user they need to submit their password to configure security and sign-in settings.">
+    Enter your password to configure security and sign-in
+  </message>
+
+  <!-- Kerberos Add Accounts Dialog Page (OS settings) -->
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_ADVANCED_CONFIG_LABEL" desc="Label of the button in 'Add a Kerberos ticket' dialog to get to the Advanced configuration dialog.">
+    Advanced
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ADVANCED_CONFIG_TITLE" desc="In Kerberos Advanced Configuration dialog, the title of the dialog.">
+    Configure Kerberos
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ADVANCED_CONFIG_DESC" desc="In Kerberos Advanced Configuration dialog, the description of the dialog (below the title).">
+    Edit the configuration file
+  </message>
+  <message name="IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_REMEMBER_PASSWORD" desc="Label of the checkbox to remember the password in the 'Add a Kerberos ticket' dialog.">
+    Remember password
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_PASSWORD" desc="Title for the input that lets users specify their password for a Kerberos ticket.">
+    Password
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_USERNAME" desc="Title for the input that lets users specify their username for a Kerberos ticket.">
+    Kerberos username
+  </message>
+  <message name="IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_DESCRIPTION" desc="Description of the 'Add a Kerberos ticket' dialog. Shown just below the title of the dialog.">
+    To automatically refresh a ticket, check “Remember password.” Your password will be stored on your device only.
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ERROR_NETWORK_PROBLEM" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user has no network connection or enters a bad realm.">
+    Network problem or bad realm
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ERROR_USERNAME_INVALID" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user enters a badly formatted username.">
+    Username invalid
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ERROR_USERNAME_UNKNOWN" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user enters a username that is not known to the Kerberos realm.">
+    Username not known to server
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ERROR_DUPLICATE_PRINCIPAL_NAME" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user enters a username for which there is already a ticket.">
+    A ticket with this username already exists
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ERROR_CONTACTING_SERVER" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the OS is not able to contact the server for the given realm.">
+    Contacting server for realm failed
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ERROR_PASSWORD_INVALID" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user enters the wrong password.">
+    Password invalid
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ERROR_PASSWORD_EXPIRED" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user's password is expired.">
+    Password expired
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ERROR_KDC_ENC_TYPE" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the KDC does not support the encryption types specified in the Kerberos configuration (KDC = Key Distribution Center, part of Kerberos infrastructure).">
+    KDC does not support encryption type
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ERROR_GENERAL" desc="Fallback error message displayed in the 'Add a Kerberos ticket' dialog.">
+    Couldn't get Kerberos ticket. Try again, or contact your organization's device admin. (Error code <ph name="ERROR_CODE">$1<ex>123</ex></ph>).
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_NESTED_IN_GROUP" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that has a section (some text in angular braces) inside a group (some text in curly braces), e.g. 'someOption = { [someSection] }'. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
+    Section nested in group: <ph name="ERROR_LINE">$1<ex>[realms] (inside a block of curly braces '{ ... })</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_SYNTAX" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that contains a malformed section, e.g. '[someSection'. Sections must have opening and closing angular braces. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
+    Section syntax error: <ph name="ERROR_LINE">$1<ex>[realms</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_EXPECTED_OPENING_CURLY_BRACE" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that is missing a curly brace somewhere. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
+    Expected opening curly brace: <ph name="ERROR_LINE">$1<ex>ticket_lifetime = 1d (in the line after 'EXAMPLE.COM = )'</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_EXTRA_CURLY_BRACE" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that has a closing curly brace '}' that cannot be matched with an opening curly brace '{'. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
+    Extra curly brace: <ph name="ERROR_LINE">$1<ex>} (without having a corresponding opening curly brace '{')</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_RELATION_SYNTAX_ERROR" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that contains a malformed relation. A relation is 'key = value'. A malformed relation would be e.g. 'key : value' instead of 'key = value'. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
+    Relation syntax error: <ph name="ERROR_LINE">$1<ex>ticket_lifetime : 1d</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_KEY_NOT_SUPPORTED" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that contains a configuration option that we do not support, e.g. '[libdefaults] ccache_type = 1'. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
+    Configuration option not supported: <ph name="ERROR_LINE">$1<ex>ccache_type = 1</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_NOT_SUPPORTED" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that contains a section that we do not support, e.g. '[appdefaults]'. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
+    Section not supported: <ph name="ERROR_LINE">$1<ex>[appdefaults]</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_KRB5_FAILED_TO_PARSE" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that cannot be parsed by the underlying Kerberos library for unknown reasons. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
+    Failed to parse configuration
+  </message>
+  <message name="IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_REFRESH_BUTTON_LABEL" desc="Label of the action button on the 'Refresh a Kerberos tickets' dialog.">
+    Refresh
+  </message>
+  <message name="IDS_SETTINGS_ADD_KERBEROS_ACCOUNT" desc="Title of the 'Add a Kerberos ticket' dialog.">
+    Add a Kerberos ticket
+  </message>
+  <message name="IDS_SETTINGS_REFRESH_KERBEROS_ACCOUNT" desc="Title of the 'Refresh a Kerberos ticket' dialog.">
+    Refresh a Kerberos ticket
+  </message>
+
+  <!-- Kerberos Accounts Page (OS settings) -->
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_ADD_ACCOUNT_LABEL" desc="Label of the 'Add a ticket' button on 'Kerberos tickets' Settings page.">
+    Add a ticket
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_REFRESH_NOW_LABEL" desc="Label of the 'Refresh now' button on 'Kerberos tickets' Settings page.">
+    Refresh now
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_SET_AS_ACTIVE_ACCOUNT_LABEL" desc="Label of the 'Set as ticket ticket' button on 'Kerberos tickets' Settings page.">
+    Set as active ticket
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_SIGNED_OUT" desc="Text displayed if a Kerberos ticket is in signed-out state on 'Kerberos tickets' Settings page.">
+    Expired
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_LIST_HEADER" desc="List header for the ticket list on 'Kerberos tickets' Settings page.">
+    Tickets
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_REMOVE_ACCOUNT_LABEL" desc="Label of the 'Remove from this device' button on 'Kerberos tickets' Settings page.">
+    Remove from this device
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_REAUTHENTICATION_LABEL" desc="Label of the re-authentication button on 'Kerberos tickets' Settings page.">
+    Refresh
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_TICKET_ACTIVE" desc="Text displayed if a Kerberos ticket is selected to be the currently active ticket on 'Kerberos tickets' Settings page.">
+    Active
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_ACCOUNT_REMOVED_TIP" desc="Tip shown when a Kerberos ticket was removed on 'Kerberos tickets' Settings page.">
+    Ticket removed
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_ACCOUNT_REFRESHED_TIP" desc="Tip shown when a Kerberos ticket was refreshed on 'Kerberos tickets' Settings page.">
+    Ticket refreshed
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_SIGNED_IN" desc="Text displayed if a Kerberos ticket is in signed-in state on 'Kerberos tickets' Settings page.">
+    Valid for <ph name="TICKET_TIME_LEFT">$1<ex>7 hours 12 minutes</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_DESCRIPTION" desc="Description of the 'Kerberos tickets' Settings page. Shown just below the title of the page.">
+    Choose a ticket to use for authentication. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_SUBMENU_LABEL" desc="Label of 'Kerberos tickets' submenu in Settings page.">
+    Kerberos tickets
+  </message>
+  <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_PAGE_TITLE" desc="Title of 'Kerberos tickets' Settings page.">
+    Kerberos tickets
+  </message>
+
+  <!-- Power -->
+  <message name="IDS_SETTINGS_POWER_TITLE" desc="In Device Settings, the title for power management.">
+    Power
+  </message>
+  <message name="IDS_SETTINGS_POWER_SOURCE_LABEL" desc="In Device Settings &gt; Power, the label for the power source dropdown.">
+    Power source
+  </message>
+  <message name="IDS_SETTINGS_POWER_SOURCE_BATTERY" desc="In Device Settings &gt; Power, the text referring to the battery as the power source.">
+    Battery
+  </message>
+  <message name="IDS_SETTINGS_POWER_SOURCE_AC_ADAPTER" desc="In Device Settings &gt; Power, the text referring to a dedicated charger like an AC adapter as the power source.">
+    AC adapter
+  </message>
+  <message name="IDS_SETTINGS_POWER_SOURCE_LOW_POWER_CHARGER" desc="In Device Settings &gt; Power, the text referring to a low-power charger like a USB charger as the power source.">
+    Low-power charger
+  </message>
+  <message name="IDS_SETTINGS_POWER_SOURCE_CALCULATING" desc="In Device Settings &gt; Power, the power source description when the power status is being determined.">
+    Checking power sources...
+  </message>
+  <message name="IDS_SETTINGS_POWER_IDLE_LABEL" desc="In Device Settings &gt; Power, label for behavior when device is idle.">
+    When idle
+  </message>
+  <message name="IDS_SETTINGS_POWER_IDLE_WHILE_CHARGING_LABEL" desc="In Device Settings &gt; Power, label for behavior when device is idle.">
+    While charging
+  </message>
+  <message name="IDS_SETTINGS_POWER_IDLE_WHILE_CHARGING_ARIA_LABEL" desc="In Device Settings &gt; Power, aria label for behavior when device is idle.">
+    Idle action while charging
+  </message>
+  <message name="IDS_SETTINGS_POWER_IDLE_WHILE_ON_BATTERY_LABEL" desc="In Device Settings &gt; Power, label for behavior when device is idle.">
+    While on battery
+  </message>
+  <message name="IDS_SETTINGS_POWER_IDLE_WHILE_ON_BATTERY_ARIA_LABEL" desc="In Device Settings &gt; Power, aria label for behavior when device is idle.">
+    Idle action while on battery
+  </message>
+  <message name="IDS_SETTINGS_POWER_IDLE_DISPLAY_OFF_SLEEP" desc="In Device Settings &gt; Power, menu item for idle behavior that turns the screen off and later puts the device to sleep. String must be short enough to fit in a drop-down menu.">
+    Sleep
+  </message>
+  <message name="IDS_SETTINGS_POWER_IDLE_DISPLAY_OFF" desc="In Device Settings &gt; Power, menu item for idle behavior that turns the screen off but prevents the device from sleeping. String must be short enough to fit in a drop-down menu.">
+    Turn off display
+  </message>
+  <message name="IDS_SETTINGS_POWER_IDLE_DISPLAY_ON" desc="In Device Settings &gt; Power, menu item for idle behavior that prevents the screen from turning off and prevents the device from sleeping. String must be short enough to fit in a drop-down menu.">
+    Keep display on
+  </message>
+  <message name="IDS_SETTINGS_POWER_IDLE_OTHER" desc="In Device Settings &gt; Power, menu item for custom idle behavior.">
+    Other
+  </message>
+  <message name="IDS_SETTINGS_POWER_LID_CLOSED_SLEEP_LABEL" desc="In Device Settings &gt; Power, label for suspending when cover is closed.">
+    Sleep when cover is closed
+  </message>
+  <message name="IDS_SETTINGS_POWER_LID_CLOSED_SIGN_OUT_LABEL" desc="In Device Settings &gt; Power, label for signing out when cover is closed.">
+    Sign out when cover is closed
+  </message>
+  <message name="IDS_SETTINGS_POWER_LID_CLOSED_SHUT_DOWN_LABEL" desc="In Device Settings &gt; Power, label for shutting down when cover is closed.">
+    Shut down when cover is closed
+  </message>
+  <message name="IDS_SETTINGS_BATTERY_STATUS" desc="In Device Settings &gt; Power, the battery status while the battery is discharging, showing the battery power as a percentage and the time left until the battery is empty.">
+    <ph name="percentage">$1<ex>56</ex></ph>% - <ph name="time">$2<ex>2 hours and 20 minutes</ex></ph> left
+  </message>
+  <message name="IDS_SETTINGS_BATTERY_STATUS_CHARGING" desc="In Device Settings &gt; Power, the battery status while the battery is charging, showing the battery power as a percentage and the time left until the battery is full.">
+    <ph name="percentage">$1<ex>56</ex></ph>% - <ph name="time">$2<ex>2 hours and 20 minutes</ex></ph> until full
+  </message>
+  <message name="IDS_SETTINGS_BATTERY_STATUS_SHORT" desc="In Device Settings &gt; Power, the battery status when the time left cannot be shown.">
+    <ph name="percentage">$1<ex>56</ex></ph>%
+  </message>
+
+  <!-- Reset Page (OS settings)-->
+  <message name="IDS_SETTINGS_FACTORY_RESET" desc="Name of the factory reset option on the Brave settings page">
+    Powerwash
+  </message>
+  <message name="IDS_SETTINGS_FACTORY_RESET_HEADING" desc="Name of the 'Factory reset' window">
+    Restart your device
+  </message>
+  <message name="IDS_SETTINGS_FACTORY_RESET_DESCRIPTION" desc="Description of the factory reset option on the Brave settings page">
+    Remove all user accounts and reset your <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph> device to be just like new.
+  </message>
+  <message name="IDS_SETTINGS_FACTORY_RESET_WARNING" desc="Warning text in the 'Factory Reset' window">
+    A restart is required before your device can be reset with Powerwash. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_FACTORY_RESET_BUTTON_LABEL" desc="Label for the factory reset button.">
+    Reset
+  </message>
+  <message name="IDS_SETTINGS_FACTORY_RESET_BUTTON_ROLE" desc="A label to be read aloud by screen readers when the Reset button is focused. This button initiates the device factory reset flow.">
+    Reset Button
+  </message>
+
+  <!-- Brave Assistant Page (OS Settings)-->
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT" desc="Name of the settings page for Brave Assistant.">
+    Brave Assistant
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD" desc="Title for a toggle that lets the assistant detect hotword.">
+    "Ok Brave"
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_DESCRIPTION" desc="Sub label for hotword-enable toggle.">
+    Access your Assistant when you say "Ok Brave."
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_WITHOUT_DSP_DESCRIPTION" desc="Sub label for hotword-enable dropdown without DSP support.">
+    Access your Assistant when you say "Ok Brave." To save battery, choose “On (Recommended.)” Your Assistant will respond only when your device is plugged in or charging.
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_WITHOUT_DSP_RECOMMENDED" desc="Default label for hotword-enable dropdown without DSP support.">
+    On (Recommended)
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_WITHOUT_DSP_ALWAYS_ON" desc="Always-on label for hotword-enable dropdown without DSP support.">
+    Always on
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_WITHOUT_DSP_OFF" desc="Off label for hotword-enable dropdown without DSP support." meaning="Ok Brave hotwording is disabled.">
+    Off
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_VOICE_SETTINGS" desc="Title for the Assistant voice settings.">
+    Voice match
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_VOICE_SETTINGS_RETRAIN" desc="Button label for retrain voice model.">
+    Retrain
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_NOTIFICATION" desc="Title for a toggle that lets the assistant show you notifications.">
+    Notifications
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_NOTIFICATION_DESCRIPTION" desc="Sub label for notification-enable toggle.">
+    Allow the Assistant to show you notifications
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_LAUNCH_WITH_MIC_OPEN" desc="Title for a toggle that determines whether to open the microphone when launching the Assistant.">
+    Preferred input
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_LAUNCH_WITH_MIC_OPEN_DESCRIPTION" desc="Sub label for launch-with-microphone-open toggle.">
+    Default to using voice instead of keyboard
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_SETTINGS" desc="Title for a button that opens the Brave Assistant app settings.">
+    Brave Assistant settings
+  </message>
+
+  <!-- Device display (OS settings) -->
+  <message name="IDS_SETTINGS_DISPLAY_TITLE" desc="In Device Settings, the title for display settings.">
+    Displays
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ARRANGEMENT_TEXT" desc="In Device Settings &gt; Displays, text describing to use a mouse to drag the displays and change the arrangement.">
+    Drag to move a display
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ARRANGEMENT_TITLE" desc="In Device Settings &gt; Displays, the label for the display arrangement section.">
+    Arrangement
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_MIRROR" desc="In Device Settings &gt; Displays, the label for the control for mirroring.">
+    Mirror <ph name="DISPLAY_NAME">$1<ex>HP Z27n</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_MIRROR_DISPLAY_NAME" desc="In Device Settings &gt; Displays, the label for the mirrored display name shown in the layout.">
+    Mirrored
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_AMBIENT_COLOR_TITLE" desc="In Device Settings &gt; Displays, the label for toggling ambient color.">
+    Ambient colors
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_AMBIENT_COLOR_SUBTITLE" desc="In Device Settings &gt; Displays, descriptive sublabel for ambient color.">
+    Adjusts the screen color to match the environment
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_LABEL" desc="In Device Settings &gt; Displays, the label for the Night Light feature (which controls the color temperature of the screen) section.">
+    Night Light
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_ON_AT_SUNSET" desc="In Device Settings &gt; Displays, the sub label for the automatic schedule which explains that Night Light will turn on automatically at sunset.">
+    Night Light will turn on automatically at sunset
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_OFF_AT_SUNRISE" desc="In Device Settings &gt; Displays, the sub label for the automatic schedule which explains that Night Light will turn off automatically at sunrise.">
+    Night Light will turn off automatically at sunrise
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_CUSTOM" desc="In Device Settings &gt; Displays, the label of the option to set a custom schedule of the Night Light feature.">
+    Custom
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_LABEL" desc="In Device Settings &gt; Displays, the label for the automatic schedule section of the Night Light feature.">
+    Schedule
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_NEVER" desc="In Device Settings &gt; Displays, the label of the option to turn off the automatic schedule of the Night Light feature.">
+    Never
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_SUNSET_TO_SUNRISE" desc="In Device Settings &gt; Displays, the label of the option to set the automatic schedule of the Night Light feature to turn on at sunset and off at sunrise.">
+    Sunset to Sunrise
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_START_TIME" desc="In Device Settings &gt; Displays, the label of the start time bubble.">
+    Start time
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_STOP_TIME" desc="In Device Settings &gt; Displays, the label of the end time bubble.">
+    End time
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEXT" desc="In Device Settings &gt; Displays, text describing the Night Light feature.">
+    Make it easier to look at your screen or read in dim light
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMPERATURE_LABEL" desc="In Device Settings &gt; Displays, label of the slider that controls the color temperature of the screen when the Night Light feature is on.">
+    Color temperature
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMP_SLIDER_MAX_LABEL" desc="In Device Settings &gt; Displays, label of the maximum value settable by the color temperature slider.">
+    Warmer
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMP_SLIDER_MIN_LABEL" desc="In Device Settings &gt; Displays, label of the minimum value settable by the color temperature slider.">
+    Cooler
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_UNIFIED_DESKTOP" desc="In Device Settings &gt; Displays, the label for the control for the unified desktop feature.">
+    Allow windows to span displays
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_UNIFIED_DESKTOP_ON" desc="Label for the state for the unified desktop feature." meaning="Windows are allowed to span displays.">
+    On
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_UNIFIED_DESKTOP_OFF" desc="Label for the state for the unified desktop feature." meaning="Windows are not allowed to span displays.">
+    Off
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_TITLE" desc="In Device Settings &gt; Displays, the label for the section for changing a display's resolution.">
+    Resolution
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT" desc="In Device Settings &gt; Displays, the text describing the display's resolution.">
+    <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_BEST" desc="In Device Settings &gt; Displays, the text describing the display's resolution when it is the 'best' resolution.">
+    <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (Best)
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_NATIVE" desc="In Device Settings &gt; Displays, the text describing the display's resolution when it is the native resolution.">
+    <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (Native)
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_SUBLABEL" desc="In Device Settings &gt; Displays, the text describing the drop down menu to select the desired resolution and refresh rate of the selected external display.">
+    Determines sharpness of text and images
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_MENU_ITEM" desc="In Device Settings &gt; Displays, the text entry for a single item in the external display resolution drop down menu.">
+    <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (<ph name="REFRESH_RATE">$3<ex>60</ex></ph> Hertz)
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_INTERLACED_MENU_ITEM" desc="In Device Settings &gt; Displays, the text entry for a single item in the external display resolution drop down menu, when the display mode is interlaced (which means the display's odd and even lines are scanned alternately in two interwoven rasterized lines).">
+    <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (<ph name="REFRESH_RATE">$3<ex>60</ex></ph> Hertz) - interlaced
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ZOOM_TITLE" desc="In Device Settings &gt; Displays, the title for the section for changing the display's zoom.">
+    Display Size
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ZOOM_SUBLABEL" desc="In Device Settings &gt; Displays, the text describing the display's zoom.">
+    Make items on your screen smaller or larger
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ZOOM_VALUE" desc="The currently selected display zoom percentage.">
+    <ph name="DISPLAY_ZOOM">$1<ex>120</ex></ph>%
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ZOOM_LOGICAL_RESOLUTION_TEXT" desc="In Device Settings &gt; Displays, the text describing the display's effective resolution.">
+    Looks like <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ZOOM_LOGICAL_RESOLUTION_NATIVE_TEXT" desc="In Device Settings &gt; Displays, the text describing the display's native resolution.">
+    Looks like <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (Native)
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ZOOM_LOGICAL_RESOLUTION_DEFAULT_TEXT" desc="In Device Settings &gt; Displays, the text describing the display's effective resolution that comes due to the zoom being at the recommended level.">
+    Looks like <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (Default)
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ZOOM_SLIDER_MINIMUM" desc="In Device Settings &gt; Displays, the label of the minimum value for the display size slider">
+    Tiny
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ZOOM_SLIDER_MAXIMUM" desc="In Device Settings &gt; Displays, the label of the maximum value for the display size slider">
+    Huge
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_SCREEN" desc="In Device Settings &gt; Displays, the label for the dropdown menu for changing the dispay type.">
+    Screen
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_SCREEN_EXTENDED" desc="The label for the dropdown menu list item to set the selected screen as extended display.">
+    Extended display
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_SCREEN_PRIMARY" desc="The label for the dropdown menu list item to set the selected screen as primary display.">
+    Primary display
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ORIENTATION" desc="In Device Settings &gt; Displays, the label for the control for changing a display's orientation.">
+    Orientation
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ORIENTATION_AUTO_ROTATE" desc="In Device Settings &gt; Displays, the label for the entry that enables auto-rotation in tablet mode.">
+    Auto-rotate
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_ORIENTATION_STANDARD" desc="In Device Settings &gt; Displays, the label for standard orientation (0 rotation).">
+    0° (Default)
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_TEXT" desc="Text explaining that this setting is used to adjust the boundaries of the selected display.">
+    Adjust the boundaries of your desktop within the display
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_TITLE" desc="Title of the settings subpage which adjusts display overscan.">
+    Overscan
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_SUBTITLE" desc="Subtitle for the display overscan settings subpage.">
+    Adjust the boundaries of your display
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_INSTRUCTIONS" desc="Instructions for changing the display overscan calibration.">
+    Tap the following keys to adjust or move the cropping area
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_RESIZE" desc="Label for resizing overscan calibration.">
+    Shrink / Expand
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_POSITION" desc="Label for positioning overscan calibration.">
+    Move
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_RESET" desc="Label for resetting overscan calibration.">
+    Reset
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_TOUCH_CALIBRATION_TITLE" desc="In Device Settings &gt; Displays, the label for initiating touch calibration.">
+    Calibrate touchscreen
+  </message>
+  <message name="IDS_SETTINGS_DISPLAY_TOUCH_CALIBRATION_TEXT" desc="In Device Settings &gt; Displays, the sublabel for initiating touch calibration.">
+    Set up and adjust the accuracy of your touchscreen
+  </message>
+
+  <!-- Smart Lock Page (OS settings) -->
+  <message name="IDS_SETTINGS_EASY_UNLOCK_SECTION_TITLE" desc="The title of the Easy Unlock section on the settings page.">
+    Smart Lock
+  </message>
+  <message name="IDS_SETTINGS_EASY_UNLOCK_UNLOCK_DEVICE_ONLY" desc="This option lets the user unlock their Bravebook from their phone if they're logged in. It will unlock their Bravebook but will not sign them in.">
+    Unlock device only
+  </message>
+  <message name="IDS_SETTINGS_EASY_UNLOCK_UNLOCK_DEVICE_AND_ALLOW_SIGNIN" desc="This option lets the user unlock their Bravebook from their phone as well as log into their Bravebook without a password if their phone is nearby and unlocked.">
+    Unlock device and sign in to Brave Account
+  </message>
+
+  <!-- Fingerprint Page (OS settings) -->
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON" desc="Button that is used to add a new fingerprint.">
+    Add Fingerprint
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL" desc="Text above fingerprint list that tells users their registered fingerprints.">
+    Saved fingerprints
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE" desc="Text telling users that fingerprints might be less secure than strong PINs or passwords.">
+    Note: Your fingerprint may be less secure than a strong password or PIN.
+  </message>
+
+  <!-- Setup Pin dialog (OS settings) -->
+  <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE" desc="Message shown below the title that tells the user to enter the initial PIN.">
+    Enter your PIN
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE" desc="Message shown below the title that tells the user to confirm their initial PIN entry.">
+    Confirm your PIN
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE" desc="Title of the password prompt dialog popup.">
+    Confirm your password
+  </message>
+
+  <!-- Setup fingerprint dialog (OS settings) -->
+  <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_TITLE" desc="Title of the add fingerprint dialog popup.">
+    Set up your fingerprint
+  </message>
+  <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_ADD_ANOTHER_BUTTON" desc="Text on the button in the fingerprint setup dialog which allows users to add another fingerprint once a fingerprint has been setup.">
+    Add another
+  </message>
+  <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_READY" desc="Text in the add fingerprint dialog that confirms user's fingerprint scan was successful.">
+    Fingerprint added.
+  </message>
+  <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_LIFT_FINGER" desc="Warning text in the add fingerprint dialog to tell users to lift their finger and touch the sensor again.">
+    Lift then try again.
+  </message>
+  <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_TRY_AGAIN" desc="Warning text in the add fingerprint dialog to tell users to try again.">
+    Try again.
+  </message>
+  <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_FINGER_IMMOBILE" desc="Warning text in the add fingerprint dialog to tell users they should move their finger slightly to capture different parts of the fingerprint.">
+    Move slightly to capture a different part of the fingerprint.
+  </message>
+
+  <!-- Date/Time (OS settings) -->
+  <message name="IDS_SETTINGS_DATE_TIME" desc="Name of the settings page which displays date and time preferences.">
+    Date and time
+  </message>
+  <message name="IDS_SETTINGS_TIME_ZONE_BUTTON" desc="Label for the button that opens time zone settings page.">
+    Time zone
+  </message>
+  <message name="IDS_SETTINGS_TIME_ZONE_SUBPAGE_TITLE" desc="The title of the dialog that allows user to control different time zone settings.">
+    Time zone
+  </message>
+  <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_SET_AUTOMATICALLY" desc="The name for the radio button that turns automatic time zone detection on.">
+    Set automatically
+  </message>
+  <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_CHOOSE_FROM_LIST" desc="The name for the radio button that turns automatic time zone detection off, and allows user to select time zone from the list of all supported time zones.">
+    Choose from list
+  </message>
+  <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_DISABLED" desc="Display name for the automatic time zone detection mode which disables automatic detection.">
+    Automatic time zone detection is disabled
+  </message>
+  <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_IP_ONLY_DEFAULT" desc="Display name for the automatic time zone detection mode which enables time zone detection sending unprecise location to Brave servers. Default means that this is the default time zone detection mode.">
+    Use your IP address to determine location (default)
+  </message>
+  <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_SEND_WIFI_AP" desc="Display name for the automatic time zone detection mode which enables time zone detection sending list of visible WiFi Access Point names to Brave servers.">
+    Use only Wi-Fi to determine location
+  </message>
+  <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_SEND_ALL_INFO" desc="Display name for the automatic time zone detection mode which enables time zone detection sending list of visible WiFi and Cellular Access Point names to Brave servers.">
+    Use Wi-Fi or mobile networks to determine location
+  </message>
+  <message name="IDS_SETTINGS_TIME_ZONE" desc="Label for the picker which allows users to choose their time zone.">
+    Time zone
+  </message>
+  <message name="IDS_SETTINGS_TIME_ZONE_GEOLOCATION" desc="Label for the checkbox which enables setting the time zone automatically with the detected location of the device.">
+    Set time zone automatically using your location
+  </message>
+  <message name="IDS_SETTINGS_SELECT_TIME_ZONE_RESOLVE_METHOD" desc="Label for the drop-down menu that allows user to select specific method to automatically resolve device time zone.">
+    Time zone detection method
+  </message>
+  <message name="IDS_SETTINGS_USE_24_HOUR_CLOCK" desc="Label for the checkbox which enables a 24-hour clock (as opposed to a 12-hour clock).">
+    Use 24-hour clock
+  </message>
+  <message name="IDS_SETTINGS_SET_DATE_TIME" desc="Label for the button that shows the dialog for setting the system date and time.">
+    Set date and time
+  </message>
+
+  <!-- Device Keyboard page (OS settings) -->
+  <message name="IDS_SETTINGS_KEYBOARD_TITLE" desc="In Device Settings, the title of the keyboard settings subpage.">
+    Keyboard
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_LEFT_CTRL" desc="In Device Settings, the label and dropdown list item for the Ctrl key.">
+    Ctrl
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_LEFT_ALT" desc="In Device Settings, the label and dropdown list item for the Alt key.">
+    Alt
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_CAPS_LOCK" desc="In Device Settings, the label and dropdown list item for the Caps Lock key.">
+    Caps Lock
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_COMMAND" desc="In Device Settings, the dropdown list item for the external Command key on Apple keyboards when there's no internal keyboard on the device.">
+    Command
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_DIAMOND" desc="In Device Settings, the label for the Diamond key.">
+    Diamond
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_ESCAPE" desc="In Device Settings, the dropdown list item for the Escape key.">
+    Escape
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_BACKSPACE" desc="In Device Settings, the dropdown list item for the Backspace key.">
+    Backspace
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_ASSISTANT" desc="In Device Settings, the label and dropdown list item for the Assistant key.">
+    Assistant
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_DISABLED" desc="In Device Settings, the dropdown list item for a disabled key.">
+    Disabled
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_EXTERNAL_COMMAND" desc="In Device Settings, the dropdown list item for the external Command key on Apple keyboards.">
+    External Command
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_EXTERNAL_META" desc="In Device Settings, the dropdown list item for the external Meta key (Search key on BraveOS keyboards, and Windows key on Windows keyboards).">
+    External Meta
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_META" desc="In Device Settings, the dropdown list item for the external Meta key (Search key on BraveOS keyboards, and Windows key on Windows keyboards) when there's no internal keyboard on the device.">
+    Meta
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_SEND_FUNCTION_KEYS" desc="In Device Settings, the checkbox label for interpreting the top-row keys as function keys instead.">
+    Treat top-row keys as function keys
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_ENABLE" desc="The checkbox label for enabling keyboard auto-repeat.">
+    Enable auto-repeat
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY" desc="The label for the slider for the delay before auto-repeat begins. The delay is the amount of time a key must be held down before auto-repeating begins.">
+    Delay before repeat
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY_LONG" desc="The label for the beginning of the auto-repeat delay slider, representing a long delay.">
+    Long
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY_SHORT" desc="The label for the end of the auto-repeat delay slider, representing a short delay.">
+    Short
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_RATE" desc="The label for the slider for the auto-repeat rate. The rate is how many times a key repeats per second once auto-repeating has begun.">
+    Repeat rate
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_RATE_SLOW" desc="The label for the beginning of the auto-repeat rate slider, representing a slow repeat rate.">
+    Slow
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_FAST" desc="The label for the end of the auto-repeat rate slider, representing a fast repeat rate.">
+    Fast
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_SHOW_SHORTCUT_VIEWER" desc="The link to open the keyboard shortut viewer.">
+    View keyboard shortcuts
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_SHOW_LANGUAGE_AND_INPUT" desc="The link to navigate to the language and input method settings.">
+    Change language and input settings
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_LAUNCHER" desc="In Device Settings, the label and dropdown list item for the Search key on keyboard layouts of newer Bravebooks.">
+    Launcher
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_KEY_SEARCH" desc="In Device Settings, the label and dropdown list item for the Search key.">
+    Search
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_SEND_FUNCTION_KEYS_LAYOUT2_DESCRIPTION" desc="In Device Settings, when device uses 2017 keyboard layout, the label describing how to use the top-row keys' original actions when they are set to behave like function keys.">
+    Hold the Launcher key to switch the behavior of the top-row keys
+  </message>
+  <message name="IDS_SETTINGS_KEYBOARD_SEND_FUNCTION_KEYS_DESCRIPTION" desc="In Device Settings, the label describing how to use the top-row keys' original actions when they are set to behave like function keys.">
+    Hold the Search key to switch the behavior of the top-row keys
+  </message>
+
+  <!-- Apps Section Page -->
+  <message name="IDS_SETTINGS_APPS_TITLE" desc="The title of Apps section.">
+    Apps
+  </message>
+  <message name="IDS_SETTINGS_APPS_LINK_TEXT" desc="The label for the button which links to the App Management page.">
+    Manage your apps
+  </message>
+
+  <!-- Storage -->
+  <message name="IDS_SETTINGS_STORAGE_TITLE" desc="In Device Settings, the title for storage management.">
+    Storage management
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_ITEM_IN_USE" desc="In Device Settings &gt; Storage, label for the used storage size of Chrome OS internal storage.">
+    In use
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_ITEM_AVAILABLE" desc="In Device Settings &gt; Storage, label for the available storage size of Chrome OS internal storage.">
+    Available
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_ITEM_MY_FILES" desc="In Device Settings &gt; Storage, label for the size of My files root.">
+    My files
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_ITEM_BROWSING_DATA" desc="In Device Settings &gt; Storage, label for the size of browsing data.">
+    Browsing data
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_ITEM_APPS" desc="In Device Settings &gt; Storage, label for the total size of Android apps and web store apps and extensions.">
+    Apps and extensions
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_ITEM_CROSTINI" desc="In Device Settings &gt; Storage, label for the total size of Crostini VMs, apps and cache.">
+    Linux (Beta) storage
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_ITEM_OTHER_USERS" desc="In Device Settings &gt; Storage, label for the total size of other users' data directories.">
+    Other users
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_SIZE_CALCULATING" desc="In Device Settings &gt; Storage, label for storage item's size indicating the size is being calculated.">
+    Calculating...
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_SIZE_UNKNOWN" desc="In Device Settings &gt; Storage, label for storage item's size indicating the size is unknown">
+    Unknown
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_SPACE_LOW_MESSAGE_TITLE" desc="Title of a warning message indicating device's available disk space is low.">
+    Device is low on space
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_SPACE_LOW_MESSAGE_LINE_1" desc="The first paragraph of a warning message indicating device's available disk space is low.">
+    To free up space, delete files from device storage.
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_SPACE_LOW_MESSAGE_LINE_2" desc="The second paragraph of a warning message indicating device's available disk space is low.">
+    If space isn’t made available, users and data may be automatically removed.
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_SPACE_CRITICALLY_LOW_MESSAGE_TITLE" desc="Title of a warning message indicating device's available disk space is critically low.">
+    Device space critically low
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_SPACE_CRITICALLY_LOW_MESSAGE_LINE_1" desc="The first paragraph of a warning message indicating device's available disk space is critically low.">
+    Free up at least 512 MB of space or your device will become unresponsive. To free up space, delete files from device storage.
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_SPACE_CRITICALLY_LOW_MESSAGE_LINE_2" desc="The second paragraph of a warning message indicating device's available disk space is critically low.">
+    If you don’t free up space, users and data may be automatically removed.
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_EXTERNAL" desc="In Device Settings &gt; Storage, label for the subpage for setting preferences for external storage.">
+    External storage preferences
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_ANDROID_APPS_ACCESS_EXTERNAL_DRIVES_NOTE" desc="Label for the additional note for the subpage for setting preferences for external storage.">
+    Apps from Google Play may require full file system access to read and write files on external storage devices. Files and folders created on the device are visible to anyone who uses the external drive. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_EXTERNAL_STORAGE_EMPTY_LIST_HEADER" desc="Header of the list of external storage devices for the subpage for setting preferences for external storage. This is shown when the list is empty.">
+    Available devices will appear here.
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_EXTERNAL_STORAGE_LIST_HEADER" desc="Header of the list of external storage devices for the subpage for setting preferences for external storage. This is shown when the list is not empty.">
+    Available devices
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_OVERVIEW_ARIA_LABEL" desc="The label to be read aloud by BraveVox to describe the storage usage progress bar on the Storage page">
+    Storage Usage Overview
+  </message>
+  <message name="IDS_SETTINGS_STORAGE_ITEM_SYSTEM" desc="In Device Settings &gt; Storage, label for the total system size, difference between the size of the filesystem and the size of all items listed on the storage page.">
+    System
+  </message>
 </if>
 </grit-part>
diff --git a/app/printing_strings.grdp b/app/printing_strings.grdp
index 15375c0ea0bb..b24dbc7f0295 100644
--- a/app/printing_strings.grdp
+++ b/app/printing_strings.grdp
@@ -108,9 +108,6 @@
       Save to Google Drive
     </message>
     <message name="IDS_PRINT_PREVIEW_SUMMARY_FORMAT_SHORT" desc="Print summary, explaining to the user how many pages will be printed.">
-      Total: <ph name="NUMBER_OF_SHEETS">$1<ex>10</ex></ph> <ph name="SHEETS_LABEL">$2<ex>sheets of paper</ex></ph>
-    </message>
-    <message name="IDS_PRINT_PREVIEW_NEW_SUMMARY_FORMAT_SHORT" desc="Print summary, explaining to the user how many pages will be printed. Same use as above, but omits the 'Total: '.">
       <ph name="NUMBER_OF_SHEETS">$1<ex>10</ex></ph> <ph name="SHEETS_LABEL">$2<ex>sheets of paper</ex></ph>
     </message>
     <message name="IDS_PRINT_PREVIEW_SHEETS_LABEL_PLURAL" desc="Label shown in the print preview summary.">
@@ -132,7 +129,7 @@
       Out of bounds page reference, limit is <ph name="MAXIMUM_PAGE">$1<ex>1</ex></ph>
     </message>
     <message name="IDS_PRINT_PREVIEW_COPIES_INSTRUCTION" desc="Instruction shown when the user enters an invalid number of copies.">
-      Use a number to indicate how many copies to print (1 to 999).
+      Use a number to indicate how many copies to print (1 to <ph name="MAX_COPIES">$1<ex>1</ex></ph>).
     </message>
     <message name="IDS_PRINT_PREVIEW_SCALING_INSTRUCTION" desc="Instruction shown when the user enters an invalid scaling value.">
       Scale amount must be a number between 10 and 200.
diff --git a/app/settings_brave_strings.grdp b/app/settings_brave_strings.grdp
index cc9175b58c06..b0772a5224dc 100644
--- a/app/settings_brave_strings.grdp
+++ b/app/settings_brave_strings.grdp
@@ -17,7 +17,7 @@
       Updating Brave (<ph name="PROGRESS_PERCENT">$1<ex>90%</ex></ph>)
     </message>
     <message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated Brave">
-      Nearly up to date! Relaunch Brave to finish updating.
+      Nearly up to date! Relaunch Brave to finish updating. Private windows won't reopen.
     </message>
     <message name="IDS_SETTINGS_UPGRADE_UP_TO_DATE" desc="Status label: Already up to date (Brave)">
       Brave is up to date
@@ -88,6 +88,26 @@
     By turning this off, you can sign in to Brave sites like Gmail without signing in to Brave
   </message>
 
+  <!-- Safety check -->
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_BEFORE" desc="This text describes what the safety check is. (It's an area of the Settings page where users can quickly check whether their safety-related settings are fully protecting them.)">
+    Brave can help keep you safe from data breaches, bad extensions, and more
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_FAILED_OFFLINE" desc="This text describes that Brave cannot check for updates because there currently is no internet connection.">
+    Brave can't check for updates. Try checking your internet connection.
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_FAILED" desc="This text describes that Brave cannot update due to an unknown error.">
+    Brave didn't update, something went wrong. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Fix Brave update problems and failed updates.<ph name="END_LINK">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_SIGNED_OUT" desc="This text points out that the password check can only run when the user is signed in.">
+    Brave can't check your passwords because you're not signed in
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DISABLED" desc="This text points out that Safe Browsing is disabled and that the user is not protected.">
+    Safe Browsing is off. Brave recommends turning it on.
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_ERROR" desc="This text describes that safety check could not check extensions for an unkown reason.">
+    Brave can't check your extensions. Try again later.
+  </message>
+
   <!-- Profiles Page -->
   <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_SINGULAR" desc="Warning message displayed in the Sign out of Brave dialog that indicates profile browsing data will be removed from the device.">
     This will delete 1 item from this device. To retrieve your data later, sign in to Brave as <ph name="USER_EMAIL">$1<ex>foo@example.com</ex></ph>.
@@ -120,9 +140,6 @@
   <message name="IDS_SETTINGS_SYNC_SIGN_IN_PROMPT_WITH_NO_ACCOUNT" desc="The text displayed to prompt users to sign in to Brave.">
     Sign in to sync and personalize Brave across your devices
   </message>
-  <message name="IDS_SETTINGS_SYNC_SIGN_IN_PROMPT_WITH_ACCOUNT" desc="The text displayed to prompt users to enable sync for an account that is alredy present in Brave.">
-    Sync and personalize Brave across your devices
-  </message>
 
   <!-- Languages Page -->
   <!-- Chrome OS string is in settings_strings.grdp. -->
diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp
index b78b1815719a..4bc9d2b03571 100644
--- a/app/settings_strings.grdp
+++ b/app/settings_strings.grdp
@@ -18,128 +18,11 @@
   <message name="IDS_SETTINGS_MORE_ACTIONS" desc="Tooltip text (shows on hover or for screenreaders) for a button that shows a menu with more actions when clicked or tapped">
     More actions
   </message>
-  <message name="IDS_SETTINGS_TURN_ON" desc="Label for turn on buttons.">
-    Turn on
-  </message>
 
   <!-- About Page -->
   <message name="IDS_SETTINGS_ABOUT_PAGE_BROWSER_VERSION" desc="The text label describing the version of the browser, example: Version 57.0.2937.0 (Developer Build) unknown (64-bit)">
     Version <ph name="PRODUCT_VERSION">$1<ex>15.0.865.0</ex></ph> (<ph name="PRODUCT_CHANNEL">$2<ex>Developer Build</ex></ph>) <ph name="PRODUCT_MODIFIER">$3</ph> <ph name="PRODUCT_VERSION_BITS">$4</ph>
   </message>
-  <if expr="chromeos">
-    <message name="IDS_SETTINGS_ABOUT_PAGE_DETAILED_BUILD_INFO" desc="Label describing the section that shows detailed information about the current Brave build.">
-      Additional details
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_CHANNEL" desc="The channel label under Detailed build info.">
-      Channel
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_CHECK_FOR_UPDATES" desc="The button label to check for updates and apply (download and install) if found">
-      Check for updates
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_STABLE" desc="The stable label in the message about current channel.">
-      stable
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_BETA" desc="The beta label in the message about current channel.">
-      beta
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_CANARY" desc="The canary label in the message about current channel.">
-      canary
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL_DEV" desc="The dev label in the message about current channel.">
-      dev
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_CURRENT_CHANNEL" desc="The message about current channel.">
-      Currently on <ph name="CHANNEL_NAME">$1<ex>stable</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_END_OF_LIFE_TITLE" desc="Title used for End of Life section on the About Page.">
-      Update schedule
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_END_OF_LIFE_MESSAGE" desc="Message used for End of Life section on the About Page.">
-      This device will get automatic software and security updates until <ph name="MONTH_AND_YEAR">$1<ex>September 2020</ex></ph>. &lt;a target="_blank" href="<ph name="URL">$2<ex>https://google.com/</ex></ph>"&gt;Learn more&lt;/a&gt;
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_LAST_UPDATE_MESSAGE" desc="Message shown on the top level about page to inform the user that this device will no longer receive latest software updates.">
-      This is the last automatic software and security update for this <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>. To get future updates, upgrade to a newer model. &lt;a target="_blank" href="<ph name="URL">$2<ex>https://google.com/</ex></ph>"&gt;Learn more&lt;/a&gt;
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH" desc="The label for the relaunch button that relaunches the browser once update is complete">
-      Restart
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH_AND_POWERWASH" desc="The label for the button that relaunches and powerwashes the browser once update is complete">
-      Restart and reset
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_TPM_FIRMWARE_UPDATE_TITLE" desc="Title for the line item on the about page that allows the user to trigger a device hardware reset and request installation of a TPM firmware update.">
-      Powerwash for added security
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_TPM_FIRMWARE_UPDATE_DESCRIPTION" desc="Descriptive text shown alongside the line item on the about page that allows the user to trigger a device hardware reset and request installation of a TPM firmware update.">
-      This upgrade resets your Bravebook and removes current user data.
-    </message>
-    <message name="IDS_SETTINGS_UPGRADE_UPDATING" desc="Status label: Updating BraveOS or BraveOS">
-      Updating your device
-    </message>
-    <message name="IDS_SETTINGS_UPGRADE_UPDATING_PERCENT" desc="Status label: Updating BraveOS or BraveOS (90%)">
-      Updating your device (<ph name="PROGRESS_PERCENT">$1<ex>90%</ex></ph>)
-    </message>
-    <message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated BraveOS/BraveOS">
-      Nearly up to date! Restart your device to finish updating.
-    </message>
-    <message name="IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH" desc="Status label: Updating BraveOS/BraveOS to a specified channel">
-      Updating your device to <ph name="CHANNEL_NAME">$1<ex>stable</ex></ph> channel (<ph name="PROGRESS_PERCENT">$2<ex>90%</ex></ph>)
-    </message>
-    <message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH" desc="Status label: Channel was successfully switched on BraveOS/BraveOS">
-      Channel changed. Restart your device to apply changes.
-    </message>
-    <message name="IDS_SETTINGS_UPGRADE_ROLLBACK_IN_PROGRESS" desc="Status label: Rolling back BraveOS or Chrome OS.">
-      Your administrator is rolling back this device (<ph name="PROGRESS_PERCENT">$1<ex>90%</ex></ph>)
-    </message>
-    <message name="IDS_SETTINGS_UPGRADE_ROLLBACK_SUCCESS" desc="Status label: Successfully rolled back Chrome OS. All data on the device will be deleted during the next reboot.">
-      Your administrator rolled back this device. Please save important files, then restart. All data on the device will be deleted.
-    </message>
-    <message name="IDS_SETTINGS_UPGRADE_UP_TO_DATE" desc="Status label: Already up to date (BraveOS/BraveOS)">
-      Your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> is up to date
-    </message>
-
-    <!-- About Page: Channel switcher dialog -->
-    <message name="IDS_SETTINGS_ABOUT_PAGE_CHANGE_CHANNEL" desc="Button label for channel switch.">
-      Change channel
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_CHANGE_CHANNEL_AND_POWERWASH" desc="Button label for channel switch and powerwash.">
-      Change channel and Powerwash
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_MESSAGE" desc="Message that notifies user that channel change will be applied later.">
-      You are changing to a channel with an older version of <ph name="PRODUCT_NAME">$1<ex>Chrome OS</ex></ph>. The channel change will be applied when the channel version matches the version currently installed on your device.
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_DELAYED_WARNING_TITLE" desc="Title for the message that the channel change will be applied later.">
-      Channel change will be applied later
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_MESSAGE" desc="Message that warns user about powerwash.">
-      This will remove all local users, files, data, and other settings after your next restart. All users will need to sign in again.
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_POWERWASH_WARNING_TITLE" desc="The title for the message that warns user about powerwash.">
-      Powerwash required on next reboot
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_MESSAGE" desc="Warning about switching to developer (unstable) channel.">
-      You are updating to an unstable version of <ph name="PRODUCT_NAME">$1<ex>Chrome OS</ex></ph> which contains features that are in progress. Crashes and unexpected bugs will occur. Please proceed with caution.
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_TITLE" desc="The title of the warning about switching to developer (unstable) channel.">
-      Warning: you are switching to developer channel
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_STABLE" desc="The stable option in the channel select.">
-      Stable
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_BETA" desc="The beta option in the channel select.">
-      Beta
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_DEV" desc="The development option in the channel select.">
-      Developer - unstable
-    </message>
-
-    <!-- About Page: Update warning dialog -->
-    <message name="IDS_SETTINGS_ABOUT_PAGE_UPDATE_WARNING_MESSAGE" desc="Warning about update over mobile data, specifying the size in megabytes.">
-      Update will be downloaded using <ph name="UPDATE_SIZE_MB">$1<ex>0</ex></ph> MB of mobile data. Would you like to continue?
-    </message>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_UPDATE_WARNING_TITLE" desc="The title of the warning about update over mobile data.">
-      Download update using mobile data
-    </message>
-  </if>
   <if expr="not chromeos">
     <message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH" desc="The label for the relaunch button that relaunches the browser once update is complete">
       Relaunch
@@ -150,15 +33,6 @@
       Report an issue
     </message>
   </if>
-    <message name="IDS_SETTINGS_ABOUT_PAGE_RELEASE_NOTES" desc="Warning that internet connection is required to display Chrome OS release notes.">
-      Internet connection required
-  </message>
-  <message name="IDS_SETTINGS_ABOUT_PAGE_SHOW_RELEASE_NOTES" desc="Text of the button which shows user the release notes.">
-    See what's new
-  </message>
-  <message name="IDS_SETTINGS_ABOUT_UPGRADE_CHECK_STARTED" desc="Status label: About to start checking for updates">
-    Checking for updates
-  </message>
   <if expr="is_macosx">
     <message name="IDS_ABOUT_CHROME_AUTOUPDATE_ALL" desc="The 'Automatically update Brave for all users.' button in the About window.  Mac-only.">
       Automatically update Brave for all users
@@ -169,90 +43,6 @@
   </if>
 
   <!-- Accessibility Page -->
-  <message name="IDS_SETTINGS_CAPTIONS" desc="Name of the settings page which displays caption preferences.">
-    Captions
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_SETTINGS" desc="Name of settings section of the caption settings page.">
-    Settings
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_PREVIEW" desc="Name of preview section of the caption settings page.">
-    Preview
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SIZE" desc="Name of the caption text size preference.">
-    Text size
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_TEXT_FONT" desc="Name of the caption text font preference.">
-    Text font
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_TEXT_COLOR" desc="Name of the caption text color preference.">
-    Text color
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_TEXT_OPACITY" desc="Name of the caption text opacity preference.">
-    Text opacity
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_BACKGROUND_OPACITY" desc="Name of the caption background opacity preference.">
-    Background opacity
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_OPACITY_OPAQUE" desc="Name of the opaque opacity preference.">
-    Opaque
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_OPACITY_SEMI_TRANSPARENT" desc="Name of the semi-transparent opacity preference.">
-    Semi-transparent
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_OPACITY_TRANSPARENT" desc="Name of the transparent opacity preference.">
-    Transparent
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW" desc="Name of the caption text shadow preference.">
-    Text shadow
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_NONE" desc="Name of the None option for the caption text shadow.">
-    None
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_RAISED" desc="Name of the Raised option for the caption text shadow.">
-    Raised
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_DEPRESSED" desc="Name of the Depressed option for the caption text shadow.">
-    Depressed
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_UNIFORM" desc="Name of the Uniform option for the caption text shadow.">
-    Uniform
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_DROP_SHADOW" desc="Name of the Drop shadow option for the caption text shadow.">
-    Drop shadow
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_BACKGROUND_COLOR" desc="Name of the caption background color preference.">
-    Background color
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_COLOR_BLACK" desc="Name of the Black color for the caption text or background.">
-    Black
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_COLOR_WHITE" desc="Name of the White color for the caption text or background.">
-    White
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_COLOR_RED" desc="Name of the Red color for the caption text or background.">
-    Red
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_COLOR_GREEN" desc="Name of the Green color for the caption text or background.">
-    Green
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_COLOR_BLUE" desc="Name of the Blue color for the caption text or background.">
-    Blue
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_COLOR_YELLOW" desc="Name of the Yellow color for the caption text or background.">
-    Yellow
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_COLOR_CYAN" desc="Name of the Cyan color for the caption text or background.">
-    Cyan
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_COLOR_MAGENTA" desc="Name of the Magenta color for the caption text or background.">
-    Magenta
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_DEFAULT_SETTING" desc="Name of the default setting for the caption text.">
-    Default
-  </message>
-  <message name="IDS_SETTINGS_CAPTIONS_ENABLE_LIVE_CAPTION" desc="Name of the setting to enable Live Caption.">
-    Enable Live Caption
-  </message>
   <message name="IDS_SETTINGS_ACCESSIBILITY" desc="Name of the settings page which displays accessibility preferences.">
     Accessibility
   </message>
@@ -271,473 +61,13 @@
   <message name="IDS_SETTINGS_ACCESSIBLE_IMAGE_LABELS_SUBTITLE" desc="Subtitle for screen reader image labels feature.">
     If an image doesn’t have a useful description, Brave will try to provide one for you. To create descriptions, images are sent to Brave.
   </message>
+  <message name="IDS_SETTINGS_CAPTIONS_ENABLE_LIVE_CAPTION_TITLE" desc="Name of the setting to enable Live Caption.">
+    Live caption
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_ENABLE_LIVE_CAPTION_SUBTITLE" desc="Subtitle of the setting to enable Live Caption.">
+    Live caption detects speech in media and automatically generates captions for all media playing in Brave.
+  </message>
   <if expr="chromeos">
-    <message name="IDS_SETTINGS_OPTIONS_IN_MENU_LABEL" desc="Label for checkbox which enables showing accessibility options in the system menu.">
-      Always show accessibility options in the system menu
-    </message>
-    <message name="IDS_SETTINGS_MANAGE_TTS_SETTINGS" desc="Link to manage text-to-speech settings">
-      Text-to-Speech voice settings
-    </message>
-    <message name="IDS_SETTINGS_TTS_LINK_DESCRIPTION" desc="Description of link to manage text-to-speech settings">
-      Select and customize text-to-speech voices
-    </message>
-    <message name="IDS_SETTINGS_MANAGE_SWITCH_ACCESS_SETTINGS" desc="Title of the page to manage Switch Access settings.">
-      Switch Access settings
-    </message>
-    <message name="IDS_SETTINGS_SWITCH_ASSIGNMENT_HEADING" desc="Heading for the settings section for Switch Access to assign switches to actions">
-      Switch action assignment
-    </message>
-    <message name="IDS_SETTINGS_SWITCH_ASSIGN_OPTION_SPACE" desc="Label for the option to assign the spacebar as a switch.">
-      Space
-    </message>
-    <message name="IDS_SETTINGS_SWITCH_ASSIGN_OPTION_ENTER" desc="Label for the option to assign the enter key as a switch.">
-      Enter
-    </message>
-    <message name="IDS_SETTINGS_SWITCH_ASSIGN_OPTION_NONE" desc="Label for the option to have no switch assigned to an action.">
-      None
-    </message>
-    <message name="IDS_SETTINGS_ASSIGN_SELECT_SWITCH_LABEL" desc="Label for the setting to assign a switch to the action 'Select', which selects the currently focused element and begins an interaction (which varies depending on the element/other settings).">
-      Select
-    </message>
-    <message name="IDS_SETTINGS_ASSIGN_NEXT_SWITCH_LABEL" desc="Label for the setting to assign a switch to the action 'Next', which moves focus to the next element.">
-      Next
-    </message>
-    <message name="IDS_SETTINGS_ASSIGN_PREVIOUS_SWITCH_LABEL" desc="Label for the setting to assign a switch to the action 'Previous', which moves focus to the previous element.">
-      Previous
-    </message>
-    <message name="IDS_SETTINGS_SWITCH_ACCESS_AUTO_SCAN_HEADING" desc="Heading for the settings section containing preferences around Switch Access automatically scanning between elements.">
-      Auto-scan
-    </message>
-    <message name="IDS_SETTINGS_SWITCH_ACCESS_AUTO_SCAN_LABEL" desc="Label for the toggle which enables automatic scanning between elements in Switch Access.">
-      Enable auto-scan
-    </message>
-    <message name="IDS_SETTINGS_SWITCH_ACCESS_AUTO_SCAN_SPEED_LABEL" desc="Label for slider which sets the time interval for Switch Access to automatically scan to the next element.">
-      Scanning speed
-    </message>
-    <message name="IDS_SETTINGS_SWITCH_ACCESS_AUTO_SCAN_KEYBOARD_SPEED_LABEL" desc="Label for slider which sets the time interval for Switch Access to automatically scan to the next element while navigating in the keyboard. Switch Access is an alternative input method designed for users with limited mobility, where the user has as little as one switch (for example, a button) to control the computer.">
-      Keyboard scanning speed
-    </message>
-    <message name="IDS_SETTINGS_DURATION_IN_SECONDS" desc="A duration in seconds. Should be short.">
-      <ph name="DURATION">$1<ex>1.5</ex></ph>s
-    </message>
-    <message name="IDS_SETTINGS_LARGE_MOUSE_CURSOR_LABEL" desc="Label for checkbox which enables showing a larger mouse cursor than normal.">
-      Show large mouse cursor
-    </message>
-    <message name="IDS_SETTINGS_LARGE_MOUSE_CURSOR_SIZE_LABEL" desc="Label for a slider which changes the size of large mouse cursor.">
-      Adjust cursor size
-    </message>
-    <message name="IDS_SETTINGS_LARGE_MOUSE_CURSOR_SIZE_DEFAULT_LABEL" desc="Label in the slider which indicates that this side makes the cursor to its default size.">
-      Default
-    </message>
-    <message name="IDS_SETTINGS_LARGE_MOUSE_CURSOR_SIZE_LARGE_LABEL" desc="Label in the slider which indicates that this side makes the cursor large.">
-      Large
-    </message>
-    <message name="IDS_SETTINGS_HIGH_CONTRAST_LABEL" desc="Label for checkbox which enables high-contrast UI.">
-      Use high contrast mode
-    </message>
-    <message name="IDS_SETTINGS_STICKY_KEYS_LABEL" desc="Label for checkbox which enables sticky keys, with an explanation of the term 'sticky keys'.">
-      Enable sticky keys (to perform keyboard shortcuts by typing them sequentially)
-    </message>
-    <message name="IDS_SETTINGS_CHROMEVOX_LABEL" desc="Label for checkbox which enables BraveVox, with a description of what BraveVox is.">
-      Enable BraveVox (spoken feedback)
-    </message>
-    <message name="IDS_SETTINGS_CHROMEVOX_OPTIONS_LABEL" desc="Label for button to open BraveVox options.">
-      Open BraveVox settings
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_LABEL" desc="Label for checkbox which enables the fullscreen magnifier">
-      Enable fullscreen magnifier
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_LABEL" desc="Label for dropdown menu which contains zoom levels for the fullscreen magnifier">
-      Fullscreen zoom level:
-    </message>
-    <message name="IDS_SETTINGS_DOCKED_MAGNIFIER_LABEL" desc="Label for checkbox which enables the docked magnifier">
-      Enable docked magnifier
-    </message>
-    <message name="IDS_SETTINGS_DOCKED_MAGNIFIER_ZOOM_LABEL" desc="Label for dropdown menu which contains zoom levels for the docked magnifier">
-      Docked zoom level:
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_2_X" desc="Desription of a 2x zoom level">
-      2x
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_4_X" desc="Desription of a 4x zoom level">
-      4x
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_6_X" desc="Desription of a 6x zoom level">
-      6x
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_8_X" desc="Desription of a 8x zoom level">
-      8x
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_10_X" desc="Desription of a 10x zoom level">
-      10x
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_12_X" desc="Desription of a 12x zoom level">
-      12x
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_14_X" desc="Desription of a 14x zoom level">
-      14x
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_16_X" desc="Desription of a 16x zoom level">
-      16x
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_18_X" desc="Desription of a 18x zoom level">
-      18x
-    </message>
-    <message name="IDS_SETTINGS_SCREEN_MAGNIFIER_ZOOM_20_X" desc="Desription of a 20x zoom level">
-      20x
-    </message>
-    <message name="IDS_SETTINGS_TAP_DRAGGING_LABEL" desc="Label for checkbox which enables tap dragging.">
-      Enable tap dragging
-    </message>
-    <message name="IDS_SETTINGS_CLICK_ON_STOP_LABEL" desc="Label for checkbox which enables automatically do a mouse action when the mouse cursor stops.">
-      Automatically click when the cursor stops
-    </message>
-    <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_LABEL" desc="Label for dropdown menu which contains various time delays for mouse action.">
-      Delay before click
-    </message>
-    <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_EXTREMELY_SHORT" desc="Description of an extremely short delay before mouse action, at .6 seconds.">
-      0.6 seconds
-    </message>
-    <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_SHORT" desc="Description of a very short delay before mouse action, at .8 seconds.">
-      0.8 seconds
-    </message>
-    <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_SHORT" desc="Description of a short delay before mouse action, at 1 second.">
-      1 second
-    </message>
-    <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_LONG" desc="Description of a long delay before mouse action, at 2 seconds.">
-      2 seconds
-    </message>
-    <message name="IDS_SETTINGS_DELAY_BEFORE_CLICK_VERY_LONG" desc="Description of a very long delay before mouse action, at 4 seconds.">
-      4 seconds
-    </message>
-    <message name="IDS_SETTINGS_AUTOCLICK_REVERT_TO_LEFT_CLICK" desc="Description of a checkbox that gives the option to return to the default left click action after taking another action.">
-      Revert to left click after action
-    </message>
-    <message name="IDS_SETTINGS_AUTOCLICK_STABILIZE_CURSOR_POSITION" desc="Description of a checkbox that gives the option to turn on cursor movmeent stablization.">
-      Stabilize click location
-    </message>
-    <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_LABEL" desc="Label for a dropdown menu which that has options for how much mouse movement can occur before a new autoclick is initiated.">
-      Movement threshold
-    </message>
-    <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_EXTRA_SMALL" desc="Description of an extra small mouse movement threshold for autoclick mouse movements.">
-      Extra small
-    </message>
-    <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_SMALL" desc="Description of a small mouse movement threshold for autoclick mouse movements">
-      Small
-    </message>
-    <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_DEFAULT" desc="Description of the default mouse movement threshold for autoclick mouse movements">
-      Default
-    </message>
-    <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_LARGE" desc="Description of a large mouse movement threshold for autoclick mouse movements">
-      Large
-    </message>
-    <message name="IDS_SETTINGS_AUTOCLICK_MOVEMENT_THRESHOLD_EXTRA_LARGE" desc="Description of an extra large mouse movement threshold for autoclick mouse movements">
-      Extra large
-    </message>
-    <message name="IDS_SETTINGS_ON_SCREEN_KEYBOARD_LABEL" desc="Label for checkbox which enables an on-screen keyboard.">
-      Enable on-screen keyboard
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_DICTATION_DESCRIPTION" desc="Description explaining that Dictation sends audio data to Brave for transcription">
-      Send your voice to Brave to allow dictation into any text field.
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_DICTATION_LABEL" desc="Label for checkbox which enables the ability to speak into text fields">
-      Enable dictation (speak to type)
-    </message>
-    <message name="IDS_SETTINGS_MONO_AUDIO_LABEL" desc="Label for checkbox which enables mono audio output.">
-      Play the same audio through all speakers (mono audio)
-    </message>
-    <message name="IDS_SETTINGS_STARTUP_SOUND_LABEL" desc="Label for checkbox which enables startup sound.">
-      Play sound on startup
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_EXPLANATION" desc="Informational message at the top of the accessibility section of the settings page about enabling additional accessibility-related features.">
-      Enable accessibility features to make your device easier to use. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_ADDITIONAL_FEATURES_TITLE" desc="In the settings tab, the title of a link that adds additional accessibility features not found in the built-in settings.">
-      Add additional features
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_APPEARANCE_SETTINGS_DESCRIPTION" desc="In the settings tab, an explanation that the appearance settings allows you to change the size of text on the screen.">
-      Customize your text size
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_APPEARANCE_SETTINGS_TITLE" desc="In the settings tab, the title of a link to open appearance settings.">
-      Open appearance settings
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_AUDIO_AND_CAPTIONS_HEADING" desc="In the settings tab, the heading for the section on audio / sound and caption settings.">
-      Audio and captions
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_CARET_HIGHLIGHT_DESCRIPTION" desc="In the settings tab, the text next to the checkbox to highlight the caret (the text insertion point) to make it easier to see.">
-      Highlight the text caret when it appears or moves
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_CURSOR_HIGHLIGHT_DESCRIPTION" desc="In the settings tab, the text next to the checkbox to highlight the mouse cursor when it's moving to make it easier to see.">
-      Highlight the mouse cursor when it's moving
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_DISPLAY_HEADING" desc="In the settings tab, the heading for accessibility features related to the computer's display.">
-      Display
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_DISPLAY_SETTINGS_TITLE" desc="In the settings tab, the title of a link to open display settings.">
-      Open display device settings
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_DISPLAY_SETTINGS_DESCRIPTION" desc="In the settings tab, an explanation that the display settings have options to adjust the screen resolution.">
-      Allows you to adjust your screen resolution
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION" desc="In the settings tab, the text next to the checkbox to highlight the focused object to make it easier to see.">
-      Highlight the object with keyboard focus when it changes
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_KEYBOARD_AND_TEXT_INPUT_HEADING" desc="In the settings tab, the heading above settings related to the keyboard and other text input.">
-      Keyboard and text input
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_KEYBOARD_SETTINGS_TITLE" desc="In the settings tab, the title of a link to open keyboard settings.">
-      Open keyboard device settings
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_KEYBOARD_SETTINGS_DESCRIPTION" desc="In the settings tab, an explanation that the keyboard settings let you adjust the rate at which keys automatically repeat when held down, automatic prediction of words, and more.">
-      Allows you to adjust your keyboard repeat rate, word prediction, and more
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_MANAGE_ACCESSIBILITY_FEATURES" desc="In the settings tab, the title of a link that opens a screen allowing the user to change accessibility features.">
-      Manage accessibility features
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_MOUSE_AND_TOUCHPAD_HEADING" desc="In the settings tab, the heading for the section on mouse and touchpad settings.">
-      Mouse and touchpad
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_MOUSE_SETTINGS_TITLE" desc="In the settings tab, the title of a link to open mouse and touchpad settings.">
-      Open mouse and touchpad device settings
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_MOUSE_SETTINGS_DESCRIPTION" desc="In the settings tab, an explanation that the mouse and touchpad settings allows you to turn the tap-to-click and tap dragging features on and off.">
-      Allows you to enable/disable tap-to-click and tap dragging
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_TITLE" desc="In the settings tab, the text next to the checkbox to enable an option to hold a key and click to speak any on-screen text out loud.">
-      Enable select-to-speak
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_DISABLED_DESCRIPTION" desc="In the settings tab, the description of a feature that will read on-screen text out loud. This text is shown when that feature is disabled.">
-      Hear text read aloud
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_DESCRIPTION" desc="For devices with a hardware keyboard. In the settings tab, the description of an option to hold a key and click or drag a box with the mouse to speak any on-screen text out loud.">
-      Highlight what you want to hear, then press Search + S. You can also press and hold the Search key, or tap the Select-to-Speak icon near your profile image to make a selection.
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_DESCRIPTION_WITHOUT_KEYBOARD" desc="For devices that do not have a hardware keyboard. In the settings tab, the description of an option to highlight text to be read out loud.">
-      Tap the Select-to-Speak icon near your profile image, then select what you want to hear.
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_OPTIONS_LABEL" desc="In the settings tab, the label for the button that opens the Options page for the Select-to-Speak feature.">
-      Open select-to-speak settings
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION" desc="In the settings tab, the text next to the checkbox to enable Switch Access (for users with limited motor control).">
-      Switch Access (control the computer with just one or two switches)
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_OPTIONS_LABEL" desc="In the settings tab, the label for the button that opens the Options page for the Switch Access feature.">
-      Switch Access options
-    </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_TEXT_TO_SPEECH_HEADING" desc="In the settings tab, the heading for accessibility features that enable the computer to speak text from the computer screen.">
-      Text-to-Speech
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_VOICES" desc="Heading describing a collection of listboxes on the text-to-speech settings page. Each listbox is associated with a language, and contains all possible voices for that language">
-      Preferred Voices
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_NO_VOICES_MESSAGE" desc="Message when no text-to-speech voices are found on the Chrome OS device.">
-      No voices found
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_MORE_LANGUAGES" desc="Label for a toggle button letting users know they can pick default voices for more languages which are not shown by default">
-      More languages
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PROPERTIES" desc="Heading describing a collection of input controls for a section of text-to-speech settings on speech properties, including speech pitch and rate">
-      Speech Properties
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_RATE" desc="The rate (speed) of speech in text-to-speech settings.">
-      Rate
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_RATE_MINIMUM_LABEL" desc="A label for the minimum side of a slider allowing users to change their text-to-speech speech rate">
-      Slowest
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_RATE_MAXIMUM_LABEL" desc="A label for the maximum side of a slider allowing users to change their text-to-speech speech rate">
-      Fastest
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PITCH" desc="The pitch of speech in text-to-speech settings.">
-      Pitch
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PITCH_MINIMUM_LABEL" desc="A label for the minimum side of a slider allowing users to change their text-to-speech speech pitch">
-      Lowest
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PITCH_MAXIMUM_LABEL" desc="A label for the maximum side of a slider allowing users to change their text-to-speech speech pitch">
-      Highest
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_VOLUME" desc="The volume of speech compared to system volume in text-to-speech settings.">
-      Volume
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_VOLUME_MINIMUM_LABEL" desc="A label for the minimum side of a slider allowing users to change their text-to-speech speech volume">
-      Quietest
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_VOLUME_MAXIMUM_LABEL" desc="A label for the maximum side of a slider allowing users to change their text-to-speech speech volume">
-      Loudest
-    </message>
-    <message name="IDS_SETTINGS_PERCENTAGE" desc="A number displayed as a percentage">
-      <ph name="PERCENTAGE">$1<ex>120</ex></ph>%
-    </message>
-    <message name="IDS_SETTINGS_DEFAULT_PERCENTAGE" desc="A number displayed as a percentage, which is the normal or default.">
-      <ph name="PERCENTAGE">$1<ex>120</ex></ph>% (default)
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PREVIEW_HEADING" desc="The heading for a section of the text-to-speech settings page where a user can preview text to speech">
-      Preview
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PREVIEW_INPUT_LABEL" desc="The label for sample input for a section of the text-to-speech settings page where a user can preview text to speech.">
-      Text to preview
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PREVIEW_INPUT" desc="The sample input for a section of the text-to-speech settings page where a user can preview text to speech. Users will hear this read aloud.">
-      Hi there! I'm your text-to-speech voice.
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PREVIEW_VOICE" desc="Label for a dropdown to select preview voice in the section of the text-to-speech settings page where a user can preview text to speech.">
-      Voice to preview
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_PREVIEW_PLAY" desc="A button on the text-to-speech settings page to start playing a preview of text to speech">
-      Play
-    </message>
-    <message name="IDS_SETTINGS_TEXT_TO_SPEECH_ENGINES" desc="Heading for a section of text-to-speech settings to do per-engine settings">
-      Speech Engines
-    </message>
-  </if>
-
-  <if expr="chromeos">
-    <!-- Crostini Page -->
-    <message name="IDS_SETTINGS_CROSTINI_TITLE" desc="The title of Crostini section.">
-      Linux (Beta)
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_LABEL" desc="The text associated with the primary section setting.">
-      Linux
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SUBTEXT" desc="Description for the section for enabling and managing Crostini.">
-      Run Linux tools, editors, and IDEs on your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>. &lt;a target="_blank" href="<ph name="URL">$2<ex>https://google.com/</ex></ph>"&gt;Learn more&lt;/a&gt;
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_REMOVE" desc="Label for the row to open a dialog confirming removal of Crostini.">
-      Remove Linux for <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_REMOVE_BUTTON" desc="Label for the button to open a dialog confirming removal of Crostini.">
-      Remove
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS" desc="Label for managing shared folders in Crostini.">
-      Manage shared folders
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_LIST_HEADING" desc="Label for list of shared folders.">
-      Shared folders
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_LIST_EMPTY_MESSAGE" desc="Message shown when the user has not yet shared any folders in Crostini.">
-      Shared folders will appear here
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_INSTRUCTIONS_ADD" desc="Instructions for how to add shared folders in Crostini.">
-      To share, right-click on a folder in Files app, then select "Share with Linux".
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_INSTRUCTIONS_LOCATE" desc="Instructions for how to locate shared folders in Crostini.">
-      Shared folders are available in Linux at <ph name="BASE_DIR">$1<ex>/mnt/chromeos</ex></ph>.
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_INSTRUCTIONS_REMOVE" desc="Instructions for removing shared folders in Crostini.">
-      Removing folders from here will stop sharing but will not delete files.
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS_REMOVE_SHARING" desc="Tooltip to show when hovering on the remove icon for a crostini shared folder.">
-      Remove sharing
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_EXPORT_IMPORT_TITLE" desc="Title for crostini container export and imoprt (backup and restore) section">
-      Backup &amp; restore
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_EXPORT" desc="Tile for exporting (backing up) the crostini container.">
-      Backup
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_EXPORT_LABEL" desc="Description shown next to the button to export (backup) Crostini.">
-      Backup Linux apps and files
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_IMPORT" desc="Title for importing (restoring) the crostini container.">
-      Restore
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_IMPORT_LABEL" desc="Description shown next to the button to import (restore) Crostini.">
-      Replace your Linux apps and files with a previous backup
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_CONFIRM_IMPORT_DIALOG_WINDOW_TITLE" desc="Title of the confirmation dialog displayed before container import begins.">
-      Confirm Restore
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_CONFIRM_IMPORT_DIALOG_WINDOW_MESSAGE" desc="Message of the confirmation dialog displayed before container import begins.">
-      Restoring from a backup will delete existing Linux applications and data in your Linux files folder.
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SHARED_USB_DEVICES_LABEL" desc="Label for managing shared USB devices.">
-      USB preferences
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SHARED_USB_DEVICES_LIST_EMPTY_MESSAGE" desc="Message shown when there are no avaiable USB devices.">
-      Available USB devices will appear here.
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SHARED_USB_DEVICES_DESCRIPTION" desc="Description for managing shared USB devices.">
-      Give Linux apps permission to access USB devices. Linux won't remember a USB device after it's removed.
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_SHARED_USB_DEVICES_EXTRA_DESCRIPTION" desc="Extra description for managing shared USB devices.">
-       Only Android devices are currently supported.
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_TITLE" desc="Title of ARC ADB sideloading section.">
-      Develop Android apps
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_DESCRIPTION" desc="Description of ARC ADB sideloading in Settings.">
-      To create and test your apps, enable the Android Debug Bridge (ADB). Note that this action allows installation of Android apps that haven't been verified by Brave, and requires a factory reset to disable.
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_LABEL" desc="Label for enabling ADB in ARC.">
-      Enable ADB debugging
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_POWERWASH_REQUIRED_SUBLABEL" desc="Sublabel notifying user of powerwash requirement before enabling ARC ADB sideloading.">
-            A factory reset of this Bravebook is required to enable ADB debugging. <ph name="BEGIN_LINK_LEARN_MORE">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK_LEARN_MORE">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_TITLE_ENABLE" desc="Confirmation dialog title to restart for enabling ADB.">
-      Enable ADB debugging?
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_TITLE_DISABLE" desc="Confirmation dialog title to restart for disabling ADB.">
-      Disable ADB debugging?
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_MESSAGE_ENABLE" desc="Describes what will happen if the user enables ADB Sideloading.">
-      To enable ADB debugging, a restart of this <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> is required. Disabling it requires a reset to factory settings.
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_MESSAGE_DISABLE" desc="Describes what will happen if the user disables ADB Sideloading.">
-      Disabling ADB debugging will reset this <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> to factory settings. All user accounts and local data will be erased.
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_ARC_ADB_RESTART_BUTTON" desc="Label for the button that initiates the ADB enabling flow by restarting the device.">
-      Restart and continue
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_CONTAINER_UPGRADE_BUTTON" desc="Label for the button that launches the upgrade to Debian 10 for Crostini.">
-      Upgrade
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_CONTAINER_UPGRADE_MESSAGE" desc="Message shown when an upgrade to Debian 10 (codenamed Buster) is available.">
-      An upgrade to Debian 10 (Buster) is available
-    </message>
-    <message name="IDS_SETTINGS_CROSTINI_CONTAINER_UPGRADE_SUBTEXT" desc="The current version the user has.">
-      Current version is Debian 9 (Stretch)
-    </message>
-
-    <!-- Plugin VM Page -->
-    <message name="IDS_SETTINGS_PLUGIN_VM_PAGE_TITLE" desc="The title of Plugin VM section.">
-      Plugin VM
-    </message>
-    <message name="IDS_SETTINGS_PLUGIN_VM_PAGE_LABEL" desc="The text associated with the primary section setting for Plugin VM.">
-      Plugin VM
-    </message>
-    <message name="IDS_SETTINGS_PLUGIN_VM_PAGE_SUBTEXT" desc="Description for the section for managing Plugin VM.">
-      Set up permissions
-    </message>
-    <message name="IDS_SETTINGS_PLUGIN_VM_PRINTER_ACCESS" desc="The text in the settings page for allowing printer access from Plugin VM.">
-      Give access to printers
-    </message>
-    <message name="IDS_SETTINGS_PLUGIN_VM_SHARED_PATHS" desc="Label for managing shared folders for Plugin VM.">
-      Manage shared folders
-    </message>
-    <message name="IDS_SETTINGS_PLUGIN_VM_SHARED_PATHS_LIST_HEADING" desc="Label for list of shared folders.">
-      Shared folders
-    </message>
-    <message name="IDS_SETTINGS_PLUGIN_VM_SHARED_PATHS_INSTRUCTIONS_ADD" desc="Instructions for how to add shared folders in Plugin VM.">
-      To share, right-click on a folder in Files app, then select "Share with Plugin VM".
-    </message>
-    <message name="IDS_SETTINGS_PLUGIN_VM_SHARED_PATHS_INSTRUCTIONS_REMOVE" desc="Instructions for removing shared folders in Plugin VM.">
-      Removing folders from here will stop sharing but will not delete files.
-    </message>
-    <message name="IDS_SETTINGS_PLUGIN_VM_SHARED_PATHS_REMOVE_SHARING" desc="Tooltip to show when hovering on the remove icon for a Plugin VM shared folder.">
-      Remove sharing
-    </message>
-    <message name="IDS_SETTINGS_PLUGIN_VM_REMOVE_LABEL" desc="Label for the row to open a dialog confirming removal of Plugin VM.">
-      Uninstall Plugin VM
-    </message>
-    <message name="IDS_SETTINGS_PLUGIN_VM_REMOVE_BUTTON" desc="Label for the button to open a dialog confirming removal of Plugin VM.">
-      Uninstall
-    </message>
-    <message name="IDS_SETTINGS_PLUGIN_VM_CONFIRM_REMOVE_DIALOG_BODY" desc="Message of the confirmation dialog displayed before removal begins.">
-      Removing Plugin VM will delete your VM. This includes its applications, settings, and data. Are you sure you wish to continue?
-    </message>
-
     <!-- Android Apps Page -->
     <message name="IDS_SETTINGS_ANDROID_APPS_TITLE" desc="The title of Google Play Store (Arc++ / Android Apps) section.">
       Google Play Store
@@ -745,25 +75,9 @@
     <message name="IDS_SETTINGS_ANDROID_SETTINGS_TITLE" desc="The title of Android settings section in case Play Store app is not available.">
       Android settings
     </message>
-    <message name="IDS_SETTINGS_ANDROID_APPS_LABEL" desc="The text associated with the primary section setting.">
-      Google Play Store
-    </message>
     <message name="IDS_SETTINGS_ANDROID_APPS_SUBTEXT" desc="Description for the section for enabling and managing Google Play Store (Android) apps.">
       Install apps and games from Google Play on your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>. &lt;a target="_blank" href="<ph name="URL">$2<ex>https://google.com/</ex></ph>"&gt;Learn more&lt;/a&gt;
     </message>
-    <message name="IDS_SETTINGS_ANDROID_APPS_MANAGE_APPS" desc="Label for launching Android apps settings.">
-      Manage Android preferences
-    </message>
-    <message name="IDS_SETTINGS_ANDROID_APPS_REMOVE" desc="Label for the control to open a dialog confirming removal of the Google Play Store.">
-      Remove Google Play Store
-    </message>
-    <message name="IDS_SETTINGS_ANDROID_APPS_REMOVE_BUTTON" desc="Label for the button for the removal of the Google Play Store">
-      Remove
-    </message>
-
-    <message name="IDS_SETTINGS_ANDROID_APPS_DISABLE_DIALOG_TITLE" desc="Title of the confirmation dialog for disabling android apps.">
-      Remove Android apps?
-    </message>
     <!-- TODO(jamescook): Use device type instead of "Bravebook", which may
          require changing ArcPlayTermsOfServiceConsent resource id handling. -->
     <message name="IDS_SETTINGS_ANDROID_APPS_DISABLE_DIALOG_MESSAGE" desc="Describes what will happen if the user opts out of android apps.">
@@ -773,20 +87,6 @@
       <ph name="LINE_BREAKS2">&lt;br&gt;&lt;br&gt;</ph>
       This doesn’t affect apps or content on other devices.
     </message>
-    <message name="IDS_SETTINGS_ANDROID_APPS_DISABLE_DIALOG_REMOVE" desc="Label for confirmation button in the disable android apps dialog.">
-      Remove Android apps
-    </message>
-    <message name="IDS_SETTINGS_ANDROID_APPS_MANAGE_APP_LINKS" desc="Label for accessing app preferrences on ARC side.">
-      Manage Play app links
-    </message>
-
-    <!-- Apps Section Page -->
-    <message name="IDS_SETTINGS_APPS_TITLE" desc="The title of Apps section.">
-      Apps
-    </message>
-    <message name="IDS_SETTINGS_APPS_LINK_TEXT" desc="The label for the button which links to the App Management page.">
-      Manage your apps
-    </message>
   </if>
 
   <!-- Appearance Page -->
@@ -857,6 +157,12 @@
       Show warning before quitting with ⌘Q
     </message>
   </if>
+  <message name="IDS_SETTINGS_READER_MODE" desc="Label for a setting to enable/disable offers to show articles in reader mode">
+    Reader mode for web pages
+  </message>
+  <message name="IDS_SETTINGS_READER_MODE_DESCRIPTION" desc="Description for a setting to enable/disable offers to show articles in reader mode, which is a simplified view of the original page">
+    Offer to show articles in reader mode, when supported
+  </message>
 
   <!-- Common -->
   <message name="IDS_SETTINGS_ADVANCED" desc="Name of the settings page which displays advanced preferences.">
@@ -908,6 +214,9 @@
   <message name="IDS_SETTINGS_CLEAR" desc="Label used on a menu item or button to clear an item.">
     Clear
   </message>
+  <message name="IDS_SETTINGS_CUSTOM" desc="Label for a custom option in a dropdown menu.">
+    Custom
+  </message>
   <message name="IDS_SETTINGS_DELETE" desc="Label used on a menu item or button to delete an item.">
     Delete
   </message>
@@ -1006,9 +315,120 @@
   <message name="IDS_SETTINGS_CREDIT_CARD_EXPIRED" desc="The error message that is shown when user attempts to enter or save an expired card.">
     Your card is expired
   </message>
+  <message name="IDS_SETTINGS_UPI_ID_LABEL" desc="A label which appears next to UPI IDs, when they are listed as stored payment info, but it is visually separate from the UPI ID. It lets the user know this is a UPI ID (e.g. as opposed to a credit card number). UPI is a system for payments in India. A UPI ID is an email-like string.">
+    UPI ID
+  </message>
+  <message name="IDS_SETTINGS_UPI_ID_EXPIRATION_NEVER" desc="Appears in a different column next to UPI IDs, under the column Expiration Date, when they are listed as stored payment info. It lets the user know that UPI IDs do not expire. UPI is a system for payments in India. A UPI ID is an email-like string.">
+    Never
+  </message>
   <message name="IDS_SETTINGS_PASSWORDS" desc="Name for the password section and settings entry used for managing passwords.">
     Passwords
   </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS" desc="Name for the check passwords subsection and settings entry used to perform a password bulk check.">
+    Check passwords
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_CANCELED" desc="Message for when the password check was canceled by the user.">
+    Canceled
+  </message>
+  <message name="IDS_SETTINGS_CHECKED_PASSWORDS" desc="Title above amount of found compromised passwords after password bulk check.">
+    Checked passwords
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_DESCRIPTION" desc="Explanation of the passwords bulk check feature found within the password settings.">
+    Keep your passwords safe from data breaches and other security issues
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_OFFLINE" desc="Error message when the password check can't be completed because the user is offline.">
+    <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph> can't check your passwords. Try checking your internet connection.
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_SIGNED_OUT" desc="Error message when the password check can't be completed because the user is not signed in.">
+    <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph> can check your passwords when you sign in with your Brave Account
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_NO_PASSWORDS" desc="Error message when the password check can't be completed since no passwords could be checked.">
+    No saved passwords. <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph> can check your passwords when you save them.
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT_GOOGLE_ACCOUNT" desc="Error message when the password check can't be completed since the user hit the quota limit, but the user is able to check their passwords in their Brave account.">
+    <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph> can't check your passwords. Try again after 24 hours or <ph name="BEGIN_LINK">&lt;a href="$2" target="_blank"&gt;</ph>check passwords in your Brave Account<ph name="END_LINK">&lt;/a&gt;</ph>.
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT" desc="Error message when the password check can't be completed since the user hit the quota limit.">
+    <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph> can't check your passwords. Try again after 24 hours.
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC" desc="Error message when the password check can't be completed for an unspecified reason.">
+    <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph> can't check your passwords. Try again later.
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_PASSWORDS_COUNT" desc="Number of compromised passwords present in the database">
+    {COUNT, plural,
+      =0 {No compromised passwords found}
+      =1 {{COUNT} compromised password}
+      other {{COUNT} compromised passwords}}
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_AGAIN" desc="Button to start bulk password check manually in passwords check section.">
+    Check again
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_AGAIN_AFTER_ERROR" desc="Button to start bulk password check manually in passwords check section after it already failed once.">
+    Try again
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_PROGRESS" desc="Text for a label showing how many passwords were checked so far and how many passwords need to be checked in total.">
+    Checking passwords (<ph name="CHECKED_PASSWORDS">$1<ex>6</ex></ph> of <ph name="TOTAL_PASSWORDS">$2<ex>31</ex></ph>)…
+  </message>
+  <message name="IDS_SETTINGS_CHECK_PASSWORDS_STOP" desc="Button to manually stop an ongoing bulk password check.">
+    Cancel
+  </message>
+  <message name="IDS_SETTINGS_PASSWORDS_JUST_NOW" desc="Label shown when a compromised credential was found less than a minute ago">
+    Just now
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_PASSWORDS" desc="Title for list of compromised credentials after passwords bulk check.">
+    Compromised passwords
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_PASSWORDS_ADVICE" desc="Description of what user should do after compromised passwords are found.">
+    Change these passwords immediately to keep your account safe:
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PASSWORD_BUTTON" desc="Button inside password check section which opens url for changing leaked password.">
+    Change password
+  </message>
+  <message name="IDS_SETTINGS_CHANGE_PASSWORD_IN_APP_LABEL" desc="Label which is shown only if compromised credentials can't be fixed by visiting website (e.g. password from mobile app).">
+    Open the app to change your password
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_PASSWORD_REASON_LEAKED" desc="Password compromise reason shown when a password was found in a data breach.">
+    Found in data breach
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_PASSWORD_REASON_PHISHED" desc="Password compromise reason shown when a password was reused on a phishing site.">
+    Entered on deceptive site
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_PASSWORD_REASON_PHISHED_AND_LEAKED" desc="Password compromise reason shown when a password was reused on a phishing site and found in a data breach.">
+    Entered on deceptive site and found in data breach
+  </message>
+  <message name="IDS_SETTINGS_NO_COMPROMISED_CREDENTIALS_LABEL" desc="Label which is shown when there were no compromised passwords detected.">
+    <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph> will notify you when you sign in with a compromised password
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_PASSWORD_SHOW" desc="Action menu item for a row which displays a compromised password. The password value, which is initialy obfuscated, will be show in plain text.">
+    Show password
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_PASSWORD_HIDE" desc="Action menu item for a row which displays a compromised password. The password value, which is shown in plain text, will be hidden again.">
+    Hide password
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_PASSWORD_EDIT" desc="Action menu item for a row which displays a compromised password. It will open a modal dialog which will allow the user to edit the password and other metadata (username, website).">
+    Edit password
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_PASSWORD_REMOVE" desc="Action menu item for a row which displays a compromised password. It will open a confirmation dialog for deleting the password.">
+    Remove password
+  </message>
+  <message name="IDS_SETTINGS_REMOVE_COMPROMISED_PASSWORD_CONFIRMATION_TITLE" desc="Compromised password remove dialog conformation title.">
+    Remove password?
+  </message>
+  <message name="IDS_SETTINGS_REMOVE_COMPROMISED_PASSWORD_CONFIRMATION_DESCRIPTION" desc="Compromised password remove dialog conformation description">
+    Removing this password will not delete your account on <ph name="DOMAIN">$1<ex>airbnb.com</ex></ph>. Change your password or delete your account on <ph name="DOMAIN_LINK">$2<ex>&lt;a href="https://airbnb.com" target="_blank"&gt;airbnb.com&lt;/a&gt;</ex></ph> to keep it safe from others.
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_EDIT_PASSWORD_TITLE" desc="The title for a dialog, which allows a user to edit a password, which have been found to be compromised. This dialog includes other details, such as username and website.">
+    Edit password
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_EDIT_PASSWORD_FOOTNOTE" desc="A footnote for the dialog which allows the user to edit a password, which has been found to have been compromised.">
+    Make sure the password you are saving matches your password for <ph name="WEBSITE">$1<ex>airbnb.com</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_EDIT_PASSWORD_SITE" desc="A label for the field, which displays the site for which the password was saved. The field is part of a dialog, which allows the user to edit the password.">
+    Site
+  </message>
+  <message name="IDS_SETTINGS_COMPROMISED_EDIT_PASSWORD_APP" desc="A label for the field, which displays the app for which the password was saved. The field is part of a dialog, which allows the user to edit the password.">
+    App
+  </message>
   <message name="IDS_SETTINGS_PASSWORDS_SAVE_PASSWORDS_TOGGLE_LABEL" desc="Label for a toggle that allows users to be prompted if they want to save their passwords when logging into webpages.">
     Offer to save passwords
   </message>
@@ -1051,9 +471,15 @@
   <message name="IDS_SETTINGS_PASSWORD_DETAILS" desc="Label for a context menu item that shows a dialog with details for the selected password.">
     Details
   </message>
+  <message name="IDS_SETTINGS_PASSWORD_COPY" desc="Label for a context menu item that allows to copy the selected password into clipboard.">
+    Copy password
+  </message>
   <message name="IDS_SETTINGS_PASSWORDS_WEBSITE" desc="Label for the website a password is for when editing a password.">
     Website
   </message>
+  <message name="IDS_SETTINGS_PASSWORDS_ANDROID_APP" desc="Label for the app a password is for when displaying a credential and the real app display name could not be obtained.">
+      App (<ph name="ANDROID_PACKAGE_NAME">$1<ex>com.netflix.mediaclient</ex></ph>)
+  </message>
   <message name="IDS_SETTINGS_PASSWORDS_USERNAME" desc="Label for the saved username when editing a password.">
     Username
   </message>
@@ -1081,6 +507,14 @@
   <message name="IDS_SETTINGS_PASSWORDS_MANAGE_PASSWORDS" desc="Shown in the passwords section of settings. Descriptive text to inform that passwords can be accessed online. Has a link.">
     View and manage saved passwords in your <ph name="BEGIN_LINK">&lt;a is="action-link" href="$1" target="_blank"&gt;</ph>Brave Account<ph name="END_LINK">&lt;/a&gt;</ph>
   </message>
+  <!-- TODO(crbug.com/1062344): Make it translateable and use definitive label once final mocks are available. -->
+  <message translateable="false" name="IDS_SETTINGS_PASSWORDS_OPT_IN_ACCOUNT_STORAGE_LABEL" desc="Label for a button in the passwords section of settings triggering opt in to passwords account storage.">
+    Opt-in to account storage
+  </message>
+  <!-- TODO(crbug.com/1062344): Make it translateable and use definitive label once final mocks are available. -->
+  <message translateable="false" name="IDS_SETTINGS_PASSWORDS_OPT_OUT_ACCOUNT_STORAGE_LABEL" desc="Label for a button in the passwords section of settings triggering opt out of passwords account storage.">
+    Opt-out of account storage
+  </message>
   <message name="IDS_SETTINGS_PASSWORDS_EXPORT_MENU_ITEM" desc="A menu item in the More Actions menu above the password list in Brave's settings. Selecting this action will open a dialog, through which the user can export their passwords outside of Brave.">
     Export passwords...
   </message>
@@ -1125,131 +559,7 @@
       Default browser
     </message>
     <message name="IDS_SETTINGS_DEFAULT_BROWSER_MAKE_DEFAULT_BUTTON" desc="Text of the button used to make Brave the default browser on the user's system.">
-      Make default
-    </message>
-  </if>
-
-  <!-- Bluetooth Page -->
-  <if expr="chromeos">
-    <message name="IDS_SETTINGS_BLUETOOTH" desc="Name of the settings page which displays Bluetooth device settings.">
-      Bluetooth
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_PAIRED" desc="Title of the settings subsection listing paired Bluetooth devices.">
-      Paired devices
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_DEVICE_LIST_UNPAIRED" desc="Title of the settings subsection listing unpaired Bluetooth devices.">
-      Unpaired devices
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_PAIR" desc="Label for the settings button to pair a previously paired Bluetooth device.">
-      Pair
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE_TITLE" desc="Title of the settings dialog for adding or pairing Bluetooth a device.">
-      Connect to Bluetooth device
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_NO_DEVICES" desc="Message displayed when there are no paired Bluetooth devices scan.">
-      No paired devices
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_NO_DEVICES_FOUND" desc="Message displayed when no Bluetooth devices are found after a scan.">
-      No Bluetooth devices found
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_TOGGLE_ACCESSIBILITY_LABEL" desc="Accessibility only label for Bluetooth enable/disable toggle.">
-      Bluetooth enable
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_ENTER_KEY" desc="Bluetooth pairing dialog: Text for enter key when pairing keyboard devices.">
-      enter
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY" desc="Bluetooth pairing dialog: Text for button to accept pairing code.">
-      Accept
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT" desc="Bluetooth pairing dialog: Text for dropdown meny item to connect to a device.">
-      Connect
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_DISCONNECT" desc="Bluetooth pairing dialog: dropdown meny item to disconnect from a device.">
-      Disconnect
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_REJECT_PASSKEY" desc="Bluetooth pairing dialog: Text for button to reject pairing a device.">
-      Reject
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing available Bluetooth devices. Only visible by screen reader software.">
-      Show available Bluetooth devices
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_REMOVE" desc="Label for removing (unpairing) a paired Bluetooth device">
-      Remove from list
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_REQUEST_PINCODE" desc="Bluetooth pairing message typically displayed when the external Bluetooth 2.0 and older device has no display or means of input.">
-      Please enter the PIN for "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>":
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_DISPLAY_PINCODE" desc="Bluetooth pairing message typically displayed when pairing a Bluetooth 2.0 and older wireless keyboard.">
-      Please enter this PIN code on "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>":
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_REQUEST_PASSKEY" desc="Bluetooth pairing message typically displayed when the external Bluetooth 2.1 and later device has no display or means of input, and does not support SSP.">
-      Please enter the passkey for "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>":
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY" desc="Bluetooth pairing message typically displayed when pairing a Bluetooth 2.1 and later wireless keyboard.">
-      Please enter this passkey on "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>":
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONFIRM_PASSKEY" desc="Bluetooth pairing message typically shown when pairing with a device that has a display.">
-      Please confirm this passkey is shown on "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>":
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECTED" desc="In Bluetooth device list, this label is shown below a device which is already connected.">
-      Connected
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECTED_WITH_BATTERY" desc="In Bluetooth device list, this label is shown below a device which is already connected and has a known battery percentage.">
-      Connected, <ph name="BATTERY_PERCENTAGE">$1<ex>100</ex></ph>% battery
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_NOT_CONNECTED" desc="In Bluetooth device list, this label is shown below a device which is not connected.">
-      Not connected
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECTING">
-      Connecting...
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_START_CONNECTING">
-      Connecting to "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>"
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_IN_PROGRESS">
-      Connection to "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>" still in progress
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_FAILED">
-      Failed to connect to "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_FAILED">
-      Authentication failed while connecting to "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_CANCELED">
-      Authentication canceled while connecting to "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_REJECTED">
-      Authentication code rejected while connecting to "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_TIMEOUT">
-      Authentication timeout while connecting to "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_UNSUPPORTED_DEVICE">
-      Unsupported Bluetooth device: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_ATTRIBUTE_LENGTH_INVALID">
-      Write operation exceeds the maximum length of the attribute to: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_CONNECTION_CONGESTED">
-      Connection is congested to remote device: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_INSUFFICIENT_ENCRYPTION">
-      Insufficient encryption for a given operation on: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_OFFSET_INVALID">
-      Read or write operation was requested with an invalid offset on: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_READ_NOT_PERMITTED">
-      Read operation is not permitted on: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_REQUEST_NOT_SUPPORTED">
-      The given request is not supported to: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_CONNECT_WRITE_NOT_PERMITTED">
-      Write operation is not permitted on: "<ph name="DEVICE_NAME">$1<ex>Nexus 4</ex></ph>".
-    </message>
-    <message name="IDS_SETTINGS_BLUETOOTH_PRIMARY_USER_CONTROLLED" desc="Settings &gt; Bluetooth &gt; Text to show when Bluetooth configuration is controlled by the primary user.">
-      Bluetooth configuration is controlled by <ph name="USER_EMAIL">$1<ex>joe@gmail.com</ex></ph>.
+      Make default
     </message>
   </if>
 
@@ -1529,258 +839,6 @@
   <message name="IDS_SETTINGS_PRINTING_MANAGE_CLOUD_PRINT_DEVICES" desc="Text for the button which allows users to manage their Google Cloud Print devices">
     Manage Cloud Print devices
   </message>
-  <if expr="chromeos">
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER" desc="Label for button that allows the user to access the add print server dialog.">
-      Print server
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS" desc="In Printing Settings, the title of the CUPS printers setting section.">
-      Printers
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_LEARN_MORE_LABEL" desc="Label for the link that teaches users how to use CUPS printing.">
-      Set up or manage CUPS printers. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_ADD_PRINTER" desc="In CUPS printing settings subpage, text for the link adding a new CUPS printer.">
-      Add Printer
-    </message>
-     <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_ADD_DETECTED_OR_NEW_PRINTER" desc="In CUPS printing settings subpage, explanatory text for the nearby printers list.">
-      Save detected printers to your profile, or add a new printer. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_AVAILABLE_PRINTERS" desc="In CUPS printing settings subpage, title for the nearby printers list.">
-      Add printers to your profile
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_AVAILABLE_PRINTERS_COUNT_MANY" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them on the number of printers showing on the screen that are available to save.">
-      There are <ph name="PRINTER_COUNT">$1<ex>3</ex></ph> printers available to save.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_AVAILABLE_PRINTER_COUNT_ONE" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them there is only 1 printer available to save.">
-      There is 1 printer available to save.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_AVAILABLE_PRINTER_COUNT_NONE" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them there are no printers available to save.">
-      There are no printers available to save.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_EDIT" desc="Text for the drop down menu which allows the user to edit the printer details.">
-      Edit
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_REMOVE" desc="Text for the drop down menu which allows the user to remove the selected printer.">
-      Remove
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SETUP_BUTTON" desc="Text for the button which allows the user to manually setup a CUPS printer.">
-      Set up
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SETUP_BUTTON_ARIA" desc="Label to be read aloud by the screen reader for the button which allows the user to manually setup a CUPS printer.">
-      Set up <ph name="PRINTER_NAME">$1<ex>HP OfficeJet 500</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SAVE_BUTTON" desc="Text for the button which allows the user to add an automatically discovered printer to the user's saved printer list.">
-      Save
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SAVE_BUTTON_ARIA" desc="Label to be read aloud by the screen reader for the button which allows the user to add an automatically discovered printer to the user's saved printer list.">
-      Save <ph name="PRINTER_NAME">$1<ex>HP OfficeJet 500</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_SEARCH_LABEL" desc="The placeholder text in the printer search field.">
-      Search printers
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_SAVED_PRINTERS_TITLE" desc="Text for the title of the user's saved printers list.">
-      Your saved printers
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_SAVED_PRINTERS_COUNT_MANY" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them on the number of printers previously saved by the user.">
-      You have <ph name="PRINTER_COUNT">$1<ex>3</ex></ph> saved printers.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_SAVED_PRINTERS_COUNT_ONE" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them there is only 1 printer previously saved.">
-      You have 1 saved printer.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTERS_SAVED_PRINTERS_COUNT_NONE" desc="In CUPS printing settings subpage, this message will be read aloud to the user to inform them they have no printers previously saved.">
-      You have no saved printers.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_SHOW_MORE" desc="Text for the button to show more printers when there are more printers than currently displayed to the user.">
-      Show more
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINTERS_NEARBY_TITLE" desc="Text for the title of the dialog that is used to add nearby printers.">
-      Add a nearby printer
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINTERS_MANUALLY_TITLE" desc="Text for the title of the dialog that is used to manually add a printer instead of automatically finding ones nearby.">
-      Add a printer manually
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINT_SERVER_TITLE" desc="Text for the title of the dialog that is used to manually add a print server.">
-      Add a print server
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_SELECT_MANUFACTURER_AND_MODEL_TITLE" desc="Text for the title of the dialog that is used to select a manufacturer and model from the drop down list.">
-      Advanced printer configuration
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_TITLE" desc="Text for the title of the Printer Details subpage.">
-      Printer details
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADVANCED" desc="Label for the toggle control to show/hide the advanced details of the printer.">
-      Advanced
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADVANCED_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the advanced printer options for a particular printer. Only visible by screen reader software.">
-      Show advanced printer options
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADVANCED_ADDRESS" desc="Label for the CUPS printer address in the Advanced section in the printer details page.">
-      Address
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_ADDRESS" desc="Label for the CUPS print server address in the in the print server details page.">
-      Address
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADVANCED_PROTOCOL" desc="Label for the CUPS printer protocol in the Advanced section in the printer details page.">
-      Protocol
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADVANCED_URI" desc="Label for the CUPS printer URI (uniform resource identifier) in the Advanced section in the printer details page.">
-      URI
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_NAME" desc="Label for the CUPS printer name in the printer details page.">
-      Name
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_MODEL" desc="Label for the CUPS printer model in the printer details page.">
-      Model
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_DETAILS_QUEUE" desc="Label for the CUPS printer queue in the manually add printer dialog.">
-      Queue
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINTER_BUTTON_ADD" desc="Text for the button which allows the user to add a CUPS printer.">
-      Add
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINTER_BUTTON_MANUAL_ADD" desc="Text for the button which allows the user to manually add a CUPS printer.">
-      Add Manually
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_ADD_PRINTER_BUTTON_DISCOVER_PRINTERS" desc="Text for the button which allows the user to go back to the printers discovery dialog.">
-      Add Nearby Printers
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_IPP" desc="The dropdown menu of the printer IPP protocol on the manually add printer dialog.">
-      Internet Printing Protocol (IPP)
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_IPPS" desc="The dropdown menu of the printer IPPS protocol on the manually add printer dialog.">
-      Internet Printing Protocol (IPPS)
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_HTTP" desc="The dropdown menu of the printer HTTP protocol on the manually add printer dialog.">
-      Internet Printing Protocol (HTTP)
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_HTTPS" desc="The dropdown menu of the printer HTTPS protocol on the manually add printer dialog.">
-      Internet Printing Protocol (HTTPS)
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_APP_SOCKET" desc="The dropdown menu of the printer TCP/IP protocol on the manually add printer dialog.">
-      AppSocket (TCP/IP)
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_LPD" desc="The dropdown menu of the printer LPD protocol on the manually add printer dialog.">
-      Line Printer Daemon (LPD)
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_USB" desc="The dropdown menu of the printer USB protocol on the manually add printer dialog.">
-      USB
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_PROTOCOL_IPPUSB" desc="The dropdown menu of the printer IPPUSB protocol on the edit printer dialog.">
-      IPP over USB (IPPUSB)
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_CONFIGURING_MESSAGE" desc="The configuring-in-progress message shown in the configuring printer dialog.">
-      Configuring <ph name="PRINTER_NAME">$1<ex>Acme Printer</ex></ph> ...
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_MANUFACTURER" desc="Label for the dropdown menu to select a manufacturer for the printer.">
-      Manufacturer
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SELECT_DRIVER" desc="Label for the file selector to manually select a PPD file from the user's file system.">
-      Or specify your printer PPD <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_BUTTON_SELECT_DRIVER_ARIA_LABEL" desc="ARIA label for the file selector button to manually select a PPD file from the user's file system. This text will not be visual on any page. It will only be spoken by screen readers.">
-      Browse to specify your printer PPD
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_BUTTON_SELECT_DRIVER" desc="Text for the button which allows user to select a PPD file from the file system.">
-      Browse
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_INVALID_DRIVER" desc="Error message displayed to the user if they select an invalid PPD file.">
-      Invalid file selected. Try again.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_DONE_MESSAGE" desc="The message shown when a new printer is set up successfully.">
-      Added <ph name="PRINTER_NAME">$1<ex>Acme Printer</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_EDITED_PRINTER_DONE_MESSAGE" desc="The message shown when a printer is updated successfully.">
-      Updated <ph name="PRINTER_NAME">$1<ex>Acme Printer</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_UNAVAILABLE_MESSAGE" desc="The message shown when a printer can no longer be contacted while being added.">
-      <ph name="PRINTER_NAME">$1<ex>Acme Printer</ex></ph> is no longer available
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_NO_PRINTER_NEARBY" desc="The message shown when no nearby printers are found.">
-      There are no available printers.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SEARCHING_NEARBY_PRINTER" desc="The searching-in-progress message shown in the auto discovery dialog.">
-      Searching...
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_ERROR_MESSAGE" desc="The message shown when a new printer is not set up successfully.">
-      Unable to add printer. Please check your printer's configuration and try again.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_FATAL_ERROR_MESSAGE" desc="The message shown when a fatal error occurs while trying to add a new printer.">
-      Unable to add printer. Please check your printer's configuration and try again.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_PRINTER_UNREACHABLE_MESSAGE" desc="The message shown when the printer that is to be added is unreachable for configuration.">
-      Can’t connect to printer. Check that the printer is turned on and is connected to your Bravebook by Wi-Fi or USB.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_PPD_TOO_LARGE_MESSAGE" desc="The message shown when the PPD provided while trying to add new printer is too large.">
-      Can’t load large PPD. Maximum size is 250 kB.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_INVALID_PPD_MESSAGE" desc="The message shown when the PPD provided while trying to add a new printer is invalid.">
-      File is the wrong format. Check the PPD file and try again.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_PPD_NOT_FOUND" desc="The message shown when the PPD provided while trying to add a new printer cannot be found.">
-      Can’t find PPD. Make sure your Bravebook is online and try again.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_PRINTER_PPD_UNRETRIEVABLE" desc="The message shown when the PPD provided while trying to add a new printer is unretrievable.">
-      Can’t find PPD. Make sure your Bravebook is online and try again.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_ADDED_NATIVE_PRINTERS_NOT_ALLOWED_MESSAGE" desc="The message shown when the user is prevented from configuring printers due to an enterprise policy.">
-      Printer configuration is handled by the administrator.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_EDIT_PRINTER_INVALID_PRINTER_UPDATE" desc="The message shown when the user attempts to edit a configured printer in a way that would make it unusable">
-      Requested printer changes would make the printer unusable.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_REQUIRE_INTERNET_MESSAGE" desc="The message shown when there is no internet access to set up a printer.">
-      Connect to the internet to add a printer
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_CHECK_CONNECTION_MESSAGE" desc="The message shown when there is no internet connection for detecting available printers">
-      Please check your connection to see available printers in your network
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_NO_INTERNET_CONNECTION" desc="The message shown when there is no internet connection.">
-      No internet connection
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_CONNECT_TO_NETWORK_SUBTEXT" desc="The message shown when the user needs to connect to a network with connectivity and try again.">
-      Connect to a network and try again
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_EDIT_PRINTER_DIALOG_TITLE" desc="Text for the title of the dialog that is used to edit a CUPS printer's information.">
-      Edit printer
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_EDIT_PRINTER_BUTTON" desc="Text for the button which allows the user to save the modification of a CUPS printer.">
-      Save
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_EDIT_PRINTER_CURRENT_PPD_MESSAGE" desc="Informational text displayed to the user if they have an existing custom PPD.">
-      Current PPD file in use: <ph name="PPD_NAME">$1<ex>example.ppd.gz</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_MANUFACTURER_MODEL_ADDITIONAL_INFORMATION" desc="Informational text displayed to the user when the the user is doing advanced manual printer setup.">
-      <ph name="PRINTER_NAME">$1<ex>Printer</ex></ph> could not be configured automatically. Please specify advanced printer details. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_EULA_NOTICE" desc="The message shown to users if a printer has a EULA agreement attached to it.">
-      End User License Agreement
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_IPP_URI_UNREACHABLE" desc="The message shown on the uri field of the add/edit printer dialogs when attempting to connect to an IPP printer that is not found on the network.">
-      Couldn't detect a printer. Please enter printer address again.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_DIALOG_GENERAL_ERROR" desc="General message shown on the top of the add/edit printer dialogs when adding/editting a printer fails.">
-      Unable to set up printer. Please check configuration and try again.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_FOUND_ZERO_PRINTERS" desc="Message shown on a toast to indicate no printers were found from a print server.">
-      Did not find any printers from the print server
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_FOUND_ONE_PRINTER" desc="Message shown on a toast to indicate that only one printer was found from a print server.">
-      Found 1 printer from the print server
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_FOUND_MANY_PRINTERS" desc="Message shown on a toast to indicate the number of printers found on a print server.">
-      Found <ph name="NUM_PRINTERS">$1<ex>5</ex></ph> printers from the print server
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_INVALID_URL_ADDRESS" desc="Message shown on the address field of the print server dialog when attempting to connect to a print server with an invalid URL.">
-      Invalid address. Please check the address and try again.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_CONNECTION_ERROR" desc="Message shown on the print server dialog when the user has provided a valid URL but the server is unreachable.">
-      Couldn't detect the print server. Please check the address and try again.
-    </message>
-    <message name="IDS_SETTINGS_PRINTING_CUPS_PRINT_SERVER_REACHABLE_BUT_CANNOT_ADD" desc="Message shown on the print server dialog when we are able to reach the print server but still ran into some error with adding the print server.">
-      Couldn't add the print server. Please check the server's configuration and try again.
-    </message>
-
-  </if>
   <if expr="not chromeos">
     <message name="IDS_SETTINGS_PRINTING_LOCAL_PRINTERS_TITLE" desc="In Printing Settings, the title of local printers setting section on OS other than Chrome OS.">
       Printers
@@ -1803,24 +861,12 @@
   <message name="IDS_SETTINGS_PROMPT_FOR_DOWNLOAD" desc="Label for the checkbox which enables a prompt for the user to choose a download location for each download instead of using the default.">
     Ask where to save each file before downloading
   </message>
-  <message name="IDS_SETTINGS_DISCONNECT_GOOGLE_DRIVE" desc="Label for the checkbox which enables disconnecting from Google Drive account.">
-    Disconnect Google Drive account
-  </message>
   <message name="IDS_SETTINGS_OPEN_FILE_TYPES_AUTOMATICALLY" desc="The information label for the 'Clear auto-opening settings' button">
     Open certain file types automatically after downloading
   </message>
 
   <!-- SMB File Shares -->
   <if expr="chromeos">
-    <message name="IDS_SETTINGS_DOWNLOADS_SMB_SHARES" desc="In Downloads Settings, the title of the SMB shares setting section.">
-      Network file shares
-    </message>
-    <message name="IDS_SETTINGS_DOWNLOADS_SMB_SHARES_LEARN_MORE_LABEL" desc="Label for the link that teaches users how to setup SMB shares.">
-      Set up or manage network file shares. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_DOWNLOADS_SMB_SHARES_ADD_SHARE" desc="In SMB shares settings subpage, text for the link to add a new SMB share.">
-      Add file share
-    </message>
     <message name="IDS_SETTINGS_DOWNLOADS_ADD_SHARE_URL" desc="Title for the input that lets users specify the name of an SMB URL.">
       File share URL
     </message>
@@ -1836,30 +882,6 @@
     <message name="IDS_SETTINGS_DOWNLOADS_ADD_SHARE_SAVE_CREDENTIALS" desc="Label for the checkbox input that lets users have the username/password for an SMB share saved for the next login.">
       Remember sign-in info
     </message>
-    <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_SUCCESS_MESSAGE" desc="The message shown when a new SMB share is successfully mounted.">
-      Share mounted successfully.
-    </message>
-    <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_ERROR_MESSAGE" desc="The message shown when mounting a new SMB share fails.">
-      Error mounting share. Check the file share URL and try again.
-    </message>
-    <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_AUTH_FAILED_MESSAGE" desc="The message shown when mounting a new SMB share fails due to an authentication failure.">
-      Error mounting share. Please check your credentials and try again.
-    </message>
-    <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_NOT_FOUND_MESSAGE" desc="The message shown when mounting a new SMB share fails because the share cannot be found.">
-      Error mounting share. The specified share was not found on the network.
-    </message>
-    <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_UNSUPPORTED_DEVICE_MESSAGE" desc="The message shown when mounting a new SMB share fails because the specified device is not supported.">
-      Error mounting share. Please check that the file server you are connecting to supports SMBv2 or later.
-    </message>
-    <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_EXISTS_MESSAGE" desc="The message shown when mounting a new SMB share fails because the share is already mounted.">
-      Error mounting share. The specified share is already mounted.
-    </message>
-    <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_INVALID_URL_MESSAGE" desc="The message shown when mounting a new SMB share fails because the URL is an invalid format.">
-      Invalid URL format. Supported formats are \\server\share and smb://server/share.
-    </message>
-    <message name="IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_INVALID_SSO_URL_MESSAGE" desc="The message shown when mounting a new SMB share fails because the URL is an invalid format when SSO authentication is used.">
-      Invalid URL format. Server must be specified as a host name when SSO authentication is used.
-    </message>
     <message name="IDS_SETTINGS_DOWNLOADS_ADD_SHARE_AUTHENTICATION_METHOD" desc="Title for the input that lets users specify their authentication method for an SMB Share.">
       Authentication method
     </message>
@@ -1874,187 +896,8 @@
     </message>
   </if>
 
-  <!-- Kerberos tickets -->
-  <if expr="chromeos">
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_SUBMENU_LABEL" desc="Label of 'Kerberos tickets' submenu in Settings page.">
-      Kerberos tickets
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_PAGE_TITLE" desc="Title of 'Kerberos tickets' Settings page.">
-      Kerberos tickets
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_DESCRIPTION" desc="Description of the 'Kerberos tickets' Settings page. Shown just below the title of the page.">
-      Choose a ticket to use for authentication. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_LIST_HEADER" desc="List header for the ticket list on 'Kerberos tickets' Settings page.">
-      Tickets
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_ADD_ACCOUNT_LABEL" desc="Label of the 'Add a ticket' button on 'Kerberos tickets' Settings page.">
-      Add a ticket
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_REFRESH_NOW_LABEL" desc="Label of the 'Refresh now' button on 'Kerberos tickets' Settings page.">
-      Refresh now
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_SET_AS_ACTIVE_ACCOUNT_LABEL" desc="Label of the 'Set as ticket ticket' button on 'Kerberos tickets' Settings page.">
-      Set as active ticket
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_REMOVE_ACCOUNT_LABEL" desc="Label of the 'Remove from this device' button on 'Kerberos tickets' Settings page.">
-      Remove from this device
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_ACCOUNT_REMOVED_TIP" desc="Tip shown when a Kerberos ticket was removed on 'Kerberos tickets' Settings page.">
-      Ticket removed
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_ACCOUNT_REFRESHED_TIP" desc="Tip shown when a Kerberos ticket was refreshed on 'Kerberos tickets' Settings page.">
-      Ticket refreshed
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_SIGNED_IN" desc="Text displayed if a Kerberos ticket is in signed-in state on 'Kerberos tickets' Settings page.">
-      Valid for <ph name="TICKET_TIME_LEFT">$1<ex>7 hours 12 minutes</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_SIGNED_OUT" desc="Text displayed if a Kerberos ticket is in signed-out state on 'Kerberos tickets' Settings page.">
-      Expired
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_REAUTHENTICATION_LABEL" desc="Label of the re-authentication button on 'Kerberos tickets' Settings page.">
-      Refresh
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_TICKET_ACTIVE" desc="Text displayed if a Kerberos ticket is selected to be the currently active ticket on 'Kerberos tickets' Settings page.">
-      Active
-    </message>
-    <message name="IDS_SETTINGS_ADD_KERBEROS_ACCOUNT" desc="Title of the 'Add a Kerberos ticket' dialog.">
-      Add a Kerberos ticket
-    </message>
-    <message name="IDS_SETTINGS_REFRESH_KERBEROS_ACCOUNT" desc="Title of the 'Refresh a Kerberos ticket' dialog.">
-      Refresh a Kerberos ticket
-    </message>
-    <message name="IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_DESCRIPTION" desc="Description of the 'Add a Kerberos ticket' dialog. Shown just below the title of the dialog.">
-      To automatically refresh a ticket, check “Remember password.” Your password will be stored on your device only.
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_USERNAME" desc="Title for the input that lets users specify their username for a Kerberos ticket.">
-      Kerberos username
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_PASSWORD" desc="Title for the input that lets users specify their password for a Kerberos ticket.">
-      Password
-    </message>
-    <message name="IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_REMEMBER_PASSWORD" desc="Label of the checkbox to remember the password in the 'Add a Kerberos ticket' dialog.">
-      Remember password
-    </message>
-    <message name="IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_REFRESH_BUTTON_LABEL" desc="Label of the action button on the 'Refresh a Kerberos tickets' dialog.">
-      Refresh
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ACCOUNTS_ADVANCED_CONFIG_LABEL" desc="Label of the button in 'Add a Kerberos ticket' dialog to get to the Advanced configuration dialog.">
-      Advanced
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ADVANCED_CONFIG_TITLE" desc="In Kerberos Advanced Configuration dialog, the title of the dialog.">
-      Configure Kerberos
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ADVANCED_CONFIG_DESC" desc="In Kerberos Advanced Configuration dialog, the description of the dialog (below the title).">
-      Edit the configuration file
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ERROR_NETWORK_PROBLEM" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user has no network connection or enters a bad realm.">
-      Network problem or bad realm
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ERROR_USERNAME_INVALID" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user enters a badly formatted username.">
-      Username invalid
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ERROR_USERNAME_UNKNOWN" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user enters a username that is not known to the Kerberos realm.">
-      Username not known to server
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ERROR_DUPLICATE_PRINCIPAL_NAME" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user enters a username for which there is already a ticket.">
-      A ticket with this username already exists
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ERROR_CONTACTING_SERVER" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the OS is not able to contact the server for the given realm.">
-      Contacting server for realm failed
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ERROR_PASSWORD_INVALID" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user enters the wrong password.">
-      Password invalid
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ERROR_PASSWORD_EXPIRED" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the user's password is expired.">
-      Password expired
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ERROR_KDC_ENC_TYPE" desc="Error message displayed in the 'Add a Kerberos ticket' dialog when the KDC does not support the encryption types specified in the Kerberos configuration (KDC = Key Distribution Center, part of Kerberos infrastructure).">
-      KDC does not support encryption type
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_ERROR_GENERAL" desc="Fallback error message displayed in the 'Add a Kerberos ticket' dialog.">
-      Couldn't get Kerberos ticket. Try again, or contact your organization's device admin. (Error code <ph name="ERROR_CODE">$1<ex>123</ex></ph>).
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_NESTED_IN_GROUP" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that has a section (some text in angular braces) inside a group (some text in curly braces), e.g. 'someOption = { [someSection] }'. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
-      Section nested in group: <ph name="ERROR_LINE">$1<ex>[realms] (inside a block of curly braces '{ ... })</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_SYNTAX" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that contains a malformed section, e.g. '[someSection'. Sections must have opening and closing angular braces. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
-      Section syntax error: <ph name="ERROR_LINE">$1<ex>[realms</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_EXPECTED_OPENING_CURLY_BRACE" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that is missing a curly brace somewhere. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
-      Expected opening curly brace: <ph name="ERROR_LINE">$1<ex>ticket_lifetime = 1d (in the line after 'EXAMPLE.COM = )'</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_EXTRA_CURLY_BRACE" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that has a closing curly brace '}' that cannot be matched with an opening curly brace '{'. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
-      Extra curly brace: <ph name="ERROR_LINE">$1<ex>} (without having a corresponding opening curly brace '{')</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_RELATION_SYNTAX_ERROR" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that contains a malformed relation. A relation is 'key = value'. A malformed relation would be e.g. 'key : value' instead of 'key = value'. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
-      Relation syntax error: <ph name="ERROR_LINE">$1<ex>ticket_lifetime : 1d</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_KEY_NOT_SUPPORTED" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that contains a configuration option that we do not support, e.g. '[libdefaults] ccache_type = 1'. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
-      Configuration option not supported: <ph name="ERROR_LINE">$1<ex>ccache_type = 1</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_NOT_SUPPORTED" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that contains a section that we do not support, e.g. '[appdefaults]'. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
-      Section not supported: <ph name="ERROR_LINE">$1<ex>[appdefaults]</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_KERBEROS_CONFIG_ERROR_KRB5_FAILED_TO_PARSE" desc="Error message displayed in the Kerberos configuration dialog when the user tries to save a configuration that cannot be parsed by the underlying Kerberos library for unknown reasons. See https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html.">
-      Failed to parse configuration
-    </message>
-  </if>
-
-  <!-- Date/Time Page -->
-  <if expr="chromeos">
-    <message name="IDS_SETTINGS_DATE_TIME" desc="Name of the settings page which displays date and time preferences.">
-      Date and time
-    </message>
-    <message name="IDS_SETTINGS_TIME_ZONE_BUTTON" desc="Label for the button that opens time zone settings page.">
-      Time zone
-    </message>
-    <message name="IDS_SETTINGS_TIME_ZONE_SUBPAGE_TITLE" desc="The title of the dialog that allows user to control different time zone settings.">
-      Time zone
-    </message>
-    <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_SET_AUTOMATICALLY" desc="The name for the radio button that turns automatic time zone detection on.">
-      Set automatically
-    </message>
-    <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_CHOOSE_FROM_LIST" desc="The name for the radio button that turns automatic time zone detection off, and allows user to select time zone from the list of all supported time zones.">
-      Choose from list
-    </message>
-    <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_DISABLED" desc="Display name for the automatic time zone detection mode which disables automatic detection.">
-      Automatic time zone detection is disabled
-    </message>
-    <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_IP_ONLY_DEFAULT" desc="Display name for the automatic time zone detection mode which enables time zone detection sending unprecise location to Brave servers. Default means that this is the default time zone detection mode.">
-      Use your IP address to determine location (default)
-    </message>
-    <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_SEND_WIFI_AP" desc="Display name for the automatic time zone detection mode which enables time zone detection sending list of visible WiFi Access Point names to Brave servers.">
-      Use only Wi-Fi to determine location
-    </message>
-    <message name="IDS_SETTINGS_TIME_ZONE_DETECTION_MODE_SEND_ALL_INFO" desc="Display name for the automatic time zone detection mode which enables time zone detection sending list of visible WiFi and Cellular Access Point names to Brave servers.">
-      Use Wi-Fi or mobile networks to determine location
-    </message>
-    <message name="IDS_SETTINGS_TIME_ZONE" desc="Label for the picker which allows users to choose their time zone.">
-      Time zone
-    </message>
-    <message name="IDS_SETTINGS_TIME_ZONE_GEOLOCATION" desc="Label for the checkbox which enables setting the time zone automatically with the detected location of the device.">
-      Set time zone automatically using your location
-    </message>
-    <message name="IDS_SETTINGS_SELECT_TIME_ZONE_RESOLVE_METHOD" desc="Label for the drop-down menu that allows user to select specific method to automatically resolve device time zone.">
-      Time zone detection method
-    </message>
-    <message name="IDS_SETTINGS_USE_24_HOUR_CLOCK" desc="Label for the checkbox which enables a 24-hour clock (as opposed to a 12-hour clock).">
-      Use 24-hour clock
-    </message>
-    <message name="IDS_SETTINGS_SET_DATE_TIME" desc="Label for the button that shows the dialog for setting the system date and time.">
-      Set date and time
-    </message>
-  </if>
-
   <!-- Easy Unlock Page -->
   <if expr="chromeos">
-    <message name="IDS_SETTINGS_EASY_UNLOCK_SECTION_TITLE" desc="The title of the Easy Unlock section on the settings page.">
-      Smart Lock
-    </message>
-    <message name="IDS_SETTINGS_EASY_UNLOCK_SETUP_INTRO" desc="The text to show in Easy Unlock section to introduce the feature.">
-      Unlock your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> with your Android phone.
-    </message>
     <message name="IDS_SETTINGS_EASY_UNLOCK_SETUP" desc="The label of the button to set up Easy Unlock section on the settings page.">
       Set up
     </message>
@@ -2103,58 +946,13 @@
     <message name="IDS_SETTINGS_EASY_UNLOCK_OPTIONS" desc="Heading for options for the Smart Lock feature.">
       Smart Lock options
     </message>
-    <message name="IDS_SETTINGS_EASY_UNLOCK_UNLOCK_DEVICE_ONLY" desc="This option lets the user unlock their Bravebook from their phone if they're logged in. It will unlock their Bravebook but will not sign them in.">
-      Unlock device only
-    </message>
-    <message name="IDS_SETTINGS_EASY_UNLOCK_UNLOCK_DEVICE_AND_ALLOW_SIGNIN" desc="This option lets the user unlock their Bravebook from their phone as well as log into their Bravebook without a password if their phone is nearby and unlocked.">
-      Unlock device and sign in to Brave Account
-    </message>
   </if>
 
   <!-- Strings specific to the Settings Internet Page -->
   <if expr="chromeos">
-    <message name="IDS_SETTINGS_INTERNET" desc="Name of the settings page which displays internet preferences.">
-      Network
-    </message>
     <message name="IDS_SETTINGS_INTERNET_CONFIG" desc="Title for the network configuration dialog.">
       Configure network
     </message>
-    <message name="IDS_SETTINGS_INTERNET_CONFIG_NAME" desc="Title for the network configuration dialog for an existing network.">
-      Configure <ph name="NAME">$1<ex>My WiFi network</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_JOIN_TYPE" desc="Title for the network configuration dialog for a new network.">
-      Join <ph name="TYPE">$1<ex>WiFi</ex></ph> network
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_DETAIL" desc="Name of the settings page which displays network details.">
-      Network Details
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS" desc="Name of the settings page which displays the list of known networks.">
-      Known Networks
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_ADD_CONNECTION" desc="Settings &gt; Internet &gt; Add connection expanding section label.">
-      Add connection
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_ADD_CONNECTION_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the options for a new connection. Only visible by screen reader software.">
-      Add network connection
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_ADD_CONNECTION_NOT_ALLOWED" desc="Settings &gt; Internet &gt; Message when Add connection is not allowed.">
-      Add connection is disabled by your administrator
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_ADD_WIFI" desc="Settings &gt; Internet &gt; Add Wi-Fi label.">
-      Add Wi-Fi...
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_ADD_VPN" desc="Settings &gt; Internet &gt; Add VPN label.">
-      Add OpenVPN / L2TP...
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_ADD_THIRD_PARTY_VPN" desc="Settings &gt; Internet &gt; Add third party (Extension or ARC) VPN label">
-      Add <ph name="PROVIDER_NAME">$1<ex>VPN Demo</ex></ph>...
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_DEVICE_ENABLING" desc="Settings &gt; Internet &gt; Message when a device (e.g a Cellular modem) is enabling.">
-      Enabling
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_DEVICE_INITIALIZING" desc="Settings &gt; Internet &gt; Message when a device (e.g a Cellular modem) is initializing.">
-      Initializing
-    </message>
     <message name="IDS_SETTINGS_INTERNET_CONFIG_SHARE" desc="Settings &gt; Internet &gt; Network config: Label for setting allowing other device users to use the network configuration.">
       Allow other users of this device to use this network
     </message>
@@ -2209,39 +1007,6 @@
     <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_WPAD_NONE" desc="Settings &gt; Internet &gt; Network details: Value for Web Proxy Auto Discovery when no URL is provided.">
       Not provided
     </message>
-    <message name="IDS_SETTINGS_INTERNET_MOBILE_SEARCH" desc="Settings &gt; Internet &gt; Message in Mobile section when searching for mobile networks.">
-      Searching for mobile networks
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_ADVANCED" desc="Settings &gt; Internet &gt; Network details: Advanced section label.">
-      Advanced
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_ADVANCED_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the advanced network properties. Only visible by screen reader software.">
-      Show advanced network properties
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_NETWORK" desc="Settings &gt; Internet &gt; Network details: Network section label.">
-      Network
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_NETWORK_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the network address configuration settings. Only visible by screen reader software.">
-      Show network address settings
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_PROXY" desc="Settings &gt; Internet &gt; Network details: Proxy section label.">
-      Proxy
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_PROXY_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the proxy configuration settings. Only visible by screen reader software.">
-      Show proxy settings
-    </message>
-    <message name="IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING" desc="Settings &gt; Internet &gt; Network details: Toggle label to allow mobile data roaming.">
-      Allow mobile data roaming
-    </message>
-    <message name="IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING_ENABLED_HOME" desc="Settings &gt; Internet &gt; Network details: Toggle sublabel when roaming is allowed and it's connected to the home network.">
-      On, not roaming
-    </message>
-    <message name="IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING_ENABLED_ROAMING" desc="Settings &gt; Internet &gt; Network details: Toggle sublabel when roaming is allowed and it's connected to a roaming network">
-      On, roaming
-    </message>
-    <message name="IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING_DISABLED" desc="Settings &gt; Internet &gt; Network details: Toggle sublabel when roaming is not allowed.">
-      Roaming off
-    </message>
     <message name="IDS_SETTINGS_INTERNET_NETWORK_CHOOSE_MOBILE" desc="Settings &gt; Internet &gt; Network details: Label for control to choose a mobile data network.">
       Mobile data network
     </message>
@@ -2260,12 +1025,6 @@
     <message name="IDS_SETTINGS_INTERNET_NETWORK_CELLULAR_NO_NETWORKS" desc="Settings &gt; Internet &gt; Network details: Dropdown text when no cellular networks were found after a scan.">
       No networks
     </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_SHARED" desc="Settings &gt; Internet &gt; Network details: Text to show when a network is shared.">
-      Other users of this device can use this network.
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_PRIMARY_USER_CONTROLLED" desc="Settings &gt; Internet &gt; Network details: Text to show when a network configuration is controlled by the primary user.">
-      Network configuration is controlled by <ph name="USER_EMAIL">$1<ex>joe@gmail.com</ex></ph>.
-    </message>
     <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED_POLICY" desc="Settings &gt; Internet &gt; Network details: Text to show when a network proxy is policy enforced.">
       This proxy is enforced by your administrator
     </message>
@@ -2406,157 +1165,6 @@
     <message name="IDS_SETTINGS_INTERNET_NETWORK_SIM_ERROR_PIN_MISMATCH" desc="Settings &gt; Internet &gt; Network details &gt; Lock/unlock SIM card: Message when PIN values do not match.">
       PIN values do not match.
     </message>
-
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_PREFER" desc="Settings &gt; Internet &gt; Network details: Label for the checkbox determining whether a network is preferred over other networks.">
-      Prefer this network
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT" desc="Settings &gt; Internet &gt; Network details: Label for the checkbox determining whether to automatically connect to the network.">
-      Automatically connect to this network
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT_CELLULAR" desc="Settings &gt; Internet &gt; Mobile Data details: Label for the checkbox determining whether to automatically connect to the cellular network.">
-      Automatically connect to cellular network
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_ALWAYS_ON_VPN" desc="Settings &gt; Internet &gt; Network details: Label for the checkbox determining that all internet traffic has to go through this VPN (virtual private network), and all other network connections are blocked.">
-      Always connect through this VPN
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO" desc="Settings &gt; Internet &gt; Network details: Label for the checkbox determining whether to automatically configure the network IP config.">
-      Configure IP address automatically
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NETWORK_IP_ADDRESS" desc="Settings &gt; Internet &gt; Network details: Label for the network IP Address.">
-      IP Address
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_BUTTON_FORGET" desc="Settings &gt; Internet &gt; Network details: The label for the button to forget a network (remove from the list of known networks).">
-      Forget
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_BUTTON_VIEW_ACCOUNT" desc="Settings &gt; Internet &gt; Network details: The label for the button to view the account details for a Cellular network.">
-      View Account
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_BUTTON_ACTIVATE" desc="Settings &gt; Internet &gt; Network details: The label for the button to activate a Cellular network.">
-      Activate
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_BUTTON_CONFIGURE" desc="Settings &gt; Internet &gt; Network details: The label for the button to configure a network (change its settings).">
-      Configure
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_BUTTON_CONNECT" desc="Settings &gt; Internet &gt; Network details: The label for the button to connect to a network.">
-      Connect
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_BUTTON_DISCONNECT" desc="Settings &gt; Internet &gt; Network details: The label for the button to disconnect from a network.">
-      Disconnect
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_CONNECT_NOT_ALLOWED" desc="Settings &gt; Internet &gt; Message when connecting to a non policy network is not allowed.">
-      Connecting to this network is disabled by your administrator
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_BUTTON" desc="Text for button that opens the known networks subpage.">
-      Known networks
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_PREFFERED" desc="Title for list of preferred networks.">
-      Preferred networks
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_MESSAGE" desc="Message describing the behavior of the known networks page.">
-      Preferred networks will be preferred over other known networks if more than one is available
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_ALL" desc="Title for list of all other (non preferred) networks.">
-      All networks
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_MENU_ADD_PREFERRED" desc="Settings &gt; Internet &gt; Known networks &gt; Dropdown menu item to add a network to the list of preferred networks.">
-      Add to preferred
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_MENU_REMOVE_PREFERRED" desc="Settings &gt; Internet &gt; Known networks &gt; Dropdown menu item to remove a network from the list of preferred networks.">
-      Remove from preferred
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_MENU_FORGET" desc="Settings &gt; Internet &gt; Known networks &gt; Dropdown menu item to forget a known network.">
-      Forget
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_NO_NETWORKS" desc="Entry when there are no preferred networks or no networks of a particular type.">
-      None
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_WIFI_NETWORK_OUT_OF_RANGE" desc="Text shown when viewing the Wi-Fi network detail page when the currently-viewed Wi-Fi network has been lost (e.g., has gone out of range).">
-      Network out of range
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_CELLULAR_CONTACT_SPECIFIC_CARRIER" desc="Text shown when the Bravebook cannot connect to a cellular network, which alerts the user to contact a specific carrier.">
-      Trouble connecting. Please contact <ph name="CARRIER_NAME">$1<ex>Brave Fi</ex></ph> for assistance.
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_CELLULAR_CONTACT_DEFAULT_CARRIER" desc="Text shown when the Bravebook cannot connect to a cellular network, which alerts the user to contact their carrier.">
-      Trouble connecting. Please contact your carrier for assistance.
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_PHONE_OUT_OF_RANGE" desc="Text shown when viewing the Tether network detail page when the currently-viewed Tether network has been lost (e.g., has gone out of range). Because Tether networks are provided by Android phones, we use the word 'phone' here instead of 'network'.">
-      Unable to detect your phone
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_TITLE" desc="Title of the section which explains how to enable Google Play Services notifications on an Android phone in order to use Instant Tethering.">
-      To use Instant Tethering, turn on notifications for Google Play Services.
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_ONE_DEVICE_SUBTITLE" desc="Subtitle of the section which explains how to enable Google Play Services notifications. This subtitle is used when only one phone needs to have its notifications enabled.">
-      On your '<ph name="PHONE_NAME">$1<ex>Brave Pixel</ex></ph>':
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_TWO_DEVICES_SUBTITLE" desc="Subtitle of the section which explains how to enable Google Play Services notifications. This subtitle is used when two phones need to have their notifications enabled.">
-      On your '<ph name="PHONE_NAME_1">$1<ex>Brave Pixel</ex></ph>' and '<ph name="PHONE_NAME_2">$2<ex>Brave Pixel 2</ex></ph>':
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_MANY_DEVICES_SUBTITLE" desc="Subtitle of the section which explains how to enable Google Play Services notifications. This subtitle is used when three or more phones need to have their notifications enabled.">
-      On your devices:
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_FIRST_STEP" desc="First instruction for how to enable Google Play Services notifications on an Android phone. This step teaches the user how to look at notification settings.">
-      Go to Settings &gt; Apps &amp; notifications &gt; Notifications.
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_SECOND_STEP" desc="Second instruction for how to enable Google Play Services notifications on an Android phone. This step teaches the user how to look at notification settings for the Google Play Services app.">
-      Tap App notifications &gt; Google Play services.
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_THIRD_STEP" desc="Third instruction for how to enable Google Play Services notifications on an Android phone. This step teaches the user how to enable notifications when already viewing noticiations settings for Google Play Services.">
-      Turn on Google Play services.
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_GMSCORE_NOTIFICATIONS_FOURTH_STEP" desc="Fourth instruction for how to enable Google Play Services notifications on an Android phone. This step teaches the user how to enable the Instant Tethering notification channel for Google Play Services.">
-      Scroll to the bottom of the screen and turn on Instant Tethering, if it appears. If it doesn't, you're all set.
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_LOOKING_FOR_MOBILE_NETWORK" desc="Text shown when viewing the Mobile data page when there are no cellular or tether networks available.">
-      Looking for a mobile network. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_SUMMARY_BUTTON_ACCESSIBILITY_LABEL" desc="Accessibility only label for network summary item button that opens network details.">
-      <ph name="NETWORK_TYPE">$1<ex>Mobile Data</ex></ph> - <ph name="NETWORK_DISPLAY_NAME">$2<ex>Verizon Wireless</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DIALOG_TITLE" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Title asking the user to create a new hotspot.">
-      Connect to new hotspot?
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_AVAILABLE_DEVICE_TITLE" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Label for explaining that the device following the colon is available for tethering.">
-      Available device:
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_BATTERY_PERCENTAGE" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Description of how much battery a device has.">
-      <ph name="BATTERY_PERCENTAGE">$1<ex>100</ex></ph>% Battery
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_EXPLANATION" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Explanation of what will happen if the user connects to a tether hotspot.">
-      Your <ph name="PHONE_NAME">$1<ex>Brave Pixel XL</ex></ph> will create a private Wi-Fi connection.
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CARRIER_WARNING" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Warning to users that cellular providers may block the use of tethering.">
-      Some carriers might block this feature.
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_TITLE" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Title of the section describing what will happen when tethering is enabled.">
-      While the hotspot is on, your <ph name="PHONE_NAME">$1<ex>Brave Pixel XL</ex></ph> will:
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_MOBILE_DATA" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Bulletpoint alerting the user that tethering will use mobile data.">
-      Use mobile data
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_BATTERY" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Bullet point alerting the user that tethering will use both devices' batteries.">
-      Use the battery more quickly (currently <ph name="BATTERY_PERCENTAGE">$1<ex>100</ex></ph>%)
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_WIFI" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Bullet point alerting the user that the tether host (i.e., the device to which the current device will connect to) will disconnect from Wi-Fi.">
-      Disconnect from Wi-Fi
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_NOT_NOW_BUTTON" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Button which, when tapped, closes the dialog and does not connect the device.">
-      Not now
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CONNECT_BUTTON" desc="Settings &gt; Internet &gt; Tether Connection Dialog &gt; Button which, when tapped, starts a connection attempt to the device.">
-      Connect
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TOGGLE_TETHER_LABEL" desc="Settings &gt; Internet: Label for Tether enable/disable toggle .">
-      Get data connection
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TOGGLE_TETHER_SUBTEXT" desc="Settings &gt; Internet: Description for Tether enable/disable toggle .">
-      Let this device find other devices with your Brave Account that have a mobile data connection
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL" desc="Accessibility only label for mobile data enable/disable toggle .">
-      Mobile data enable
-    </message>
-    <message name="IDS_SETTINGS_INTERNET_TOGGLE_WIFI_ACCESSIBILITY_LABEL" desc="Accessibility only label for WiFi enable/disable toggle .">
-      Wi-Fi enable
-    </message>
   </if>
 
   <!-- Network error strings. -->
@@ -2893,21 +1501,8 @@
     Show language options
   </message>
   <if expr="chromeos">
-    <message name="IDS_SETTINGS_LANGUAGES_BROWSER_LANGUAGES_LIST_ORDERING_INSTRUCTIONS" desc="Explanatory message about ordering the list of languages.">
-      Add languages or reorder list.
-    </message>
-    <message name="IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_ORDERING_INSTRUCTIONS" desc="Explanatory message about ordering the list of languages.">
-      Add languages or reorder list. <ph name="BEGIN_LINK">&lt;a&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>
-    </message>
-    <!-- The non-Chrome OS string is in settings_google_chrome_strings.grdp -->
-    <message name="IDS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE" desc="The label for a language that is currently used as the UI display language.">
-      System text is shown in this language
-    </message>
-    <message name="IDS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE" desc="The label used for a button that changes the UI language.">
-      Show system text in this language
-    </message>
-    <message name="IDS_SETTINGS_LANGUAGES_RESTART_TO_DISPLAY_LANGUAGE" desc="The aria label to be read aloud to describe a button for restarting the device to change the device's UI language.">
-      Restart device to show system text in <ph name="LANGUAGE">$1<ex>English</ex></ph>
+    <message name="IDS_SETTINGS_LANGUAGES_BROWSER_LANGUAGES_LIST_ORDERING_INSTRUCTIONS" desc="Explanatory message about ordering the list of languages.">
+      Add languages or reorder list.
     </message>
   </if>
   <if expr="not chromeos">
@@ -2940,27 +1535,6 @@
     This language is used when translating pages
   </message>
   <if expr="chromeos">
-    <message name="IDS_SETTINGS_LANGUAGES_INPUT_METHODS_LIST_TITLE" desc="Title for the current input method in the header for the collapsible list of enabled input methods (keyboard layouts and input method editors).">
-      Input method
-    </message>
-    <message name="IDS_SETTINGS_LANGUAGES_INPUT_METHOD_ENABLED" desc="Label underneath the currently active input method in the list of enabled input methods.">
-      Enabled
-    </message>
-    <message name="IDS_SETTINGS_LANGUAGES_INPUT_METHODS_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the input options (keyboard and keyboard layouts). Only visible by screen reader software.">
-      Show input options
-    </message>
-    <message name="IDS_SETTINGS_LANGUAGES_INPUT_METHODS_MANAGED_BY_POLICY" desc="Label which is shown on the manage input methods page if input methods are managed by policy.">
-      Your administrator has limited the available input methods.
-    </message>
-    <message name="IDS_SETTINGS_LANGUAGES_INPUT_METHODS_MANAGE" desc="Button under the list of input methods which opens a sub-page that lets the user enable or disable keyboard layouts and input method editors.">
-      Manage input methods
-    </message>
-    <message name="IDS_SETTINGS_LANGUAGES_MANAGE_INPUT_METHODS_TITLE" desc="Name of the settings sub-page which allows enabling and disabling input methods.">
-      Manage input methods
-    </message>
-    <message name="IDS_SETTINGS_LANGUAGES_SHOW_IME_MENU" desc="The label for the toggle button controlling showing the IME menu in the shelf.">
-      Show input options in the shelf
-    </message>
     <message name="IDS_SETTINGS_LANGUAGES_KEYBOARD_APPS" desc="Title for the list of keyboard apps installed via Play Store by the user.">
       Keyboard apps
     </message>
@@ -3035,17 +1609,123 @@
   <message name="IDS_SETTINGS_PRIVACY_MORE" desc="Label on the expansion button to show more privacy settings.">
     More
   </message>
-  <message name="IDS_SETTINGS_LINKDOCTOR_PREF" desc="The documentation string of the 'Use Link Doctor' preference to help with navigation errors.">
-    Show suggestions for similar pages when a page can't be found
+
+  <!-- Safety check -->
+  <message name="IDS_SETTINGS_SAFETY_CHECK_SECTION_TITLE" desc="'Safety check' is a noun phrase (sentence case). 'Safety check' refers to an area of the Settings page where users can quickly check whether their safety-related settings are fully protecting them.">
+    Safety check
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_RUNNING" desc="A message shown for the safety check or its subelements when the corresponding checks are currently performed.">
+    Running...
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER" desc="A message shown on the top of the safety check feature, explaining to the user that it ran a moment ago.">
+    Safety check ran a moment ago
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_MINS" desc="A message shown on the top of the safety check feature, explaining to the user that it ran minutes ago.">
+    {NUM_MINS, plural,
+     =1 {Safety check ran 1 minute ago}
+     other {Safety check ran {NUM_MINS} minutes ago}}
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_HOURS" desc="A message shown on the top of the safety check feature, explaining to the user that it ran hours ago.">
+    {NUM_HOURS, plural,
+     =1 {Safety check ran 1 hour ago}
+     other {Safety check ran {NUM_HOURS} hours ago}}
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_TIME" desc="A message shown on the top of the safety check feature, showing to the user at which time it ran.">
+    Safety check ran at <ph name="TIME">$1<ex>14:30</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_TODAY" desc="A message shown on the top of the safety check feature, showing to the user that it ran today.">
+    Safety check ran today
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_YESTERDAY" desc="A message shown on the top of the safety check feature, showing to the user that it ran yesterday.">
+    Safety check ran yesterday
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_DAYS" desc="A message shown on the top of the safety check feature, showing to the user how many days ago it ran.">
+    {NUM_DAYS, plural,
+     =1 {Safety check ran 1 day ago}
+     other {Safety check ran {NUM_DAYS} days ago}}
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_DATE" desc="A message shown on the top of the safety check feature, showing to the user on which date it ran.">
+    Safety check ran on <ph name="DATE">$1<ex>April 1st, 2020</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_ARIA_LIVE_RUNNING" desc="A message read out to accessibility users that safety check is running.">
+    Safety check is running.
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_ARIA_LIVE_AFTER" desc="A message read out to accessibility users that safety check has completed.">
+    Safety check has completed.
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_BUTTON" desc="'Check' is a verb. By clicking this button, the user can quickly check whether their safety-related settings are fully protecting them.">
+    Check now
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_BUTTON_ARIA_LABEL" desc="Accessibility text for the button with which the user can quickly check whether their safety-related settings are fully protecting them.">
+    Run safety check now
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_ICON_RUNNING_ARIA_LABEL" desc="Accessibility text for a safety check child icon, that indicates that the child check is running.">
+    Running
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_ICON_SAFE_ARIA_LABEL" desc="Accessibility text for a safety check child icon, that indicates the child passed the check.">
+    Passed
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_ICON_INFO_ARIA_LABEL" desc="Accessibility text for a safety check child icon, that indicates info for the child check.">
+    Info
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_ICON_WARNING_ARIA_LABEL" desc="Accessibility text for a safety check child icon, that indicates a warning for the child check.">
+    Warning
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_PRIMARY_LABEL" desc="'Updates' is an element in safety check that shows the update status of Brave.">
+    Updates
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_DISABLED_BY_ADMIN" desc="This text describes that updates are managed by the administrator.">
+    Updates are managed by <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>your administrator<ph name="END_LINK">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_PRIMARY_LABEL" desc="'Passwords' is an element in safety check that allows users to check for their passwords being compromised.">
+    Passwords
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_BUTTON" desc="This button allows users to change their compromised passwords.">
+    {NUM_PASSWORDS, plural,
+     =1 {Change password}
+     other {Change passwords}}
   </message>
-  <message name="IDS_SETTINGS_LINKDOCTOR_PREF_DESC" desc="The description of the 'Use Link Doctor' preference to help with navigation errors.">
-    Sends the web address of the page you're trying to reach to Brave
+  <message name="IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_ENABLED" desc="This text points out that Safe Browsing is enabled and that the user is protected.">
+    Safe Browsing is on and protecting you from harmful sites and downloads
   </message>
-  <message name="IDS_SETTINGS_SUGGEST_PREF" desc="The documentation string of the 'Use Suggest' preference">
-    Autocomplete searches and URLs
+  <message name="IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DISABLED_BY_ADMIN" desc="This text points out that Safe Browsing is disabled by an administrator.">
+    <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Your administrator<ph name="END_LINK">&lt;/a&gt;</ph> has turned off Safe Browsing
   </message>
-  <message name="IDS_SETTINGS_SUGGEST_PREF_DESC" desc="The description of the 'Use Suggest' preference">
-    Sends some cookies and searches from the address bar and search box to your default search engine
+  <message name="IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DISABLED_BY_EXTENSION" desc="This text points out that Safe Browsing is disabled by an extension.">
+    An extension has turned off Safe Browsing
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_BUTTON" desc="This is the text for the button that allows users to manage their Safe Browsing settings.">
+    Manage
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_BUTTON_ARIA_LABEL" desc="Accessibility text for the button that allows users to manage their Safe Browsing settings.">
+    Manage Safe Browsing
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_PRIMARY_LABEL" desc="'Extensions' is an element in safety check that shows the safety check status of installed extensions.">
+    Extensions
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SAFE" desc="This text describes that the user is protected from potentially harmful extensions.">
+    You're protected from potentially harmful extensions
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BLOCKLISTED_OFF" desc="This text describes that potentially harmful extensions have been disabled. The placeholder will be a numeral.">
+    {NUM_EXTENSIONS, plural,
+     =1 {1 potentially harmful extension is off. You can also remove it.}
+     other {{NUM_EXTENSIONS} potentially harmful extensions are off. You can also remove them.}}
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BLOCKLISTED_ON_USER" desc="This text describes that the user has turned potentially harmful extensions back on. The placeholder will be a numeral.">
+    {NUM_EXTENSIONS, plural,
+     =1 {You turned 1 potentially harmful extension back on}
+     other {You turned {NUM_EXTENSIONS} potentially harmful extensions back on}}
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BLOCKLISTED_ON_ADMIN" desc="This text describes that an administrator has turned potentially harmful extensions back on.">
+    {NUM_EXTENSIONS, plural,
+     =1 {Your administrator turned 1 potentially harmful extension back on}
+     other {Your administrator turned {NUM_EXTENSIONS} potentially harmful extensions back on}}
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BUTTON" desc="This button allows users to review their extensions settings.">
+    Review
+  </message>
+  <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BUTTON_ARIA_LABEL" desc="Accessibility text for the button that allows users to review their extensions settings.">
+    Review extensions
   </message>
   <message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_LABEL" desc="In the advanced options tab, the text next to the checkbox that enables prediction of network actions.  Actions include browser-initiated DNS prefetching, TCP and SSL preconnection, and prerendering of webpages.">
     Preload pages for faster browsing and searching
@@ -3053,6 +1733,9 @@
   <message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESC" desc="In the advanced options tab, the secondary text next to the checkbox that enables prediction of network actions.">
     Uses cookies to remember your preferences, even if you don’t visit those pages
   </message>
+  <message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESC_COOKIES_PAGE" desc="On the cookies page, the secondary text next to the checkbox that enables prediction of network actions.">
+    Pre-fetches information from pages, including pages you have not yet visited. Information fetched may include cookies, if you allow cookies.
+  </message>
   <message name="IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION" desc="The section title of 'Protects you and your device from dangerous sites'">
     Google Safe Browsing (protects you and your device from dangerous sites)
   </message>
@@ -3062,26 +1745,62 @@
   <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING" desc="The section title of the extended safe browsing checkbox to help improve safe browsing">
     Help improve Brave security
   </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC" desc="Description for extended safe browsing">
+    Sends URLs of some pages you visit, limited system information, and some page content to Brave, to help discover new threats and protect everyone on the web.
+  </message>
   <message name="IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL" desc="The section label of the safe browsing section grouping safe browsing settings">
     Safe Browsing
   </message>
-  <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC" desc="Description for extended safe browsing">
-    To detect dangerous apps and sites, Brave sends URLs of some pages you visit, limited system information, and some page content to Brave
+  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED" desc="Label for safe browsing enhanced protection mode">
+    Enhanced protection
   </message>
-  <message name="IDS_SETTINGS_SPELLING_PREF" desc="The documentation string of the 'Use Spelling' preference">
-    Enhanced spell check
+  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_DESC" desc="Description of safe browsing enhanced protection mode">
+    Faster, proactive protection against dangerous websites, downloads, and extensions. Warns you about password breaches. Requires browsing data to be sent to Brave.
   </message>
-  <message name="IDS_SETTINGS_ENABLE_LOGGING_PREF" desc="The label of the checkbox to enable/disable crash and user metrics logging. This string does not need a Brave counter-part because it will only be visible if Brave-branded.">
-    Help improve Brave's features and performance
+  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_ONE" desc="First bullet point under the safe browsing enhanced protection mode">
+    Predicts and warns you about dangerous events before they happen
   </message>
-  <message name="IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC" desc="The description of the checkbox to enable/disable crash and user metrics logging">
-    Automatically sends crash reports to Brave
+  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_TWO" desc="Second bullet point under the safe browsing enhanced protection mode">
+    Keeps you safe on Brave and may be used to improve your security in other Brave apps when you are signed in
   </message>
-  <message name="IDS_SETTINGS_ENABLE_URL_KEYED_ANONYMIZED_DATA_COLLECTION" desc="The label of the checkbox to enable/disable url keyed anonymized data collection.">
-    Make searches and browsing better
+  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_THREE" desc="Third bullet point under the safe browsing enhanced protection mode">
+    Improves security for you and everyone on the web
   </message>
-  <message name="IDS_SETTINGS_ENABLE_URL_KEYED_ANONYMIZED_DATA_COLLECTION_DESC" desc="The description of the checkbox to enable/disable url keyed anonymized data collection.">
-    Sends URLs of pages you visit to Brave
+  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_FOUR" desc="Fourth bullet point under the safe browsing enhanced protection mode">
+    Warns you if passwords are exposed in a data breach
+  </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_FIVE" desc="Fourth bullet point under the safe browsing enhanced protection mode">
+    Sends URLs to Safe Browsing to check them. Also sends a small sample of pages, downloads, extension activity, and system information to help discover new threats. Temporarily links this data to your Brave Account when you're signed in, to protect you across Brave apps.
+  </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD" desc="Label for safe browsing standard protection mode">
+    Standard protection
+  </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC" desc="Description for safe browsing standard protection mode">
+    Standard protection against websites, downloads, and extensions that are known to be dangerous.
+  </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_ONE" desc="First bullet point under the safe browsing standard protection mode">
+    Detects and warns you about dangerous events when they happen
+  </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO" desc="First bullet point under the safe browsing standard protection mode">
+    Checks URLs with a list of unsafe sites stored in Brave. If a site tries to steal your password, or when you download a harmful file, Brave may also send URLs, including bits of page content, to Safe Browsing.
+  </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_HELP_IMPROVE" desc="The name of the toggle to enable reporting to help improve safe browsing">
+    Help improve security on the web for everyone
+  </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_NONE" desc="Label for safe browsing no protection mode">
+    No protection (not recommended)
+  </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_NONE_DESC" desc="Description for safe browsing no protection mode">
+    Does not protect you against dangerous websites, downloads, and extensions. You’ll still get Safe Browsing protection, where available, in other Brave services, like Gmail and Search.
+  </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_TITLE" desc="Title for the confirmation dialog to turn off SafeBrowsing">
+    Turn off Safe Browsing?
+  </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_DESC" desc="Description for the confirmation dialog to turn off SafeBrowsing">
+    Safe Browsing protects you against attackers who may trick you into doing something dangerous like installing malicious software or revealing personal information like passwords, phone numbers, or credit cards. If you turn it off, be careful when browsing unfamiliar or unreputable sites.
+  </message>
+  <message name="IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_CONFIRM" desc="Title for the confirmation dialog to turn off SafeBrowsing">
+    Turn off
   </message>
   <message name="IDS_SETTINGS_ENABLE_DO_NOT_TRACK" desc="The label of the checkbox to enable/disable sending the 'Do Not track' header">
     Send a "Do Not Track" request with your browsing traffic
@@ -3098,9 +1817,18 @@
   <message name="IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION" desc="In the settings tab, the text next to the checkbox for enabling quickly reconnecting to known Wi-Fi SSIDs.">
     Keep Wi-Fi on during sleep
   </message>
+  <message name="IDS_SETTINGS_PERMISSIONS" desc="Name of the settings page which allows users to manage permissions and site content settings">
+    Permissions and content settings
+  </message>
+  <message name="IDS_SETTINGS_PERMISSIONS_DESCRIPTION" desc="Description of the controls available on the permisisons and site content settings page">
+    Controls what information sites can use and show (location, camera, pop-ups, and more)
+  </message>
   <message name="IDS_SETTINGS_SECURITY" desc="Name of the settings page which allows   users to manage security settings">
     Security
   </message>
+  <message name="IDS_SETTINGS_SECURITY_DESCRIPTION" desc="Description of the controls available on the security settings page">
+    Safe Browsing (protection from dangerous sites) and other security settings
+  </message>
   <message name="IDS_SETTINGS_SECURITY_ADVANCED_SECTION_LABEL" desc="Name of the section in the     security settings page which groups advanced security settings">
     Advanced security
   </message>
@@ -3116,6 +1844,45 @@
   <message name="IDS_SETTINGS_MANAGE_CERTIFICATES_DESCRIPTION" desc="Secondary, continued explanation of how to manage SSL certificates and settings in Privacy options">
     Manage HTTPS/SSL certificates and settings
   </message>
+  <message name="IDS_SETTINGS_SECURE_DNS" desc="Text for secure DNS toggle in Privacy options">
+    Use secure DNS
+  </message>
+  <message name="IDS_SETTINGS_SECURE_DNS_DESCRIPTION" desc="Secondary, continued explanation of secure DNS in Privacy options">
+    Determines how to connect to websites over a secure connection
+  </message>
+  <message name="IDS_SETTINGS_AUTOMATIC_MODE_DESCRIPTION" desc="Text of the radio button that puts secure DNS in auto-upgrade mode">
+    With your current service provider
+  </message>
+  <message name="IDS_SETTINGS_AUTOMATIC_MODE_DESCRIPTION_SECONDARY" desc="Secondary, continued explanation of the radio button that puts secure DNS in auto-upgrade mode">
+    Secure DNS may not be available all the time
+  </message>
+  <message name="IDS_SETTINGS_SECURE_MODE_DESCRIPTION_ACCESSIBILITY_LABEL" desc="Accessibility label for the radio button that puts secure DNS in secure mode">
+    With a provider of your choice
+  </message>
+  <message name="IDS_SETTINGS_SECURE_DNS_DROPDOWN_ACCESSIBILITY_LABEL" desc="Accessibility label for the dropdown menu containing secure resolvers">
+    Provider options
+  </message>
+  <message name="IDS_SETTINGS_SECURE_DROPDOWN_MODE_DESCRIPTION" desc="Text of the radio button that allows a secure resolver to be selected from a dropdown menu">
+    With
+  </message>
+  <message name="IDS_SETTINGS_SECURE_DROPDOWN_MODE_PRIVACY_POLICY" desc="Text that displays a link to the privacy policy of the resolver selected from a dropdown menu">
+    See this provider's <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>privacy policy<ph name="END_LINK">&lt;/a&gt;</ph>
+  </message>
+  <message name="IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_MANAGED_ENVIRONMENT" desc="Substring of the secure DNS setting when secure DNS is disabled due to detection of a managed environment">
+    This setting is disabled on managed browsers
+  </message>
+  <message name="IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_PARENTAL_CONTROL" desc="Substring of the secure DNS setting when secure DNS is disabled due to detection of OS-level parental controls">
+    This setting is disabled because parental controls are on
+  </message>
+  <message name="IDS_SETTINGS_SECURE_DNS_CUSTOM_PLACEHOLDER" desc="Placeholder text for a textbox where users can enter a custom secure DNS provider">
+    Enter custom provider
+  </message>
+  <message name="IDS_SETTINGS_SECURE_DNS_CUSTOM_FORMAT_ERROR" desc="Error text for an incorrectly formatted entry for the custom secure DNS provider">
+    Enter a correctly formatted URL
+  </message>
+  <message name="IDS_SETTINGS_SECURE_DNS_CUSTOM_CONNECTION_ERROR" desc="Error text for a custom secure DNS provider entry to which a probe connection fails">
+    Please verify that this is a valid provider or try again later
+  </message>
   <message name="IDS_SETTINGS_CONTENT_SETTINGS" desc="Text of the button that takes a user to settings page thats allows users to modify site settings. Also the title of that settings page.">
     Content settings
   </message>
@@ -3140,6 +1907,48 @@
   <message name="IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT" desc="The description of the 'Sync and Brave services' row in the privacy section">
     More settings that relate to privacy, security, and data collection
   </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_NO_CHANGES" desc="Text shown to a user when they have not changed any site permissions instead of showing recently changed permissions">
+    No recently changed permissions
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_CHANGE_AUTOBLOCKED_SENTENCE_START" desc="An indicator that a specific permission has been automatically blocked by the browser, This will be used to start a sentence or by itself">
+    Automatically blocked <ph name="PERMISSION">$1<ex>Notifications</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_CHANGE_BLOCKED_SENTENCE_START" desc="An indicator that a specific permission has been blocked for a website by the user. This will be used to start a sentence or by itself">
+    Blocked <ph name="PERMISSION">$1<ex>Location</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_CHANGE_ALLOWED_SENTENCE_START" desc="An indicator that a specific permission has been allowed for a website by the user. This will be used to start a sentence or by itself">
+    Allowed <ph name="PERMISSION">$1<ex>Camera</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_CHANGE_AUTOBLOCKED" desc="An indicator that a specific permission has been automatically blocked by the browser, This will be used inside a sentance">
+    automatically blocked <ph name="PERMISSION">$1<ex>Notifications</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_CHANGE_BLOCKED" desc="An indicator that a specific permission has been blocked for a website by the user. This will be used inside a sentance">
+    blocked <ph name="PERMISSION">$1<ex>Location</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_CHANGE_ALLOWED" desc="An indicator that a specific permission has been allowed for a website by the user. This will be used inside of a sentance">
+    allowed <ph name="PERMISSION">$1<ex>Camera</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_TWO_ITEMS" desc="A list containing two permissions which have recently changed">
+    <ph name="RECENT_PERMISSIONS_CHANGE_SENTENCE_START">$1<ex>Automatically blocked Notifications</ex></ph>, <ph name="RECENT_PERMISSIONS_CHANGE">$2<ex>blocked Location</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_THREE_ITEMS" desc="A list containing three permissions which have recently changed">
+    <ph name="RECENT_PERMISSIONS_CHANGE_SENTENCE_START">$1<ex>Automatically blocked Notifications</ex></ph>, <ph name="RECENT_PERMISSIONS_CHANGE_1">$2<ex>blocked Location</ex></ph>, <ph name="RECENT_PERMISSIONS_CHANGE_2">$3<ex>allowed Camera</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_OVER_THREE_ITEMS" desc="A list containing three permissions that have recently changed, but indicating that more have also changed recently">
+    <ph name="RECENT_PERMISSIONS_CHANGE_SENTENCE_START">$1<ex>Automatically blocked Notifications</ex></ph>, <ph name="RECENT_PERMISSIONS_CHANGE_1">$2<ex>blocked Location</ex></ph>, <ph name="RECENT_PERMISSIONS_CHANGE_2">$3<ex>allowed Camera</ex></ph>, and more
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_ONE_ITEM_INCOGNITO" desc="A list containing a single permission which has recently changed in the users private session">
+    Current private session: <ph name="RECENT_PERMISSIONS_CHANGE_SENTENCE_START">$1<ex>automatically blocked Notifications</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_TWO_ITEMS_INCOGNITO" desc="A list containing two permissions which have recently changed in the users private session">
+    Current private session: <ph name="RECENT_PERMISSIONS_CHANGE_SENTENCE_START">$1<ex>automatically blocked Notifications</ex></ph>, <ph name="RECENT_PERMISSIONS_CHANGE_1">$2<ex>blocked Location</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_THREE_ITEMS_INCOGNITO" desc="A list containing three permissions which have recently changed in the users private session">
+    Current private session: <ph name="RECENT_PERMISSIONS_CHANGE_SENTENCE_START">$1<ex>automatically blocked Notifications</ex></ph>, <ph name="RECENT_PERMISSIONS_CHANGE_1">$2<ex>blocked Location</ex></ph>, <ph name="RECENT_PERMISSIONS_CHANGE_2">$3<ex>allowed Camera</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_RECENT_PERMISSIONS_OVER_THREE_ITEMS_INCOGNITO" desc="A list containing three permissions that have recently changed, but indicating that more have also changed recently">
+    Current private session: <ph name="RECENT_PERMISSIONS_CHANGE_SENTENCE_START">$1<ex>automatically blocked Notifications</ex></ph>, <ph name="RECENT_PERMISSIONS_CHANGE_1">$2<ex>blocked Location</ex></ph>, <ph name="RECENT_PERMISSIONS_CHANGE_2">$3<ex>allowed Camera</ex></ph>, and more
+  </message>
 
   <!-- Reset Settings Page -->
   <message name="IDS_SETTINGS_RESET" desc="Title for an item in the 'Reset and clean up' section of Brave Settings. If the user clicks this option, browser settings will be returned to their default values, after a confirmation by the user." meaning="Brave Cleanup feature. Try to use the same translation for 'Reset' in 'Reset and cleanup' string.">
@@ -3168,60 +1977,16 @@
     </message>
   </if>
 
-  <!-- Factory Reset / Powerwash -->
-  <if expr="chromeos">
-    <message name="IDS_SETTINGS_FACTORY_RESET" desc="Name of the factory reset option on the Brave settings page">
-      Powerwash
-    </message>
-    <message name="IDS_SETTINGS_FACTORY_RESET_HEADING" desc="Name of the 'Factory reset' window">
-      Restart your device
-    </message>
-    <message name="IDS_SETTINGS_FACTORY_RESET_DESCRIPTION" desc="Description of the factory reset option on the Brave settings page">
-      Remove all user accounts and reset your <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph> device to be just like new.
-    </message>
-    <message name="IDS_SETTINGS_FACTORY_RESET_WARNING" desc="Warning text in the 'Factory Reset' window">
-      A restart is required before your device can be reset with Powerwash. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_FACTORY_RESET_BUTTON_LABEL" desc="Label for the factory reset button.">
-      Reset
-    </message>
-    <message name="IDS_SETTINGS_FACTORY_RESET_BUTTON_ROLE" desc="A label to be read aloud by screen readers when the Reset button is focused. This button initiates the device factory reset flow.">
-      Reset Button
-    </message>
-  </if>
-
   <!-- Search Page -->
   <message name="IDS_SETTINGS_SEARCH" desc="Name of the settings page which displays search engine preferences.">
     Search engine
   </message>
-  <if expr="chromeos">
-    <message name="IDS_SETTINGS_SEARCH_AND_ASSISTANT" desc="Name of the settings page which displays search engine and assistant preferences on Chrome OS.">
-      Search and Assistant
-    </message>
-  </if>
   <message name="IDS_SETTINGS_SEARCH_EXPLANATION" desc="Explanation for the search engine dropdown setting.">
     Search engine used in the <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>address bar<ph name="END_LINK">&lt;/a&gt;</ph>
   </message>
   <message name="IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES" desc="Label for the Manage Search Engines button.">
     Manage search engines
   </message>
-<if expr="chromeos">
-  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT" desc="Label for the Brave Assistant button.">
-    Brave Assistant
-  </message>
-  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_ENABLED" desc="Sub label for the Brave Assistant button when Assistant is enabled.">
-    Enabled
-  </message>
-  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_DISABLED" desc="Sub label for the Brave Assistant button when Assistant is disabled.">
-    Disabled
-  </message>
-  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_ON" desc="Row label in Brave Assistant settings." meaning="Brave Assistant is on.">
-    On
-  </message>
-  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_OFF" desc="Row label in Brave Assistant settings." meaning="Brave Assistant is off.">
-    Off
-  </message>
-</if>
 
   <!-- Search Engines Page -->
   <message name="IDS_SETTINGS_SEARCH_ENGINES" desc="Name of the settings page which manages search engines.">
@@ -3270,52 +2035,6 @@
     Manage
   </message>
 
-  <!-- Brave Assistant Page -->
-<if expr="chromeos">
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT" desc="Name of the settings page for Brave Assistant.">
-    Brave Assistant
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD" desc="Title for a toggle that lets the assistant detect hotword.">
-    "Ok Brave"
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_DESCRIPTION" desc="Sub label for hotword-enable toggle.">
-    Access your Assistant when you say "Ok Brave."
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_WITHOUT_DSP_DESCRIPTION" desc="Sub label for hotword-enable dropdown without DSP support.">
-    Access your Assistant when you say "Ok Brave." To save battery, choose “On (Recommended.)” Your Assistant will respond only when your device is plugged in or charging.
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_WITHOUT_DSP_RECOMMENDED" desc="Default label for hotword-enable dropdown without DSP support.">
-    On (Recommended)
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_WITHOUT_DSP_ALWAYS_ON" desc="Always-on label for hotword-enable dropdown without DSP support.">
-    Always on
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_WITHOUT_DSP_OFF" desc="Off label for hotword-enable dropdown without DSP support." meaning="Ok Brave hotwording is disabled.">
-    Off
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_VOICE_SETTINGS" desc="Title for the Assistant voice settings.">
-    Voice match
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_VOICE_SETTINGS_RETRAIN" desc="Button label for retrain voice model.">
-    Retrain
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_NOTIFICATION" desc="Title for a toggle that lets the assistant show you notifications.">
-    Notifications
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_NOTIFICATION_DESCRIPTION" desc="Sub label for notification-enable toggle.">
-    Allow the Assistant to show you notifications
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_LAUNCH_WITH_MIC_OPEN" desc="Title for a toggle that determines whether to open the microphone when launching the Assistant.">
-    Preferred input
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_LAUNCH_WITH_MIC_OPEN_DESCRIPTION" desc="Sub label for launch-with-microphone-open toggle.">
-    Default to using voice instead of keyboard
-  </message>
-  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_SETTINGS" desc="Title for a button that opens the Brave Assistant app settings.">
-    Brave Assistant settings
-  </message>
-</if>
-
   <!-- Site Settings Page -->
   <message name="IDS_SETTINGS_EXCEPTIONS_EMBEDDED_ON_HOST" desc="Template text for a child row in the content Exceptions page view. Controls the permission setting for the parent page when embedded on the specified site.">
     embedded on <ph name="URL">$1<ex>www.google.com</ex></ph>
@@ -3353,18 +2072,17 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_ADS" desc="Label for the ads site settings.">
     Ads
   </message>
-  <!-- TODO(crbug.com/1041009): Finalize WebXr Permissions strings -->
   <message name="IDS_SETTINGS_SITE_SETTINGS_AR" desc="Label for the AR site settings.">
-    Augmented Reality
+    Augmented reality
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_AR_ASK" desc="The Ask label for the AR feature in site settings.">
-    Ask when a site wants to access your camera position or map your room
+    Ask when a site wants to create a 3D map of your surroundings or track camera position
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_AR_ASK_RECOMMENDED" desc="The Ask label for the AR feature in site settings (with the 'recommended' suffix).">
-    Ask when a site wants to access your camera position or map your room (recommended)
+    Ask when a site wants to create a 3D map of your surroundings or track camera position (recommended)
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_AR_BLOCK" desc="The Ask label for the AR feature in site settings (with the 'recommended' suffix).">
-    Do not allow sites to access your camera position or map your room
+    Do not allow sites to create a 3D map of your surroundings or track camera position
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS" desc="Label for the automatic downloads site settings.">
     Automatic downloads
@@ -3390,6 +2108,66 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_CLIPBOARD_BLOCK" desc="The block label for clipboard access in site settings.">
     Do not allow sites to see text and images copied to the clipboard
   </message>
+  <message name="IDS_SETTINGS_COOKIES_PAGE" desc="Title of the cookies settings page">
+    Cookies and other site data
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_CONTROLS" desc="Title of the general cookies control section.">
+    General settings
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_ALLOW_ALL" desc="Label for allow all cookies radio toggle">
+    Allow all cookies
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_ALLOW_ALL_BULLET_ONE" desc="Description for the first bullet of allow all cookies radio toggle">
+    Sites can use cookies to improve your browsing experience, for example, to keep you signed in or to remember items in your shopping cart
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_ALLOW_ALL_BULLET_TWO" desc="Description for the first bullet of allow all cookies radio toggle">
+    Sites can use cookies to see your browsing activity across different sites, for example, to personalize ads
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_BLOCK_THIRD_PARTY_INCOGNITO" desc="Label for block third party cookies in private radio toggle">
+    Block third-party cookies in Private
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_BLOCK_THIRD_PARTY_INCOGNITO_BULLET_ONE" desc="Description for the first bullet of block third party cookies in private radio toggle">
+    Sites can use cookies to improve your browsing experience, for example, to keep you signed in or to remember items in your shopping cart
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_BLOCK_THIRD_PARTY_INCOGNITO_BULLET_TWO" desc="Description for the first bullet of block third party cookies in private radio toggle">
+    While in private, sites can't use your cookies to see your browsing activity across different sites, for example, to personalize ads. Some sites may not work properly.
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_BLOCK_THIRD_PARTY" desc="Label for block third party cookies radio toggle">
+    Block third-party cookies
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_BLOCK_THIRD_PARTY_BULLET_ONE" desc="Description for the first bullet of block third party cookies radio toggle">
+    Sites can use cookies to improve your browsing experience, for example, to keep you signed in or to remember items in your shopping cart
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_BLOCK_THIRD_PARTY_BULLET_TWO" desc="Description for the first bullet of block third party cookies radio toggle">
+    Sites can't use your cookies to see your browsing activity across different sites, for example, to personalize ads.  Some sites may not work properly.
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_BLOCK_ALL" desc="Label for block all cookies radio toggle">
+    Block all cookies (not recommended)
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_BLOCK_ALL_BULLET_ONE" desc="Description for the first bullet of block all cookies radio toggle">
+    Sites can't use cookies to improve your browsing experience, for example, to keep you signed in or to remember items in your shopping cart
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_BLOCK_ALL_BULLET_TWO" desc="Description for the first bullet of block all cookies radio toggle">
+    Sites can't use your cookies to see your browsing activity across different sites, for example, to personalize ads
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_BLOCK_ALL_BULLET_THREE" desc="Description for the third bullet of block all cookies radio toggle">
+    Many sites may not work properly
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_CLEAR_ON_EXIT" desc="Label for the toggle that allows the user to automatically delete their cookies and site data when they close all browser windows.">
+    Clear cookies and site data when you close all windows
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_SITE_SPECIFIC_EXCEPTIONS" desc="Title of cookies page section for managing site specific cookie settings">
+    Manage site specific exceptions
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_ALLOW_EXCEPTIONS" desc="Title of the list containing site exceptions always allowing them to use cookies">
+    Sites that can always use cookies
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_SESSION_ONLY_EXCEPTIONS" desc="Title of the list containing site exceptions so that cookies for those site are always cleared when closing the browser">
+    Always clear cookies when windows are closed
+  </message>
+  <message name="IDS_SETTINGS_COOKIES_BLOCK_EXCEPTIONS" desc="Title of the list containing site exceptions always blocking them from using cookies">
+    Sites that can never use cookies
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES" desc="Label for the cookies and site data site settings.">
     Cookies and site data
   </message>
@@ -3465,18 +2243,17 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_ENABLE" desc="Label for the toggle enabling protected content.">
     Allow sites to play protected content (recommended)
   </message>
-  <!-- TODO(crbug.com/1041009): Finalize WebXr Permissions strings -->
   <message name="IDS_SETTINGS_SITE_SETTINGS_VR" desc="Label for the VR site settings.">
-    Virtual Reality
+    Virtual reality
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_VR_ASK" desc="The Ask label for the VR feature in site settings.">
-    Ask when a site wants to access your virtual reality devices/data
+    Ask when a site wants to use your virtual reality devices and data
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_VR_ASK_RECOMMENDED" desc="The Ask label for the VR feature in site settings (with the 'recommended' suffix).">
-    Ask when a site wants to access your virtual reality devices/data (recommended)
+    Ask when a site wants to use your virtual reality devices and data (recommended)
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_VR_BLOCK" desc="The Ask label for the VR feature in site settings (with the 'recommended' suffix).">
-    Do not allow sites to access your virtual reality devices/data
+    Do not allow sites to use your virtual reality devices and data
   </message>
   <if expr="chromeos or is_win">
     <message name="IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_IDENTIFIERS_EXPLANATION" desc="Text that is displayed on the Protected Content section of Content Settings. This text explains that enabling protected content may require using a uniquely identifiable machine identifier.">
@@ -3486,6 +2263,9 @@
       Allow identifiers for protected content (computer restart may be required)
     </message>
   </if>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_RECENT_ACTIVITY" desc="Label for the section which contains the user's recent permissions changes">
+    Recent activity
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS" desc="Label for the unsandboxed plugin access site settings.">
     Unsandboxed plugin access
   </message>
@@ -3510,6 +2290,18 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_MOTION_SENSORS" desc="Label for the motion sensors permission in Site Settings. Motion sensors are accelerometers, gyroscopes and magnetometers.">
     Motion sensors
   </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_DEVICES" desc="Label for Bluetooth devices in site settings.">
+    Bluetooth devices
+  </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_DEVICES_ASK" desc="The ask label for Bluetooth devices in site settings.">
+    Ask when a site wants to access Bluetooth devices
+  </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_DEVICES_ASK_RECOMMENDED" desc="The ask label for Bluetooth devices in site settings (with the 'recommended' suffix).">
+    Ask when a site wants to access Bluetooth devices (recommended)
+  </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_DEVICES_BLOCK" desc="The block label for Bluetooth devices in site settings.">
+    Do not allow any sites to access Bluetooth devices
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_USB_DEVICES" desc="Label for USB devices in site settings.">
     USB devices
   </message>
@@ -3600,6 +2392,24 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_SHOW_ALL_RECOMMENDED" desc="Label for the global 'Show all' toggle (category default) in site settings -- a recommended setting for some categories, such as when sites want to show images.">
     Show all (recommended)
   </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW" desc="The sub-label for links to manage cookies when the current cookie setting is allow.">
+    {COUNT, plural,
+     =0 {Cookies are allowed}
+     =1 {Cookies are allowed, 1 exception}
+     other {Cookies are allowed, {COUNT} exceptions}}
+  </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK" desc="The sub-label for links to manage cookies when the current cookie setting is allow.">
+    {COUNT, plural,
+     =0 {Cookies are blocked}
+     =1 {Cookies are blocked, 1 exception}
+     other {Cookies are blocked, {COUNT} exceptions}}
+  </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK_THIRD_PARTY" desc="The sub-label for links to manage cookies when the current cookie setting is to block third party cookies.">
+    Third-party cookies are blocked
+  </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK_THIRD_PARTY_INCOGNITO" desc="The sub-label for links to manage cookies when the current cookie setting is to block third party cookies in private.">
+    Third-party cookies are blocked in Private mode
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW_SITES" desc="The 'allow cookies' label in site settings.">
     Allow sites to save and read cookie data
   </message>
@@ -3748,6 +2558,15 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_PERMISSIONS" desc="The Permissions header, used to group together permissions, such as Geolocation, on the Site Details page.">
     Permissions
   </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_PERMISSIONS_MORE" desc="The text on the button used to toggle the display of additional permission settings.">
+    Additional permissions
+  </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_CONTENT" desc="The Content header, used to group together website content settings, such as Cookies and JavaScript on the Site Details page.">
+    Content
+  </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_CONTENT_MORE" desc="The text on the button used to toggle the display of additional content settings.">
+    Additional content settings
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_SOURCE_DRM_DISABLED" desc="A label shown when the protected content / protected media identifier permission on the Site Details page is disabled because the user has turned off using unique identifiers to access protected content.">
     To change this setting, first <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>turn on identifiers<ph name="END_LINK">&lt;/a&gt;</ph>
   </message>
@@ -3821,7 +2640,7 @@
     This will clear <ph name="TOTAL_USAGE">$1<ex>8 GB</ex></ph> of data stored by sites and installed apps.
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_ALL_STORAGE_SIGN_OUT" desc="Text for the dialog that warns about being signed out when clearing storage used by all sites.">
-    You'll be signed out of all sites, including in any open tabs.
+    You'll be signed out of all sites, including in open tabs.
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_DIALOG_TITLE" desc="Title of the dialog that warns about deleting all site data.">
     Clear site data
@@ -3881,10 +2700,10 @@
     Offline data in installed apps will also be cleared
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_ORIGIN_DELETE_CONFIRMATION" desc="Text for the dialog that warns about clearing all storage data for an origin.">
-    This will clear all data and cookies stored by <ph name="ORIGIN_NAME">$1<ex>https://www.google.co.uk</ex></ph>.
+    This will clear all data and cookies stored by <ph name="ORIGIN_NAME">$1<ex>www.example.com</ex></ph>.
   </message>
-  <message name="IDS_SETTINGS_SITE_SETTINGS_ORIGIN_DELETE_CONFIRMATION_INSTALLED" desc="Text for the dialog that warns about clearing all storage data for an origin that has an installed app.">
-    This will clear all data and cookies stored by <ph name="ORIGIN_NAME">$1<ex>https://www.google.co.uk</ex></ph> and its installed app.
+  <message name="IDS_SETTINGS_SITE_SETTINGS_ORIGIN_DELETE_CONFIRMATION_INSTALLED" desc="Text for the dialog that warns about clearing all storage data for an origin that has one or more installed apps.">
+    This will clear all data and cookies stored by <ph name="ORIGIN_NAME">$1<ex>www.example.com</ex></ph> and its installed apps.
   </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_MULTIPLE" desc="Text for the dialog that warns about deleting all site data.">
     This will delete any data stored on your device for all the sites shown. Do you want to continue?
@@ -3950,6 +2769,9 @@
     Do not allow any site to discover nearby Bluetooth devices
   </message>
 
+  <message name="IDS_SETTINGS_NO_BLUETOOTH_DEVICES_FOUND" desc="Explanation for not showing Bluetooth devices in site settings.">
+    No Bluetooth devices found
+  </message>
   <message name="IDS_SETTINGS_NO_USB_DEVICES_FOUND" desc="Explanation for not showing USB devices in site settings.">
     No USB devices found
   </message>
@@ -4015,7 +2837,7 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_NUM_COOKIES" desc="A label showing the number of cookies set on a site.">
     {NUM_COOKIES, plural,
         =1 {1 cookie}
-        other {# cookies}}
+        other {{NUM_COOKIES} cookies}}
   </message>
   <message name="IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL" desc="The Local Storage Origin label">
     Origin
@@ -4061,23 +2883,10 @@
   <message name="IDS_SETTINGS_PEOPLE" desc="Name of the settings page which manages the user's relationship to Brave.">
     You and Brave
   </message>
-  <message name="IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE" desc="Label for the button that opens the multi-profile user manager.">
-    Manage other profiles
-  </message>
   <message name="IDS_SETTINGS_CHANGE_PICTURE_PROFILE_PHOTO" desc="The text on the Brave profile photo of the user.">
     Brave Profile photo
   </message>
-  <message name="IDS_SETTINGS_PEOPLE_SIGN_OUT" desc="The label of the button that lets user sign-out of Brave.">
-    Sign out
-  </message>
-
   <if expr="chromeos">
-    <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE" desc="Message shown below the title that tells the user to enter the initial PIN.">
-      Enter your PIN
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE" desc="Message shown below the title that tells the user to confirm their initial PIN entry.">
-      Confirm your PIN
-    </message>
     <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN" desc="Message shown below the title that warns the user they have entered a PIN that is easy to guess.">
       PIN may be easy to guess
     </message>
@@ -4090,134 +2899,18 @@
     <message name="IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED" desc="Message shown below the title that tells the user they have entered two different PIN values.">
       PINs do not match
     </message>
-    <message name="IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK" desc="The text on the checkbox to enable screenlocker for current user.">
-      Show lock screen when waking from sleep
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE_LOCK" desc="Text on the profiles page which opens up the quick unlock subpage and the title of the quick unlock subpage.">
-      Screen lock
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE_LOGIN_LOCK" desc="Text on the profiles page which opens up the security and sign-in section.">
-      Security and sign-in
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_OPTIONS_LOCK" desc="Text on the lock screen which is the subheader for the screen locking options.">
-      Screen lock options
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_OPTIONS_LOGIN_LOCK" desc="Text on the lock screen which is the subheader for the screen locking options.">
-      Lock screen from sleep mode
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY" desc="Only the account password can be used to unlock the device.">
-      Password only
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD" desc="The account password or a custom PIN can be used to unlock the device.">
-      PIN or password
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE" desc="Text on the profiles page which notifies the user that the device will not show lock screen or prompt for auth after waking from sleep.">
-      Sign in automatically
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON" desc="Button that the user can click to change an existing already-active PIN.">
-      Change PIN
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON" desc="Button that is used to setup a new PIN when the user does not have a PIN yet.">
-      Set up PIN
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS" desc="Text on the lock screen which opens up the fingerprint subpage.">
-      Edit Fingerprints
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS_DESCRIPTION" desc="Secondary text on the lock screen which opens up the fingerprint subpage.">
-      Set up a faster way to unlock your device
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SETUP_BUTTON" desc="Text on the lock screen button which opens up the fingerprint subpage.">
-      Set up
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS" desc="Text on the lock screen which tells users how many fingerprints they have enrolled.">
-      <ph name="NUM_FINGERPRINTS">$1<ex>1</ex></ph> fingerprints set up
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE" desc="Title of the fingerprint subpage.">
-      Fingerprint
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL" desc="Text above fingerprint list that tells users their registered fingerprints.">
-      Saved fingerprints
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON" desc="Button that is used to add a new fingerprint.">
-      Add Fingerprint
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE" desc="Text telling users that fingerprints might be less secure than strong PINs or passwords.">
-      Note: Your fingerprint may be less secure than a strong password or PIN.
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_DELETE_FINGERPRINT_ARIA_LABEL" desc="Aria label for the button in the fingerprint subpage that deletes a registered fingerprint. Only visible by screen reader software.">
-      delete [<ph name="FINGERPRINT_NAME">$1<ex>Fingerprint 1</ex></ph>]
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME" desc="The default name (plus a number for a newly added fingerprint).">
-      Finger <ph name="NEW_FINGER_NUMBER">$1<ex>1</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_ADD_ACCOUNT_LABEL" desc="Label of the Add account button in Account Manager.">
-      Add account
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_DESCRIPTION" desc="Description of the Account Manager Settings page. Shown just below the title of the page.">
-      Manage your signed-in accounts. Websites, apps, and extensions in Brave and Google Play may use these accounts to customize your experience, depending on permissions. &lt;a&gt;Learn more&lt;/a&gt;
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_LIST_HEADER" desc="List header for Account List in Account Manager Settings page.">
-      Accounts
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_PAGE_TITLE" desc="Title of Account Manager Settings page.">
-      My accounts
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_SUBMENU_LABEL" desc="Label of Account Manager submenu in Settings page.">
-      Brave Accounts
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_PRIMARY_ACCOUNT_TOOLTIP" desc="Tooltip for the primary account in accounts list in Settings describing how to sign out.">
-      To sign out of the primary account on this device, click the time on your screen. In the menu that appears, click "Sign out".
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_SECONDARY_ACCOUNTS_DISABLED_TEXT" desc="Text for 'secondary accounts disabled' message in Settings page.">
-      Your administrator has disabled the addition of more Brave Accounts
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_SECONDARY_ACCOUNTS_DISABLED_CHILD_TEXT" desc="Text for 'secondary accounts disabled' message for child accounts in Settings page.">
-      Addition of more Brave Accounts is disabled
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_SIGNED_OUT_ACCOUNT_PLACEHOLDER" desc="Placeholder text for the full name of a signed out account in Account Manager.">
-      Sign in again
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_UNMIGRATED_ACCOUNT_PLACEHOLDER" desc="Placeholder text for the unmigrated account in Account Manager.">
-      Not updated yet
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_MORE_ACTIONS_TOOLTIP" desc="Tooltip text (shows on hover or for screenreaders) for a button that shows a menu with more actions when clicked or tapped.">
-      More actions, <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_MIGRATION_LABEL" desc="Label of the migration button on Account Manager Settings page.">
-      Update account
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_REAUTHENTICATION_LABEL" desc="Label of the re-authentication button on Account Manager Settings page.">
-      Sign in
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_MIGRATION_TOOLTIP" desc="Tooltip text (shows on hover or for screenreaders) for the migration button on Account Manager Settings page.">
-      Update account, <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_REAUTHENTICATION_TOOLTIP" desc="Tooltip text (shows on hover or for screenreaders) for the re-authentication button on Account Manager Settings page.">
-      Sign in, <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_REMOVE_ACCOUNT_LABEL" desc="Label of the Remove account button in Account Manager.">
-      Remove this account
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_MANAGEMENT_STATUS_MANAGED_ACCOUNT" desc="Management status label for managed accounts. This will be e.g. 'Managed by google.com' for Enterprise accounts and 'Managed by Family Link' for child accounts.">
-      Managed by <ph name="DOMAIN">$1<ex>google.com</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_MANAGEMENT_STATUS_UNMANAGED_ACCOUNT" desc="Management status label for unmanaged accounts.">
-      Primary account
-    </message>
     <message name="IDS_SETTINGS_ACCOUNT_MANAGER_ACCOUNT_REMOVED_MESSAGE" desc="Notification message after account removal.">
       <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph> was removed from this device
     </message>
-    <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_TITLE" desc="Title of the add fingerprint dialog popup.">
-      Set up your fingerprint
+    <message name="IDS_SETTINGS_ACCOUNT_MANAGER_EDUCATION_ACCOUNT" desc="Status label which indicates that specified account is a school/EDU account.">
+      School account
     </message>
-
     <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_POWER_BUTTON" desc="Text in the add fingerprint dialog telling users to place finger on the power button which is the sensor.">
       Touch the power button with your finger
     </message>
      <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_POWER_BUTTON_ARIA_LABEL" desc="Aria label in the add fingerprint dialog telling users that the fingerprint sensor is in the power button. Only visible by screen reader software.">
       The fingerprint sensor is in the power button. Touch it lightly with any finger.
     </message>
-
     <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_KEYBOARD" desc="Text in the add fingerprint dialog telling users to place finger on the sensor on the keyboard.">
       Touch the fingerprint sensor with your finger
     </message>
@@ -4230,108 +2923,17 @@
      <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_KEYBOARD_TOP_RIGHT_ARIA_LABEL" desc="Aria label in the add fingerprint dialog telling users that the fingerprint sensor is in the top right corner of the keyboard. Only visible by screen reader software.">
       The fingerprint sensor is the top right-hand key on your keyboard. Touch it lightly with any finger.
     </message>
-
-    <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_READY" desc="Text in the add fingerprint dialog that confirms user's fingerprint scan was successful.">
-      Fingerprint added.
-    </message>
-    <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_LIFT_FINGER" desc="Warning text in the add fingerprint dialog to tell users to lift their finger and touch the sensor again.">
-      Lift then try again.
-    </message>
-    <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_TRY_AGAIN" desc="Warning text in the add fingerprint dialog to tell users to try again.">
-      Try again.
-    </message>
-    <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_FINGER_IMMOBILE" desc="Warning text in the add fingerprint dialog to tell users they should move their finger slightly to capture different parts of the fingerprint.">
-      Move slightly to capture a different part of the fingerprint.
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE" desc="Title of the password prompt dialog popup.">
-      Confirm your password
-    </message>
-    <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_ADD_ANOTHER_BUTTON" desc="Text on the button in the fingerprint setup dialog which allows users to add another fingerprint once a fingerprint has been setup.">
-      Add another
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD_LOCK" desc="Text above a password input field that tells the user they need to submit their password to configure these settings.">
-      Enter your password to configure screen lock
-    </message>
-    <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD_LOGIN_LOCK" desc="Text above a password input field that tells the user they need to submit their password to configure security and sign-in settings.">
-      Enter your password to configure security and sign-in
-    </message>
     <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL" desc="An input box label that tells the user to enter their password in that input box.">
       Password
     </message>
     <message name="IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD" desc="Text on a password field that tells the user the password is incorrect.">
       Invalid password
     </message>
-    <message name="IDS_SETTINGS_CHANGE_PICTURE_DIALOG_TEXT" desc="Text with description of what to do on Change picture subpage.">
-      Choose a picture to display for your account on the sign-in screen
-    </message>
-    <message name="IDS_SETTINGS_CHANGE_PICTURE_CHOOSE_FILE" desc="Text on a button that shows file dialog to choose a picture from file.">
-      Choose a file
-    </message>
-    <message name="IDS_SETTINGS_CHANGE_PICTURE_TAKE_PHOTO" desc="The text on the button to take photo of the current user.">
-      Take photo
-    </message>
-    <message name="IDS_SETTINGS_CHANGE_PICTURE_CAPTURE_VIDEO" desc="The text on the button to capture video of the current user.">
-      Capture video
-    </message>
-    <message name="IDS_SETTINGS_CHANGE_PICTURE_DISCARD_PHOTO" desc="The text on the button to discard the captured photo or video of the current user.">
-      Discard photo or video
-    </message>
-    <message name="IDS_SETTINGS_PHOTO_CAPTURE_ACCESSIBLE_TEXT" desc="The accessible message to speak to announce that a photo was captured.">
-      Photo was captured
-    </message>
-    <message name="IDS_SETTINGS_PHOTO_DISCARD_ACCESSIBLE_TEXT" desc="The accessible message to speak to announce that a photo was discarded.">
-      Photo was discarded
-    </message>
-    <message name="IDS_SETTINGS_CHANGE_PICTURE_SWITCH_MODE_TO_CAMERA" desc="The text on the button to switch the mode of the camera to photo.">
-    Switch to camera mode
-    </message>
-    <message name="IDS_SETTINGS_CHANGE_PICTURE_SWITCH_MODE_TO_VIDEO" desc="The text on the button to switch the mode of the camera to video.">
-    Switch to video recorder
-    </message>
-    <message name="IDS_SETTINGS_PHOTO_MODE_ACCESSIBLE_TEXT" desc="The accessible message to speak to announce a switch to photo mode for camera.">
-      Photo mode entered
-    </message>
-    <message name="IDS_SETTINGS_VIDEO_MODE_ACCESSIBLE_TEXT" desc="The accessible message to speak to announce a switch to video mode for camera.">
-      Video mode entered
-    </message>
-    <message name="IDS_SETTINGS_CHANGE_PICTURE_PREVIEW_ALT" desc="Alt text for the big preview of user image.">
-      User image preview
-    </message>
-    <message name="IDS_SETTINGS_CHANGE_PICTURE_AUTHOR_CREDIT_TEXT" desc="Label in the profile picture picker for the photo credit for the selected image.">
-      Photo by <ph name="NAME">$1<ex>John Doe</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_CHANGE_PICTURE_OLD_PHOTO" desc="The text on the existing photo, which was either taken by the webcam or read from a file.">
-      Existing photo from camera or file
-    </message>
-    <message name="IDS_SETTINGS_CHANGE_PICTURE_OLD_VIDEO" desc="The text on the existing video, which was either taken by the webcam or read from a file.">
-      Existing video from camera or file
-    </message>
   </if>
 
   <message name="IDS_SETTINGS_PEOPLE_SIGN_IN" desc="The label of the button that lets user sign-in to chrome.">
     Sign in
   </message>
-  <message name="IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT" desc="The text displayed to prompt users to sign in to chrome.">
-    Get Brave smarts in Brave
-  </message>
-  <message name="IDS_SETTINGS_PEOPLE_SYNC_ANOTHER_ACCOUNT" desc="The label for the button that lets the user choose another account to sync with.">
-    Use another account
-  </message>
-  <message name="IDS_SETTINGS_PEOPLE_SYNCING_TO_ACCOUNT" desc="The text displayed to the user that the profile is currently syncing to a specific account.">
-    Syncing to <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph>
-  </message>
-  <message name="IDS_SETTINGS_PEOPLE_SYNC_TURN_OFF" desc="The label for the button that lets the user turn off profile syncing with their gaia account.">
-    Turn off
-  </message>
-  <message name="IDS_SETTINGS_PEOPLE_SYNC_NOT_WORKING" desc="The label informing the user that sync is currently not working.">
-    Sync isn't working
-  </message>
-  <message name="IDS_SETTINGS_PEOPLE_SYNC_PASSWORDS_NOT_WORKING" desc="The label informing the user that password sync is currently not working.">
-    Error syncing passwords
-  </message>
-  <message name="IDS_SETTINGS_PEOPLE_SYNC_PAUSED" desc="The label informing the user that sync is currently paused.">
-    Sync is paused
-  </message>
   <message name="IDS_SETTINGS_SYNC_DISCONNECT_MANAGED_PROFILE_EXPLANATION" desc="The text to display in the 'Sign out of Brave' dialog to stop syncing for managed profiles.">
     Because this account is managed by <ph name="DOMAIN">$1<ex>example.com</ex></ph>, your bookmarks, history, passwords, and other settings will be cleared from this device. However, your data will remain stored in your Brave Account and can be managed on <ph name="BEGIN_LINK">&lt;a href="$2" target="_blank"&gt;<ex>&lt;a href="$2" target="_blank"&gt;</ex></ph>Brave Dashboard<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>.
   </message>
@@ -4357,76 +2959,24 @@
     </message>
   </if>
 
-  <message name="IDS_SETTINGS_SYNC_OVERVIEW" desc="The message that appears in the options dialog when sync has not been set up by the user.">
-    Sign in to get your bookmarks, history, passwords, and other settings on all your devices. You'll also automatically be signed in to your Brave services. <ph name="LINK_BEGIN">&lt;a&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-  </message>
   <message name="IDS_SETTINGS_SYNC_DISCONNECT_EXPLANATION" desc="The text to display in the Sign out of Brave dialog to stop syncing for non-managed profiles.">
     Changes to your bookmarks, history, passwords, and other settings will no longer be synced to your Brave Account. However, your existing data will remain stored in your Brave Account and can be managed on <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank"&gt;<ex>&lt;a href="$1" target="_blank"&gt;</ex></ph>Brave Dashboard<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>.
   </message>
-  <message name="IDS_SETTINGS_SYNC_DISCONNECT_AND_SIGN_OUT_EXPLANATION" desc="The text to display in the Sign out of Brave dialog to stop syncing and sign-out for non-managed profiles.">
-    This will sign you out of your Brave Accounts. Your bookmarks, history, passwords, and more will no longer be synced.
-  </message>
-  <message name="IDS_SETTINGS_SYNC_DISCONNECT_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button in the Sign out of Brave dialog that toggles showing the profile stats. Only visible by screen reader software.">
-    Show profile stats
-  </message>
-  <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE" desc="The text to display by the checkbox asking user whether to also delete profile when stopping sync.">
-    Also remove your existing data from this device
-  </message>
-  <message name="IDS_SETTINGS_SYNC_DISCONNECT_CONFIRM" desc="The text to display on the button to confirm the user wishes to stop syncing.">
-    Clear and Sign Out
-  </message>
-
-  <message name="IDS_SETTINGS_SYNC" desc="Name of the sync service.">
-    Sync
-  </message>
-  <message name="IDS_SETTINGS_NON_PERSONALIZED_SERVICES_SECTION_LABEL" desc="Title for a section that shows options for various Brave services">
-    Other Brave services
-  </message>
-  <message name="IDS_SETTINGS_SYNC_SYNC_AND_NON_PERSONALIZED_SERVICES" desc="The name of the settings page and the label of the button that takes the user to manage their sync and non-personalized services settings.">
-    Sync and Brave services
+  <message name="IDS_SETTINGS_SYNC_DISCONNECT_AND_SIGN_OUT_EXPLANATION" desc="The text to display in the Sign out of Brave dialog to stop syncing and sign-out for non-managed profiles.">
+    This will sign you out of your Brave Accounts. Your bookmarks, history, passwords, and more will no longer be synced.
   </message>
-  <message name="IDS_SETTINGS_SYNC_ADVANCED_PAGE_TITLE" desc="Name of the settings page which manages data used by sync.">
-    Manage sync
+  <message name="IDS_SETTINGS_SYNC_DISCONNECT_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button in the Sign out of Brave dialog that toggles showing the profile stats. Only visible by screen reader software.">
+    Show profile stats
   </message>
-  <message name="IDS_SETTINGS_SYNC_LOADING" desc="The message shown when waiting for the sync backend to start up.">
-    Please wait...
+  <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE" desc="The text to display by the checkbox asking user whether to also delete profile when stopping sync.">
+    Also remove your existing data from this device
   </message>
   <message name="IDS_SETTINGS_SYNC_WILL_START" desc="The message to tell users that sync will start once they leave the sync setup page.">
     Sync will start once you leave sync settings
   </message>
-  <message name="IDS_SETTINGS_SYNC_SETTINGS_CANCEL_SYNC" desc="The label of button that allows user to cancel sync.">
-    Cancel sync
-  </message>
-  <message name="IDS_SETTINGS_SYNC_SETUP_CANCEL_DIALOG_TITLE" desc="The title of the dialog to confirm the sync cancellation.">
-    Cancel sync?
-  </message>
-  <message name="IDS_SETTINGS_SYNC_SETUP_CANCEL_DIALOG_BODY" desc="The body text of the dialog to confirm the sync cancellation.">
-    You can turn on sync anytime in settings
-  </message>
-  <message name="IDS_SETTINGS_SYNC_TIMEOUT" desc="Text explaining what to do if sync times out.">
-    Check your internet connection. If the problem continues, try signing out and signing in again.
-  </message>
-  <message name="IDS_SETTINGS_SYNC_EVERYTHING_CHECKBOX_LABEL" desc="Label for the checkbox which causes all properties to be synced.">
-    Sync everything
-  </message>
   <message name="IDS_SETTINGS_MANAGE_GOOGLE_ACCOUNT" desc="Label for the button that takes the user to the Brave Account website.">
     Manage your Brave Account
   </message>
-  <message name="IDS_SETTINGS_APPS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing apps between multiple browser instances.">
-    Apps
-  </message>
-  <message name="IDS_SETTINGS_EXTENSIONS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing extensions between multiple browser instances.">
-    Extensions
-  </message>
-  <message name="IDS_SETTINGS_SETTINGS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing settings between multiple browser instances.">
-    Settings
-  </message>
-  <message name="IDS_SETTINGS_AUTOFILL_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing autofill settings between multiple browser instances.">
-    Addresses, phone numbers, and more
-  </message>
-  <message name="IDS_SETTINGS_HISTORY_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing history between multiple browser instances.">
-    History
-  </message>
 <if expr="chromeos">
   <message name="IDS_SETTINGS_THEMES_AND_WALLPAPERS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing themes and wallpapers between multiple browser instances.">
     Themes &amp; Wallpapers
@@ -4440,18 +2990,6 @@
     Themes
   </message>
 </if>
-  <message name="IDS_SETTINGS_BOOKMARKS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing bookmarks between multiple browser instances.">
-    Bookmarks
-  </message>
-  <message name="IDS_SETTINGS_PASSWORDS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing passwords between multiple browser instances.">
-    Passwords
-  </message>
-  <message name="IDS_SETTINGS_OPEN_TABS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing open tabs between multiple browser instances.">
-    Open Tabs
-  </message>
-  <message name="IDS_DRIVE_SUGGEST_PREF" desc="The documentation string of the 'Show Drive Results in Omnibox' preference - short description">
-    Google Drive search suggestions
-  </message>
   <message name="IDS_SETTINGS_USER_EVENTS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables recording user events.">
     Activity and interactions
   </message>
@@ -4460,18 +2998,6 @@
   </message>
   <message name="IDS_SETTINGS_MANAGE_SYNCED_DATA_TITLE" desc="Title for the link to manage Brave Sync data via Brave Dashboard.">
     Manage synced data on Brave Dashboard
-  </message>
-   <message name="IDS_SETTINGS_MANAGE_SYNCED_DATA_TITLE_UNIFIED_CONSENT" desc="Title for the link to manage Brave Sync data via Brave Dashboard when unified consent is enabled.">
-    Data from Brave sync
-  </message>
-  <message name="IDS_SETTINGS_EXISTING_PASSPHRASE_TITLE" desc="Title for the section where the user enters the passphrase.">
-    Encryption options
-  </message>
-  <message name="IDS_SETTINGS_ENCRYPTION_OPTIONS" desc="Title for the section which includes options for encrypting sync settings.">
-    Encryption options
-  </message>
-  <message name="IDS_SETTINGS_ENCRYPT_WITH_GOOGLE_CREDENTIALS_LABEL" desc="Label for the radio button which, when selected, causes synced settings to be encrypted with the Brave login for the current browser profile.">
-    Encrypt synced passwords with your Brave username and password
   </message>
   <message name="IDS_SETTINGS_ENCRYPT_WITH_SYNC_PASSPHRASE_LABEL" desc="Label for the radio button which, when selected, causes synced settings to be encrypted with a user-provided password.">
     Encrypt synced data with your own <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank"&gt;<ex>&lt;a href="$1" target="_blank"&gt;</ex></ph>sync passphrase<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>. This doesn't include payment methods and addresses from Brave Pay.
@@ -4485,54 +3011,12 @@
   <message name="IDS_SETTINGS_PASSPHRASE_RESET_HINT_TOGGLE" desc="Informs user how to change their encryption setting when unified consent is enabled.">
     To turn this on, <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank"&gt;<ex>&lt;a href="$1" target="_blank"&gt;</ex></ph>reset sync<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph> to remove your sync passphrase
   </message>
-  <message name="IDS_SETTINGS_EMPTY_PASSPHRASE_ERROR" desc="Error message when the passphrase is empty.">
-    Empty passphrase is not allowed
-  </message>
-  <message name="IDS_SETTINGS_MISMATCHED_PASSPHRASE_ERROR" desc="Error message when the passphrase and confirmation don't match.">
-    You must enter the same passphrase twice
-  </message>
-  <message name="IDS_SETTINGS_INCORRECT_PASSPHRASE_ERROR" desc="Message when the passphrase is incorrect.">
-    The passphrase you entered is incorrect
-  </message>
   <message name="IDS_SETTINGS_PASSPHRASE_RECOVER" desc="Message about how to recover from a lost passphrase.">
     If you forgot your passphrase or want to change this setting, <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank"&gt;<ex>&lt;a href="$1" target="_blank"&gt;</ex></ph>reset sync<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>.
   </message>
-  <message name="IDS_SETTINGS_PASSPHRASE_PLACEHOLDER" desc="Placeholder for the passphrase field.">
-    Passphrase
-  </message>
-  <message name="IDS_SETTINGS_PASSPHRASE_CONFIRMATION_PLACEHOLDER" desc="Placeholder for the confirm-passphrase field.">
-    Confirm passphrase
-  </message>
-  <message name="IDS_SETTINGS_SUBMIT_PASSPHRASE" desc="Text for the button which, when clicked, submits a sync password for verification.">
-    Submit
-  </message>
-  <message name="IDS_SETTINGS_USE_DEFAULT_SETTINGS" desc="Text for button which, when clicked, activates the default sync settings.">
-    Use default settings
-  </message>
   <message name="IDS_SETTINGS_PERSONALIZE_GOOGLE_SERVICES_TITLE" desc="Title of the personalize Brave services section. When clicked, takes the user to the Brave Activity Controls.">
     Control how your browsing history is used to personalize Search, ads, and more
   </message>
-  <message name="IDS_SETTINGS_USE_HISTORY_TO_PERSONALIZE_GOOGLE_SERVICES_TITLE" desc="Title of the use your history to personalize Brave services section. When clicked, takes the user to the Brave Activity Controls." translateable="false">
-    Use your History to personalize Search and other Brave services
-  </message>
-  <message name="IDS_SETTINGS_SWAA_ON" desc="The sWAA state that shows in the use history to personalize google services row" translateable="false">
-    On
-  </message>
-  <message name="IDS_SETTINGS_SWAA_OFF" desc="The sWAA state that shows in the use history to personalize google services row" translateable="false">
-    Off
-  </message>
-  <message name="IDS_SETTINGS_SWAA_ON_HINT" desc="Hint that shows when sWAA is On in the use history to personalize google services row" translateable="false">
-    For example, get suggestions in YouTube based on Brave browsing
-  </message>
-  <message name="IDS_SETTINGS_DATA_ENCRYPTED_HINT" desc="Hint that shows when sWAA is off in the use history to personalize google services row because data is encrypted with custom passphrase" translateable="false">
-    Your synced data was encrypted
-  </message>
-   <message name="IDS_SETTINGS_HISTORY_SYNC_OFF_HINT" desc="Hint that shows when sWAA is off in the use history to personalize google services row because history sync is off" translateable="false">
-    Turned off because you disabled syncing history
-  </message>
-   <message name="IDS_SETTINGS_SWAA_OFF_HINT" desc="Hint that shows when sWAA is off in the use history to personalize google services row because history recording is disabled in Web and App Activity" translateable="false">
-    History recording is turned off in Activity controls.
-   </message>
 
   <if expr="not chromeos">
     <!-- Import Settings Dialog -->
@@ -4579,62 +3063,6 @@
     </message>
   </if>
 
-  <!-- Users Page -->
-  <if expr="chromeos">
-    <message name="IDS_SETTINGS_USERS_MODIFIED_BY_OWNER_LABEL" desc="Label saying settings may only be modified by the device owner.">
-      These settings may only be modified by the owner:
-    </message>
-    <message name="IDS_SETTINGS_USERS_MANAGED_LABEL" desc="Label saying settings is managed by enterprise and thus can't be modified.">
-      These settings are controlled by enterprise policy. Please contact your administrator for more information.
-    </message>
-    <message name="IDS_SETTINGS_USERS_GUEST_BROWSING_LABEL" desc="Label for the guest browsing setting.">
-      Enable Guest browsing
-    </message>
-    <message name="IDS_SETTINGS_USERS_SHOW_ON_SIGNIN_LABEL" desc="Label for the 'show users on sign-in screen' setting.">
-      Show usernames and photos on the sign-in screen
-    </message>
-    <message name="IDS_SETTINGS_USERS_RESTRICT_SIGNIN_LABEL" desc="Label for the setting for restricting sign in to specific users.">
-      Restrict sign-in to the following users:
-    </message>
-    <message name="IDS_SETTINGS_USERS_DEVICE_OWNER_LABEL" desc="Label for a user who is the device owner.">
-      <ph name="USER_NAME">$1<ex>John Smith</ex></ph> (owner)
-    </message>
-    <message name="IDS_SETTINGS_USERS_REMOVE_USER_TOOLTIP" desc="Tooltip for the button that removes a user from the list of restricted sign in users.">
-      Remove <ph name="USER_NAME">$1<ex>John Smith</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_USERS_ADD_USERS" desc="Label the dialog for adding users.">
-      Add user
-    </message>
-    <message name="IDS_SETTINGS_USERS_ADD_USERS_EMAIL" desc="Label for the email input field for adding users.">
-      Email address
-    </message>
-    <message name="IDS_SETTINGS_USER_EXISTS_ERROR" desc="Error message for attempting to add a user that already exists">
-      This user already exists
-    </message>
-  </if>
-
-  <!-- Parental Controls -->
-  <if expr="chromeos">
-    <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_TITLE" desc="Name of the settings page which manages BraveOS's parental controls.">
-      Parental controls
-    </message>
-    <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_SET_UP_LABEL" desc="Label/description of the settings page which manages BraveOS's parental controls.">
-      Set website restrictions &amp; screen time limits with Family Link
-    </message>
-    <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_CONNECT_TO_INTERNET_LABEL" desc="Label/description shown when the Parental control setup can't be launched because there is no Internet Connection.">
-      Connect to the internet to set up parental controls
-    </message>
-    <message name="IDS_SETTINGS_PARENTAL_CONTROLS_PAGE_VIEW_SETTINGS_LABEL" desc="Label/description of the settings page which manages BraveOS's parental controls.">
-      Open the Family Link app to see your supervision settings
-    </message>
-    <message name="IDS_SETTINGS_PARENTAL_CONTROLS_SET_UP_BUTTON_LABEL" desc="Label/description of the button which launches page which enables BraveOS's parental controls.">
-      Set up
-    </message>
-    <message name="IDS_SETTINGS_PARENTAL_CONTROLS_SET_UP_BUTTON_ROLE" desc="Role description of the button which launches page which enables BraveOS's parental controls. Spoken aloud by screen readers when the Set Up button is focused">
-      Set up button
-    </message>
-  </if>
-
   <!-- Add Supervision Dialog Strings -->
   <if expr="chromeos">
     <message name="IDS_SETTINGS_CLOSE_ADD_SUPERVISION_DIALOG_TITLE" desc="Title of dialog shown when a user closes the Add Supervision dialog after an account has been converted to use supervision.">
@@ -4649,9 +3077,6 @@
   </if>
 
   <!-- Web Content -->
-  <message name="IDS_SETTINGS_WEB_CONTENT" desc="Title for the web content settings.">
-    Web content
-  </message>
   <message name="IDS_SETTINGS_PAGE_ZOOM_LABEL" desc="Label for the page zoom dropdown menu in settings.">
     Page zoom
   </message>
@@ -4673,9 +3098,6 @@
   <message name="IDS_SETTINGS_VERY_LARGE_FONT" desc="The very large choice in the font size dropdown menu in settings.">
     Very large
   </message>
-  <message name="IDS_SETTINGS_CUSTOM" desc="Label for the custom font size setting.">
-    Custom
-  </message>
   <message name="IDS_SETTINGS_CUSTOMIZE_FONTS" desc="Label for the customize fonts button in settings.">
     Customize fonts
   </message>
@@ -4703,468 +3125,9 @@
   <message name="IDS_SETTINGS_HUGE_FONT_SIZE" desc="The large end of the minimum font size slider in settings.">
     Huge
   </message>
-  <message name="IDS_SETTINGS_LOREM_IPSUM" desc="Gibberish example text in settings.">
-    Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-  </message>
-  <message name="IDS_SETTINGS_LOADING" desc="Placeholder text while waiting for font settings to appear, shown only until font settings have loaded.">
-    Loading...
-  </message>
-  <message name="IDS_SETTINGS_ADVANCED_FONT_SETTINGS" desc="Label for advanced font settings.">
-    Advanced font settings
-  </message>
-  <message name="IDS_SETTINGS_OPEN_ADVANCED_FONT_SETTINGS" desc="Sub-label for opening advanced font extension options.">
-   Open extension options
-  </message>
   <message name="IDS_SETTINGS_QUICK_BROWN_FOX" desc="Example text to see a font style and size sample.  The quick brown fox sentence is a playful way to show all 26 English letters.  Any example text will do.  There is no need to translate this exactly.">
     The quick brown fox jumps over the lazy dog
   </message>
-  <message name="IDS_SETTINGS_REQUIRES_WEB_STORE_EXTENSION" desc="Sub-label for advanced font settings explaining that an extension from the Web Store is required.">
-    Requires extension from the Web Store
-  </message>
-
-  <!-- Device Page -->
-  <if expr="chromeos">
-    <message name="IDS_SETTINGS_DEVICE_TITLE" desc="Name of the settings page which displays device and peripheral settings.">
-      Device
-    </message>
-    <message name="IDS_SETTINGS_MOUSE_TITLE" desc="In Device Settings, the title of the mouse settings subpage.">
-      Mouse
-    </message>
-    <message name="IDS_SETTINGS_TOUCHPAD_TITLE" desc="In Device Settings, the title of the touchpad settings subpage.">
-      Touchpad
-    </message>
-    <message name="IDS_SETTINGS_MOUSE_AND_TOUCHPAD_TITLE" desc="In Device Settings, the title of the mouse and touchpad settings subpage (when the user has both types of devices).">
-      Mouse and touchpad
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_TITLE" desc="In Device Settings, the title of the keyboard settings subpage.">
-      Keyboard
-    </message>
-    <!-- Touchpad -->
-    <message name="IDS_SETTINGS_TOUCHPAD_TAP_TO_CLICK_ENABLED_LABEL" desc="In Device Settings, the text next to the checkbox that allows tapping the touchpad to work as a click.">
-      Enable tap-to-click
-    </message>
-    <message name="IDS_SETTINGS_TOUCHPAD_SPEED_LABEL" desc="In Device Settings, the text next to the slider that sets the speed (sensitivity) of the touchpad.">
-      Touchpad speed
-    </message>
-    <message name="IDS_SETTINGS_POINTER_SPEED_SLOW_LABEL" desc="In Device Settings, the text under the left (less sensitive) side of the slider for the pointer (mouse/touch) speed (sensitivity).">
-      Slow
-    </message>
-    <message name="IDS_SETTINGS_POINTER_SPEED_FAST_LABEL" desc="In Device Settings, the text under the right (more sensitive) side of the slider for the pointer (mouse/touchpad) speed (sensitivity).">
-      Fast
-    </message>
-    <message name="IDS_SETTINGS_SCROLL_LABEL" desc="In Device Settings, the title above the radio buttons to choose the scrolling behavior.">
-      Scrolling
-    </message>
-    <!-- Mouse -->
-    <message name="IDS_SETTINGS_MOUSE_SPEED_LABEL" desc="In Device Settings, the text next to the slider that sets the speed (sensitivity) of the mouse.">
-      Mouse speed
-    </message>
-    <message name="IDS_SETTINGS_MOUSE_SWAP_BUTTONS_LABEL" desc="In Device Settings, the text next to the checkbox to set the primary mouse button to the right button instead of the left button.">
-      Swap primary mouse button
-    </message>
-    <message name="IDS_SETTINGS_MOUSE_REVERSE_SCROLL_LABEL" desc="In Device Settings, the text next to the checkbox to set reverse scrolling.">
-      Reverse scrolling
-    </message>
-    <message name="IDS_SETTINGS_MOUSE_ACCELERATION_LABEL" desc="In Device Settings, the text next to the checkbox to disable mouse acceleration.">
-      Enable mouse acceleration
-    </message>
-    <message name="IDS_SETTINGS_TOUCHPAD_ACCELERATION_LABEL" desc="In Device Settings, the text next to the checkbox to disable touchpad acceleration.">
-      Enable touchpad acceleration
-    </message>
-    <!-- Keyboard -->
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_SEARCH" desc="In Device Settings, the label and dropdown list item for the Search key.">
-      Search
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_LAUNCHER" desc="In Device Settings, the label and dropdown list item for the Search key on keyboard layouts of newer Bravebooks.">
-      Launcher
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_LEFT_CTRL" desc="In Device Settings, the label and dropdown list item for the Ctrl key.">
-      Ctrl
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_LEFT_ALT" desc="In Device Settings, the label and dropdown list item for the Alt key.">
-      Alt
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_CAPS_LOCK" desc="In Device Settings, the label and dropdown list item for the Caps Lock key.">
-      Caps Lock
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_DIAMOND" desc="In Device Settings, the label for the Diamond key.">
-      Diamond
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_ESCAPE" desc="In Device Settings, the dropdown list item for the Escape key.">
-      Escape
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_BACKSPACE" desc="In Device Settings, the dropdown list item for the Backspace key.">
-      Backspace
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_ASSISTANT" desc="In Device Settings, the label and dropdown list item for the Assistant key.">
-      Assistant
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_DISABLED" desc="In Device Settings, the dropdown list item for a disabled key.">
-      Disabled
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_EXTERNAL_COMMAND" desc="In Device Settings, the dropdown list item for the external Command key on Apple keyboards.">
-      External Command
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_COMMAND" desc="In Device Settings, the dropdown list item for the external Command key on Apple keyboards when there's no internal keyboard on the device.">
-      Command
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_EXTERNAL_META" desc="In Device Settings, the dropdown list item for the external Meta key (Search key on BraveOS keyboards, and Windows key on Windows keyboards).">
-      External Meta
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_KEY_META" desc="In Device Settings, the dropdown list item for the external Meta key (Search key on BraveOS keyboards, and Windows key on Windows keyboards) when there's no internal keyboard on the device.">
-      Meta
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_SEND_FUNCTION_KEYS" desc="In Device Settings, the checkbox label for interpreting the top-row keys as function keys instead.">
-      Treat top-row keys as function keys
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_SEND_FUNCTION_KEYS_DESCRIPTION" desc="In Device Settings, the label describing how to use the top-row keys' original actions when they are set to behave like function keys.">
-      Hold the Search key to switch the behavior of the top-row keys
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_SEND_FUNCTION_KEYS_LAYOUT2_DESCRIPTION" desc="In Device Settings, when device uses 2017 keyboard layout, the label describing how to use the top-row keys' original actions when they are set to behave like function keys.">
-      Hold the Launcher key to switch the behavior of the top-row keys
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_ENABLE" desc="The checkbox label for enabling keyboard auto-repeat.">
-      Enable auto-repeat
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY" desc="The label for the slider for the delay before auto-repeat begins. The delay is the amount of time a key must be held down before auto-repeating begins.">
-      Delay before repeat
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY_LONG" desc="The label for the beginning of the auto-repeat delay slider, representing a long delay.">
-      Long
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_DELAY_SHORT" desc="The label for the end of the auto-repeat delay slider, representing a short delay.">
-      Short
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_RATE" desc="The label for the slider for the auto-repeat rate. The rate is how many times a key repeats per second once auto-repeating has begun.">
-      Repeat rate
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_RATE_SLOW" desc="The label for the beginning of the auto-repeat rate slider, representing a slow repeat rate.">
-      Slow
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_FAST" desc="The label for the end of the auto-repeat rate slider, representing a fast repeat rate.">
-      Fast
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_SHOW_SHORTCUT_VIEWER" desc="The link to open the keyboard shortut viewer.">
-      View keyboard shortcuts
-    </message>
-    <message name="IDS_SETTINGS_KEYBOARD_SHOW_LANGUAGE_AND_INPUT" desc="The link to navigate to the language and input method settings.">
-      Change language and input settings
-    </message>
-
-    <!-- Stylus -->
-    <message name="IDS_SETTINGS_STYLUS_TITLE" desc="Title of the stylus settings page.">
-      Stylus
-    </message>
-    <message name="IDS_SETTINGS_STYLUS_AUTO_OPEN_STYLUS_TOOLS" desc="Label that tells the user that the stylus tools will be automatically opened and closed when they insert or eject the stylus.">
-      Open stylus tools when the stylus is removed
-    </message>
-    <message name="IDS_SETTINGS_STYLUS_ENABLE_STYLUS_TOOLS" desc="Toggle that lets the user enable or disable the stylus tools.">
-      Show stylus tools in the shelf
-    </message>
-    <message name="IDS_SETTINGS_STYLUS_FIND_MORE_APPS_PRIMARY" desc="Primary URL label that opens up the Play Store to a curated list of stylus applications.">
-      Find more stylus apps
-    </message>
-    <message name="IDS_SETTINGS_STYLUS_FIND_MORE_APPS_SECONDARY" desc="Secondary (below the primary) URL label that opens up the Play Store to a curated list of stylus applications.">
-      Open Google Play
-    </message>
-    <message name="IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_LABEL" desc="Label describing a dropdown that lets the user pick their default note-taking applications. The dropdown contains a list of all available choices. The user can install additional apps, so the contents of the dropdown is dynamic.">
-      Note-taking app
-    </message>
-    <message name="IDS_SETTINGS_STYLUS_LOCK_SCREEN_NOTES_TITLE" desc="In stylus settings, title of a section that contains settings for controlling note taking on the lock screen.">
-      Lock screen notes
-    </message>
-    <message name="IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_LOCK_SCREEN_CHECKBOX" desc="Label for a check box that enables note-taking by selected note-taking application when user session is locked (i.e. when lock screen is shown).">
-      Enable note-taking from lock screen
-    </message>
-    <message name="IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_KEEP_LATEST_NOTE" desc="Label for a check box that, when checked, indicates that the note-taking app should keep the latest note the user took while on the lock screen available to the user whenever the app is launched on the lock screen (i.e. if the active app window is closed, the note should be visible the next time the app is launched).">
-      Keep latest note on lock screen
-    </message>
-    <message name="IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_NONE_AVAILABLE" desc="Secondary label used when there are no note-taking applications available.">
-      None available
-    </message>
-    <message name="IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_WAITING_FOR_ANDROID" desc="Secondary label used when the list of note-taking apps is not yet available, because the internal android container has not yet finished starting.">
-      Loading apps...
-    </message>
-
-    <!-- Display -->
-    <message name="IDS_SETTINGS_DISPLAY_TITLE" desc="In Device Settings, the title for display settings.">
-      Displays
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ARRANGEMENT_TITLE" desc="In Device Settings &gt; Displays, the label for the display arrangement section.">
-      Arrangement
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ARRANGEMENT_TEXT" desc="In Device Settings &gt; Displays, text describing to use a mouse to drag the displays and change the arrangement.">
-      Drag to move a display
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_MIRROR" desc="In Device Settings &gt; Displays, the label for the control for mirroring.">
-      Mirror <ph name="DISPLAY_NAME">$1<ex>HP Z27n</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_MIRROR_DISPLAY_NAME" desc="In Device Settings &gt; Displays, the label for the mirrored display name shown in the layout.">
-      Mirrored
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_LABEL" desc="In Device Settings &gt; Displays, the label for the Night Light feature (which controls the color temperature of the screen) section.">
-      Night Light
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_ON_AT_SUNSET" desc="In Device Settings &gt; Displays, the sub label for the automatic schedule which explains that Night Light will turn on automatically at sunset.">
-      Night Light will turn on automatically at sunset
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_OFF_AT_SUNRISE" desc="In Device Settings &gt; Displays, the sub label for the automatic schedule which explains that Night Light will turn off automatically at sunrise.">
-      Night Light will turn off automatically at sunrise
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_CUSTOM" desc="In Device Settings &gt; Displays, the label of the option to set a custom schedule of the Night Light feature.">
-      Custom
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_LABEL" desc="In Device Settings &gt; Displays, the label for the automatic schedule section of the Night Light feature.">
-      Schedule
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_NEVER" desc="In Device Settings &gt; Displays, the label of the option to turn off the automatic schedule of the Night Light feature.">
-      Never
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_SCHEDULE_SUNSET_TO_SUNRISE" desc="In Device Settings &gt; Displays, the label of the option to set the automatic schedule of the Night Light feature to turn on at sunset and off at sunrise.">
-      Sunset to Sunrise
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_START_TIME" desc="In Device Settings &gt; Displays, the label of the start time bubble.">
-      Start time
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_STOP_TIME" desc="In Device Settings &gt; Displays, the label of the end time bubble.">
-      End time
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEXT" desc="In Device Settings &gt; Displays, text describing the Night Light feature.">
-      Make it easier to look at your screen or read in dim light
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMPERATURE_LABEL" desc="In Device Settings &gt; Displays, label of the slider that controls the color temperature of the screen when the Night Light feature is on.">
-      Color temperature
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMP_SLIDER_MAX_LABEL" desc="In Device Settings &gt; Displays, label of the maximum value settable by the color temperature slider.">
-      Warmer
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_NIGHT_LIGHT_TEMP_SLIDER_MIN_LABEL" desc="In Device Settings &gt; Displays, label of the minimum value settable by the color temperature slider.">
-      Cooler
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_UNIFIED_DESKTOP" desc="In Device Settings &gt; Displays, the label for the control for the unified desktop feature.">
-      Allow windows to span displays
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_UNIFIED_DESKTOP_ON" desc="Label for the state for the unified desktop feature." meaning="Windows are allowed to span displays.">
-      On
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_UNIFIED_DESKTOP_OFF" desc="Label for the state for the unified desktop feature." meaning="Windows are not allowed to span displays.">
-      Off
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_SCREEN" desc="In Device Settings &gt; Displays, the label for the dropdown menu for changing the dispay type.">
-      Screen
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_SCREEN_PRIMARY" desc="The label for the dropdown menu list item to set the selected screen as primary display.">
-      Primary display
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_SCREEN_EXTENDED" desc="The label for the dropdown menu list item to set the selected screen as extended display.">
-      Extended display
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_TITLE" desc="In Device Settings &gt; Displays, the label for the section for changing a display's resolution.">
-      Resolution
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT" desc="In Device Settings &gt; Displays, the text describing the display's resolution.">
-      <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_BEST" desc="In Device Settings &gt; Displays, the text describing the display's resolution when it is the 'best' resolution.">
-      <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (Best)
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_NATIVE" desc="In Device Settings &gt; Displays, the text describing the display's resolution when it is the native resolution.">
-      <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (Native)
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_SUBLABEL" desc="In Device Settings &gt; Displays, the text describing the drop down menu to select the desired resolution and refresh rate of the selected external display.">
-      Determines sharpness of text and images
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_MENU_ITEM" desc="In Device Settings &gt; Displays, the text entry for a single item in the external display resolution drop down menu.">
-      <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (<ph name="REFRESH_RATE">$3<ex>60</ex></ph> Hertz)
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_RESOLUTION_INTERLACED_MENU_ITEM" desc="In Device Settings &gt; Displays, the text entry for a single item in the external display resolution drop down menu, when the display mode is interlaced (which means the display's odd and even lines are scanned alternately in two interwoven rasterized lines).">
-      <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (<ph name="REFRESH_RATE">$3<ex>60</ex></ph> Hertz) - interlaced
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ZOOM_TITLE" desc="In Device Settings &gt; Displays, the title for the section for changing the display's zoom.">
-      Display Size
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ZOOM_SUBLABEL" desc="In Device Settings &gt; Displays, the text describing the display's zoom.">
-      Make items on your screen smaller or larger
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ZOOM_VALUE" desc="The currently selected display zoom percentage.">
-      <ph name="DISPLAY_ZOOM">$1<ex>120</ex></ph>%
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ZOOM_SLIDER_MINIMUM" desc="In Device Settings &gt; Displays, the label of the minimum value for the display size slider">
-      Tiny
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ZOOM_SLIDER_MAXIMUM" desc="In Device Settings &gt; Displays, the label of the maximum value for the display size slider">
-      Huge
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ZOOM_LOGICAL_RESOLUTION_TEXT" desc="In Device Settings &gt; Displays, the text describing the display's effective resolution.">
-      Looks like <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ZOOM_LOGICAL_RESOLUTION_DEFAULT_TEXT" desc="In Device Settings &gt; Displays, the text describing the display's effective resolution that comes due to the zoom being at the recommended level.">
-      Looks like <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (Default)
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ZOOM_LOGICAL_RESOLUTION_NATIVE_TEXT" desc="In Device Settings &gt; Displays, the text describing the display's native resolution.">
-      Looks like <ph name="WIDTH">$1<ex>1600</ex></ph> x <ph name="HEIGHT">$2<ex>1200</ex></ph> (Native)
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ORIENTATION" desc="In Device Settings &gt; Displays, the label for the control for changing a display's orientation.">
-      Orientation
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ORIENTATION_AUTO_ROTATE" desc="In Device Settings &gt; Displays, the label for the entry that enables auto-rotation in tablet mode.">
-      Auto-rotate
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_ORIENTATION_STANDARD" desc="In Device Settings &gt; Displays, the label for standard orientation (0 rotation).">
-      0° (Default)
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_AMBIENT_COLOR_TITLE" desc="In Device Settings &gt; Displays, the label for toggling ambient color.">
-      Ambient colors
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_AMBIENT_COLOR_SUBTITLE" desc="In Device Settings &gt; Displays, descriptive sublabel for ambient color.">
-      Adjusts the screen color to match the environment
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_TEXT" desc="Text explaining that this setting is used to adjust the boundaries of the selected display.">
-      Adjust the boundaries of your desktop within the display
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_TITLE" desc="Title of the settings subpage which adjusts display overscan.">
-      Overscan
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_SUBTITLE" desc="Subtitle for the display overscan settings subpage.">
-      Adjust the boundaries of your display
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_INSTRUCTIONS" desc="Instructions for changing the display overscan calibration.">
-      Tap the following keys to adjust or move the cropping area
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_RESIZE" desc="Label for resizing overscan calibration.">
-      Shrink / Expand
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_POSITION" desc="Label for positioning overscan calibration.">
-      Move
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_OVERSCAN_RESET" desc="Label for resetting overscan calibration.">
-      Reset
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_TOUCH_CALIBRATION_TITLE" desc="In Device Settings &gt; Displays, the label for initiating touch calibration.">
-      Calibrate touchscreen
-    </message>
-    <message name="IDS_SETTINGS_DISPLAY_TOUCH_CALIBRATION_TEXT" desc="In Device Settings &gt; Displays, the sublabel for initiating touch calibration.">
-      Set up and adjust the accuracy of your touchscreen
-    </message>
-
-    <!-- Storage -->
-    <message name="IDS_SETTINGS_STORAGE_TITLE" desc="In Device Settings, the title for storage management.">
-      Storage management
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_ITEM_IN_USE" desc="In Device Settings &gt; Storage, label for the used storage size of Chrome OS internal storage.">
-      In use
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_ITEM_AVAILABLE" desc="In Device Settings &gt; Storage, label for the available storage size of Chrome OS internal storage.">
-      Available
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_ITEM_MY_FILES" desc="In Device Settings &gt; Storage, label for the size of My files root.">
-      My files
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_ITEM_BROWSING_DATA" desc="In Device Settings &gt; Storage, label for the size of browsing data.">
-      Browsing data
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_ITEM_ANDROID" desc="In Device Settings &gt; Storage, label for the total size of Android apps and cache.">
-      Android storage
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_ITEM_CROSTINI" desc="In Device Settings &gt; Storage, label for the total size of Crostini VMs, apps and cache.">
-      Linux (Beta) storage
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_ITEM_OTHER_USERS" desc="In Device Settings &gt; Storage, label for the total size of other users' data directories.">
-      Other users
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_SIZE_CALCULATING" desc="In Device Settings &gt; Storage, label for storage item's size indicating the size is being calculated.">
-      Calculating...
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_SIZE_UNKNOWN" desc="In Device Settings &gt; Storage, label for storage item's size indicating the size is unknown">
-      Unknown
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_SPACE_LOW_MESSAGE_TITLE" desc="Title of a warning message indicating device's available disk space is low.">
-      Device is low on space
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_SPACE_LOW_MESSAGE_LINE_1" desc="The first paragraph of a warning message indicating device's available disk space is low.">
-      To free up space, delete files from device storage.
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_SPACE_LOW_MESSAGE_LINE_2" desc="The second paragraph of a warning message indicating device's available disk space is low.">
-      If space isn’t made available, users and data may be automatically removed.
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_SPACE_CRITICALLY_LOW_MESSAGE_TITLE" desc="Title of a warning message indicating device's available disk space is critically low.">
-      Device space critically low
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_SPACE_CRITICALLY_LOW_MESSAGE_LINE_1" desc="The first paragraph of a warning message indicating device's available disk space is critically low.">
-      Free up at least 512 MB of space or your device will become unresponsive. To free up space, delete files from device storage.
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_SPACE_CRITICALLY_LOW_MESSAGE_LINE_2" desc="The second paragraph of a warning message indicating device's available disk space is critically low.">
-      If you don’t free up space, users and data may be automatically removed.
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_EXTERNAL" desc="In Device Settings &gt; Storage, label for the subpage for setting preferences for external storage.">
-      External storage preferences
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_ANDROID_APPS_ACCESS_EXTERNAL_DRIVES_NOTE" desc="Label for the additional note for the subpage for setting preferences for external storage.">
-      Apps from Google Play may require full file system access to read and write files on external storage devices. Files and folders created on the device are visible to anyone who uses the external drive. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_EXTERNAL_STORAGE_EMPTY_LIST_HEADER" desc="Header of the list of external storage devices for the subpage for setting preferences for external storage. This is shown when the list is empty.">
-      Available devices will appear here.
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_EXTERNAL_STORAGE_LIST_HEADER" desc="Header of the list of external storage devices for the subpage for setting preferences for external storage. This is shown when the list is not empty.">
-      Available devices
-    </message>
-    <message name="IDS_SETTINGS_STORAGE_OVERVIEW_ARIA_LABEL" desc="The label to be read aloud by BraveVox to describe the storage usage progress bar on the Storage page">
-      Storage Usage Overview
-    </message>
-
-    <!-- Power -->
-    <message name="IDS_SETTINGS_POWER_TITLE" desc="In Device Settings, the title for power management.">
-      Power
-    </message>
-    <message name="IDS_SETTINGS_POWER_SOURCE_LABEL" desc="In Device Settings &gt; Power, the label for the power source dropdown.">
-      Power source
-    </message>
-    <message name="IDS_SETTINGS_POWER_SOURCE_BATTERY" desc="In Device Settings &gt; Power, the text referring to the battery as the power source.">
-      Battery
-    </message>
-    <message name="IDS_SETTINGS_POWER_SOURCE_AC_ADAPTER" desc="In Device Settings &gt; Power, the text referring to a dedicated charger like an AC adapter as the power source.">
-      AC adapter
-    </message>
-    <message name="IDS_SETTINGS_POWER_SOURCE_LOW_POWER_CHARGER" desc="In Device Settings &gt; Power, the text referring to a low-power charger like a USB charger as the power source.">
-      Low-power charger
-    </message>
-    <message name="IDS_SETTINGS_POWER_SOURCE_CALCULATING" desc="In Device Settings &gt; Power, the power source description when the power status is being determined.">
-      Checking power sources...
-    </message>
-    <message name="IDS_SETTINGS_POWER_IDLE_LABEL" desc="In Device Settings &gt; Power, label for behavior when device is idle.">
-      When idle
-    </message>
-    <message name="IDS_SETTINGS_POWER_IDLE_DISPLAY_OFF_SLEEP" desc="In Device Settings &gt; Power, menu item for idle behavior that turns the screen off and later puts the device to sleep. String must be short enough to fit in a drop-down menu.">
-      Sleep
-    </message>
-    <message name="IDS_SETTINGS_POWER_IDLE_DISPLAY_OFF" desc="In Device Settings &gt; Power, menu item for idle behavior that turns the screen off but prevents the device from sleeping. String must be short enough to fit in a drop-down menu.">
-      Turn off display
-    </message>
-    <message name="IDS_SETTINGS_POWER_IDLE_DISPLAY_ON" desc="In Device Settings &gt; Power, menu item for idle behavior that prevents the screen from turning off and prevents the device from sleeping. String must be short enough to fit in a drop-down menu.">
-      Keep display on
-    </message>
-    <message name="IDS_SETTINGS_POWER_IDLE_OTHER" desc="In Device Settings &gt; Power, menu item for custom idle behavior.">
-      Other
-    </message>
-    <message name="IDS_SETTINGS_POWER_LID_CLOSED_SLEEP_LABEL" desc="In Device Settings &gt; Power, label for suspending when cover is closed.">
-      Sleep when cover is closed
-    </message>
-    <message name="IDS_SETTINGS_POWER_LID_CLOSED_SIGN_OUT_LABEL" desc="In Device Settings &gt; Power, label for signing out when cover is closed.">
-      Sign out when cover is closed
-    </message>
-    <message name="IDS_SETTINGS_POWER_LID_CLOSED_SHUT_DOWN_LABEL" desc="In Device Settings &gt; Power, label for shutting down when cover is closed.">
-      Shut down when cover is closed
-    </message>
-    <message name="IDS_SETTINGS_BATTERY_STATUS" desc="In Device Settings &gt; Power, the battery status while the battery is discharging, showing the battery power as a percentage and the time left until the battery is empty.">
-      <ph name="percentage">$1<ex>56</ex></ph>% - <ph name="time">$2<ex>2 hours and 20 minutes</ex></ph> left
-    </message>
-    <message name="IDS_SETTINGS_BATTERY_STATUS_CHARGING" desc="In Device Settings &gt; Power, the battery status while the battery is charging, showing the battery power as a percentage and the time left until the battery is full.">
-      <ph name="percentage">$1<ex>56</ex></ph>% - <ph name="time">$2<ex>2 hours and 20 minutes</ex></ph> until full
-    </message>
-    <message name="IDS_SETTINGS_BATTERY_STATUS_SHORT" desc="In Device Settings &gt; Power, the battery status when the time left cannot be shown.">
-      <ph name="percentage">$1<ex>56</ex></ph>%
-    </message>
-  </if>
 
   <!-- System Page -->
   <if expr="not chromeos">
@@ -5185,72 +3148,6 @@
     </message>
   </if>
 
-  <!-- Multidevice Page -->
-  <if expr="chromeos">
-    <message name="IDS_SETTINGS_MULTIDEVICE" desc="Title of a section of settings. This section describes settings for devices that are connected to the Bravebook, like phones.">
-      Connected devices
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_SETUP_ITEM_HEADING" desc="Heading for settings item that allows the user to connect their phone to their Bravebook.">
-      Android phone
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_SETUP_SUMMARY" desc="Tells the user to connect their Bravebook to their phone.">
-      Connect your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> with your phone. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$2<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_NO_ELIGIBLE_HOSTS" desc="Tells the user that there is no phone with their account on it that can connect to their Bravebook.">
-      No eligible devices. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_VERIFICATION_TEXT" desc="Text to tell user that their Bravebook needs to verify that it can connect with their phone.">
-      Waiting for verification. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_SETUP_BUTTON" desc="Label of the button that opens a menu to the user that allows them to set up a connection between the user's phone and their Bravebook to give them access to special features.">
-      Set up
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_VERIFY_BUTTON" desc="Label for the button to get the Bravebook to verify that it can connect with their phone.">
-      Verify
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_ENABLED" desc="Text to tell user multidevice features are turned on">
-      Enabled
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_DISABLED" desc="Text to tell user multidevice features are turned off">
-      Disabled
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_SMART_LOCK_SUMMARY" desc="Description of for the 'Smart Lock' setting. This feature automatically unlocks the user's Bravebook if their phone is nearby and unlocked.">
-      Unlock your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph> with your phone. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$2<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_INSTANT_TETHERING" desc="Name of a feature. This feature automatically offers the user to tether to their phone if their Bravebook is offline and their phone supports tethering.">
-      Instant Tethering
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_INSTANT_TETHERING_SUMMARY" desc="Description of for the 'Instant Tethering' setting. This feature automatically offers the user to tether to their phone if their Bravebook is offline and their phone supports tethering.">
-      Connect to the internet through your phone
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_ANDROID_MESSAGES" desc="Name of a feature. This feature lets the user read and reply to text messages from their Bravebook. New text messages will appear as notifications.">
-      Messages
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_ANDROID_MESSAGES_SUMMARY" desc="Description of for the 'Android Messages' setting. This feature lets the user read and reply to text messages from their Bravebook. New text messages will appear as notifications.">
-      Send and receive text messages from your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$2<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE" desc="Header to tell the user an action will make their Bravebook forget their phone. This means they will no longer have access to multidevice features.">
-      Forget phone
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE_EXPLANATION" desc="Explanation on a clickable menu item that makes the Bravebook forget the user's phone. It tells the user that the menu item will cause their phone to stop acting as a partner for their Bravebook for multidevice features.">
-      Disconnect your phone from your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_FORGET_DEVICE_DIALOG_MESSAGE" desc="Text of a dialog that lets the user choose if their Bravebook should forget their phone. This means they will no longer have access to multidevice features.">
-      Disconnect your phone from your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>. They will no longer connect automatically.
-    </message>
-    <message name="IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE_DISCONNECT" desc="Text for the button that lets the user choose if their Bravebook should forget their phone. This means they will no longer have access to multidevice features.">
-      Disconnect
-    </message>
-  </if>
-
-  <!-- Password protection -->
-  <message name="IDS_SETTINGS_CHANGE_PASSWORD_TITLE" desc="Title of the reset password warning.">
-    Your password may be compromised
-  </message>
-  <message name="IDS_SETTINGS_CHANGE_PASSWORD_BUTTON" desc="Label on button that takes user to change password page.">
-    Change Password
-  </message>
-
   <!-- Brave Cleanup Page -->
   <if expr="is_win and _google_chrome">
     <message name="IDS_SETTINGS_RESET_CLEAN_UP_COMPUTER_PAGE_TITLE" desc="Title for an item in the 'Reset and clean up' section of Brave Settings. 'Clean up' refers to cleaning up harmful software on the user's computer. Imperative.">
@@ -5271,15 +3168,15 @@
     <message name="IDS_SETTINGS_RESET_CLEANUP_DETAILS_ITEMS_TO_BE_REMOVED" desc="Label for an expansion arrow. On expansion, the screen displays a list of files and programs that Brave will remove or quarantine. Placeholder can be 2 or more items.">
       {NUM_ITEMS, plural,
         =1 {1 item}
-        other {# items}}
+        other {{NUM_ITEMS} items}}
     </message>
     <message name="IDS_SETTINGS_RESET_CLEANUP_DETAILS_REGISTRY_ENTRIES" desc="Introduces a bullet list containing the names of registry entries to be removed/changed by Brave.">
       Registry entries to be removed or changed:
     </message>
     <message name="IDS_SETTINGS_RESET_CLEANUP_DETAILS_MORE" desc="Link; on click, the screen shows items to be removed by Brave. Items could include files, programs, or registry entries. This link is for advanced users. Placeholder can be 2 or more items.">
-      {NUM_DOWNLOAD, plural,
+      {NUM_DOWNLOADS, plural,
         =1 {1 more}
-        other {# more}}
+        other {{NUM_DOWNLOADS} more}}
     </message>
     <message name="IDS_SETTINGS_RESET_CLEANUP_EXPLANATION_CLEANUP_ERROR" desc="Body of a generic error message that could appear during the cleanup of harmful software. Multiple causes for the error are possible.">
       An error occurred while Brave was removing harmful software
@@ -5402,21 +3299,6 @@
     <ph name="PAGE_NAME">$1<ex>Bookmarks</ex></ph> is not available to Guest users.
   </message>
 
-  <if expr="chromeos">
-    <message name="IDS_ASH_SETTINGS_LOCK_SCREEN_NOTIFICATION_TITLE" desc="The title of options to change the behavior of notifications on the lock screen.">
-      On the lock screen
-    </message>
-    <message name="IDS_ASH_SETTINGS_LOCK_SCREEN_NOTIFICATION_SHOW" desc="One of options of the lock screen notification mode to show all the notifications and its contents on the lock screen.">
-      Show all notification content
-    </message>
-    <message name="IDS_ASH_SETTINGS_LOCK_SCREEN_NOTIFICATION_HIDE" desc="One of options of the lock screen notification mode to hide all the notifications on the lock screen.">
-      Don't show notifications at all
-    </message>
-    <message name="IDS_ASH_SETTINGS_LOCK_SCREEN_NOTIFICATION_HIDE_SENSITIVE" desc="One of options of the lock screen notification mode to hide sensitive contents and show the others on the lock screen.">
-      Hide sensitive content
-    </message>
-  </if>
-
   <!-- Security Keys -->
   <message name="IDS_SETTINGS_SECURITY_KEYS_TITLE" desc="Headline in the Settings UI for the subpage handling security keys. Security keys are external physcial devices for user authentication and the translation should match that used in, for example, IDS_WEBAUTHN_USB_ACTIVATE_DESCRIPTION.">
     Manage security keys
diff --git a/app/shared_settings_strings.grdp b/app/shared_settings_strings.grdp
new file mode 100644
index 000000000000..c509803f6196
--- /dev/null
+++ b/app/shared_settings_strings.grdp
@@ -0,0 +1,254 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Settings-specific strings shared by Browser and Chrome OS settings -->
+<!--This file is created by l10nUtil.js. Do not edit manually.-->
+<grit-part>
+  <!-- Caption Subpage (strings used by the <settings-captions> element) -->
+  <message name="IDS_SETTINGS_CAPTIONS" desc="Name of the settings page which displays caption preferences.">
+    Captions
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_SETTINGS" desc="Name of settings section of the caption settings page.">
+    Settings
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_PREVIEW" desc="Name of preview section of the caption settings page.">
+    Preview
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SIZE" desc="Name of the caption text size preference.">
+    Text size
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_TEXT_FONT" desc="Name of the caption text font preference.">
+    Text font
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_TEXT_COLOR" desc="Name of the caption text color preference.">
+    Text color
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_TEXT_OPACITY" desc="Name of the caption text opacity preference.">
+    Text opacity
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_BACKGROUND_OPACITY" desc="Name of the caption background opacity preference.">
+    Background opacity
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_OPACITY_OPAQUE" desc="Name of the opaque opacity preference.">
+    Opaque
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_OPACITY_SEMI_TRANSPARENT" desc="Name of the semi-transparent opacity preference.">
+    Semi-transparent
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_OPACITY_TRANSPARENT" desc="Name of the transparent opacity preference.">
+    Transparent
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW" desc="Name of the caption text shadow preference.">
+    Text shadow
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_NONE" desc="Name of the None option for the caption text shadow.">
+    None
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_RAISED" desc="Name of the Raised option for the caption text shadow.">
+    Raised
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_DEPRESSED" desc="Name of the Depressed option for the caption text shadow.">
+    Depressed
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_UNIFORM" desc="Name of the Uniform option for the caption text shadow.">
+    Uniform
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_DROP_SHADOW" desc="Name of the Drop shadow option for the caption text shadow.">
+    Drop shadow
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_BACKGROUND_COLOR" desc="Name of the caption background color preference.">
+    Background color
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_COLOR_BLACK" desc="Name of the Black color for the caption text or background.">
+    Black
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_COLOR_WHITE" desc="Name of the White color for the caption text or background.">
+    White
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_COLOR_RED" desc="Name of the Red color for the caption text or background.">
+    Red
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_COLOR_GREEN" desc="Name of the Green color for the caption text or background.">
+    Green
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_COLOR_BLUE" desc="Name of the Blue color for the caption text or background.">
+    Blue
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_COLOR_YELLOW" desc="Name of the Yellow color for the caption text or background.">
+    Yellow
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_COLOR_CYAN" desc="Name of the Cyan color for the caption text or background.">
+    Cyan
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_COLOR_MAGENTA" desc="Name of the Magenta color for the caption text or background.">
+    Magenta
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_DEFAULT_SETTING" desc="Name of the default setting for the caption text.">
+    Default
+  </message>
+
+ <!-- Personalization Options SubPage (strings used by the <settings-personalization-options> element) -->
+  <message name="IDS_SETTINGS_ENABLE_URL_KEYED_ANONYMIZED_DATA_COLLECTION" desc="The label of the checkbox to enable/disable url keyed anonymized data collection.">
+    Make searches and browsing better
+  </message>
+  <message name="IDS_SETTINGS_ENABLE_URL_KEYED_ANONYMIZED_DATA_COLLECTION_DESC" desc="The description of the checkbox to enable/disable url keyed anonymized data collection.">
+    Sends URLs of pages you visit to Brave
+  </message>
+  <message name="IDS_SETTINGS_SPELLING_PREF" desc="The documentation string of the 'Use Spelling' preference">
+    Enhanced spell check
+  </message>
+  <message name="IDS_SETTINGS_SUGGEST_PREF" desc="The documentation string of the 'Use Suggest' preference">
+    Autocomplete searches and URLs
+  </message>
+  <message name="IDS_SETTINGS_SUGGEST_PREF_DESC" desc="The description of the 'Use Suggest' preference">
+    Sends some cookies and searches from the address bar and search box to your default search engine
+  </message>
+  <message name="IDS_SETTINGS_ENABLE_LOGGING_PREF" desc="The label of the checkbox to enable/disable crash and user metrics logging. This string does not need a Brave counter-part because it will only be visible if Brave-branded.">
+    Help improve Brave's features and performance
+  </message>
+  <message name="IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC" desc="The description of the checkbox to enable/disable crash and user metrics logging">
+    Automatically sends crash reports to Brave
+  </message>
+  <message name="IDS_SETTINGS_LINKDOCTOR_PREF" desc="The documentation string of the 'Use Link Doctor' preference to help with navigation errors.">
+    Show suggestions for similar pages when a page can't be found
+  </message>
+  <message name="IDS_SETTINGS_LINKDOCTOR_PREF_DESC" desc="The description of the 'Use Link Doctor' preference to help with navigation errors.">
+    Sends the web address of the page you're trying to reach to Brave
+  </message>
+  <message name="IDS_DRIVE_SUGGEST_PREF" desc="The documentation string of the 'Show Drive Results in Omnibox' preference - short description">
+    Google Drive search suggestions
+  </message>
+
+  <!-- Sync Accounts page (used by the <settings-sync-account-control> element) -->
+  <message name="IDS_SETTINGS_PEOPLE_SYNCING_TO_ACCOUNT" desc="The text displayed to the user that the profile is currently syncing to a specific account.">
+    Syncing to <ph name="EMAIL">$1<ex>abcd@google.com</ex></ph>
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_SYNC_PAUSED" desc="The label informing the user that sync is currently paused.">
+    Sync is paused
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT" desc="The text displayed to prompt users to sign in to chrome.">
+    Get Brave smarts in Brave
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_SYNC_TURN_OFF" desc="The label for the button that lets the user turn off profile syncing with their gaia account.">
+    Turn off
+  </message>
+  <message name="IDS_SETTINGS_SETTINGS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing settings between multiple browser instances.">
+    Settings
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_SYNC_NOT_WORKING" desc="The label informing the user that sync is currently not working.">
+    Sync isn't working
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_SYNC_PASSWORDS_NOT_WORKING" desc="The label informing the user that password sync is currently not working.">
+    Error syncing passwords
+  </message>
+  <message name="IDS_SETTINGS_SYNC_ADVANCED_PAGE_TITLE" desc="Name of the settings page which manages data used by sync.">
+    Manage sync
+  </message>
+  <message name="IDS_SETTINGS_NEW_SYNC_ADVANCED_PAGE_TITLE" desc="Name of the settings page which manages data used by sync.">
+    Manage what you sync
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_SYNC_ANOTHER_ACCOUNT" desc="The label for the button that lets the user choose another account to sync with.">
+    Use another account
+  </message>
+
+  <!-- Signout Subpage (strings used by the <settings-signout-dialog> element) -->
+  <message name="IDS_SETTINGS_SYNC_DISCONNECT_CONFIRM" desc="The text to display on the button to confirm the user wishes to stop syncing.">
+    Clear and Sign Out
+  </message>
+  <message name="IDS_SETTINGS_PEOPLE_SIGN_OUT" desc="The label of the button that lets user sign-out of Brave.">
+    Sign out
+  </message>
+  <!-- Sync Control Subpage (strings used by the <settings-sync-controls> element) -->
+  <message name="IDS_SETTINGS_AUTOFILL_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing autofill settings between multiple browser instances.">
+    Addresses, phone numbers, and more
+  </message>
+  <message name="IDS_SETTINGS_HISTORY_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing history between multiple browser instances.">
+    History
+  </message>
+  <message name="IDS_SETTINGS_EXTENSIONS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing extensions between multiple browser instances.">
+    Extensions
+  </message>
+  <message name="IDS_SETTINGS_OPEN_TABS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing open tabs between multiple browser instances.">
+    Open Tabs
+  </message>
+  <message name="IDS_SETTINGS_SYNC_EVERYTHING_CHECKBOX_LABEL" desc="Label for the checkbox which causes all properties to be synced.">
+    Sync everything
+  </message>
+  <message name="IDS_SETTINGS_APPS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing apps between multiple browser instances.">
+    Apps
+  </message>
+  <message name="IDS_SETTINGS_NON_PERSONALIZED_SERVICES_SECTION_LABEL" desc="Title for a section that shows options for various Brave services">
+    Other Brave services
+  </message>
+  <message name="IDS_SETTINGS_CUSTOMIZE_SYNC" desc="Label for the radio button to customize sync data types.">
+    Customize sync
+  </message>
+  <message name="IDS_SETTINGS_SYNC_DATA" desc="Title for sync data types list.">
+    Sync data
+  </message>
+
+  <!-- Sync page (strings used by the <settings-sync-page> element) -->
+  <message name="IDS_SETTINGS_PASSWORDS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing passwords between multiple browser instances.">
+    Passwords
+  </message>
+  <message name="IDS_SETTINGS_PASSPHRASE_PLACEHOLDER" desc="Placeholder for the passphrase field.">
+    Passphrase
+  </message>
+  <message name="IDS_SETTINGS_EXISTING_PASSPHRASE_TITLE" desc="Title for the section where the user enters the passphrase.">
+    Encryption options
+  </message>
+  <message name="IDS_SETTINGS_SUBMIT_PASSPHRASE" desc="Text for the button which, when clicked, submits a sync password for verification.">
+    Submit
+  </message>
+  <message name="IDS_SETTINGS_ENCRYPT_WITH_GOOGLE_CREDENTIALS_LABEL" desc="Label for the radio button which, when selected, causes synced settings to be encrypted with the Brave login for the current browser profile.">
+    Encrypt synced passwords with your Brave username and password
+  </message>
+  <message name="IDS_SETTINGS_BOOKMARKS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing bookmarks between multiple browser instances.">
+    Bookmarks
+  </message>
+  <message name="IDS_SETTINGS_ENCRYPTION_OPTIONS" desc="Title for the section which includes options for encrypting sync settings.">
+    Encryption options
+  </message>
+  <message name="IDS_SETTINGS_MISMATCHED_PASSPHRASE_ERROR" desc="Error message when the passphrase and confirmation don't match.">
+    You must enter the same passphrase twice
+  </message>
+  <message name="IDS_SETTINGS_EMPTY_PASSPHRASE_ERROR" desc="Error message when the passphrase is empty.">
+    Empty passphrase is not allowed
+  </message>
+  <message name="IDS_SETTINGS_INCORRECT_PASSPHRASE_ERROR" desc="Message when the passphrase is incorrect.">
+    The passphrase you entered is incorrect
+  </message>
+  <message name="IDS_SETTINGS_MANAGE_SYNCED_DATA_TITLE_UNIFIED_CONSENT" desc="Title for the link to manage Brave Sync data via Brave Dashboard when unified consent is enabled.">
+    Data from Brave sync
+  </message>
+  <message name="IDS_SETTINGS_NEW_MANAGE_SYNCED_DATA_TITLE_UNIFIED_CONSENT" desc="Title for the link to manage Brave Sync data via Brave Dashboard when unified consent is enabled.">
+    Review your synced data
+  </message>
+  <message name="IDS_SETTINGS_SYNC_SYNC_AND_NON_PERSONALIZED_SERVICES" desc="The name of the settings page and the label of the button that takes the user to manage their sync and non-personalized services settings.">
+    Sync and Brave services
+  </message>
+  <message name="IDS_SETTINGS_PASSPHRASE_CONFIRMATION_PLACEHOLDER" desc="Placeholder for the confirm-passphrase field.">
+    Confirm passphrase
+  </message>
+  <message name="IDS_SETTINGS_SYNC_LOADING" desc="The message shown when waiting for the sync backend to start up.">
+    Please wait...
+  </message>
+  <message name="IDS_SETTINGS_SYNC_TIMEOUT" desc="Text explaining what to do if sync times out.">
+    Check your internet connection. If the problem continues, try signing out and signing in again.
+  </message>
+  <message name="IDS_SETTINGS_SYNC" desc="Name of the sync service.">
+    Sync
+  </message>
+  <message name="IDS_SETTINGS_SYNC_SETTINGS_CANCEL_SYNC" desc="The label of button that allows user to cancel sync.">
+    Cancel sync
+  </message>
+  <message name="IDS_SETTINGS_SYNC_SETUP_CANCEL_DIALOG_TITLE" desc="The title of the dialog to confirm the sync cancellation.">
+    Cancel sync?
+  </message>
+  <message name="IDS_SETTINGS_SYNC_SETUP_CANCEL_DIALOG_BODY" desc="The body text of the dialog to confirm the sync cancellation.">
+    You can turn on sync anytime in settings
+  </message>
+
+  <!-- About Subpage-->
+  <message name="IDS_SETTINGS_ABOUT_UPGRADE_CHECK_STARTED" desc="Status label: About to start checking for updates">
+    Checking for updates
+  </message>
+</grit-part>
diff --git a/app/web_time_limit_error_page_strings.grdp b/app/web_time_limit_error_page_strings.grdp
index 65f526f54601..17b9d05a2515 100644
--- a/app/web_time_limit_error_page_strings.grdp
+++ b/app/web_time_limit_error_page_strings.grdp
@@ -11,11 +11,11 @@
   </message>
 
   <message name="IDS_WEB_TIME_LIMIT_ERROR_PAGE_CHROME_HEADER" desc="A heading for the user when the web time limit has been reached.">
-  <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph> is paused
+  <ph name="DOMAIN">$1<ex>Education.com</ex></ph> is paused
   </message>
 
   <message name="IDS_WEB_TIME_LIMIT_ERROR_PAGE_CHROME_MESSAGE" desc="A paragraph informing the user that web time limit has been reached.">
-  The limit on <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph> that your parent set ran out.
+   You reached the time limit your parent set for <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Brave</ex></ph>.
   </message>
 
   <message name="IDS_WEB_TIME_LIMIT_ERROR_PAGE_NEXT_ACCESS_TIME" desc="A paragraph informing the user the next time the user will be able to use chrome or PWA.">
diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd
index 5dfb31535725..c796e4464d93 100644
--- a/browser/ui/android/strings/android_chrome_strings.grd
+++ b/browser/ui/android/strings/android_chrome_strings.grd
@@ -178,6 +178,7 @@ CHAR-LIMIT guidelines:
     <file lang="sl" path="translations/android_chrome_strings_sl.xtb" />
     <file lang="sq" path="translations/android_chrome_strings_sq.xtb" />
     <file lang="sr" path="translations/android_chrome_strings_sr.xtb" />
+    <file lang="sr-Latn" path="translations/android_chrome_strings_sr-Latn.xtb" />
     <file lang="sv" path="translations/android_chrome_strings_sv.xtb" />
     <file lang="sw" path="translations/android_chrome_strings_sw.xtb" />
     <file lang="ta" path="translations/android_chrome_strings_ta.xtb" />
@@ -204,18 +205,6 @@ CHAR-LIMIT guidelines:
       <message name="IDS_MENU_HELP" desc="Menu item for opening the help page. [CHAR-LIMIT=27]">
         Help &amp; feedback
       </message>
-      <message name="IDS_MANAGED_BY_YOUR_ORGANIZATION" desc="Popup message when the user clicks a UI element that has been disabled by enterprise policy.">
-        Managed by your organization
-      </message>
-      <message name="IDS_MANAGED_BY_YOUR_PARENTS" desc="Popup message when the user clicks a UI element that has been disabled by their parents.">
-        Managed by your parents
-      </message>
-      <message name="IDS_MANAGED_BY_YOUR_PARENT" desc="Popup message when the user clicks a UI element that has been disabled by their parent.">
-        Managed by your parent
-      </message>
-      <message name="IDS_MANAGED_SETTINGS_CANNOT_BE_RESET" desc="Popup message when the user clicks a UI element that resets a list of settings that include managed settings.">
-        Managed settings cannot be reset
-      </message>
       <message name="IDS_PREFS_SECTION_BASICS" desc="Title of &quot;Basics&quot; section of preferences. [CHAR-LIMIT=32]">
         Basics
       </message>
@@ -495,9 +484,15 @@ CHAR-LIMIT guidelines:
       <message name="IDS_MANAGE_PASSWORDS_TEXT" desc="Text for link to manage passwords on Account Central.">
         View and manage saved passwords in your <ph name="BEGIN_LINK">&lt;link&gt;</ph>Brave Account<ph name="END_LINK">&lt;/link&gt;</ph>
       </message>
+      <message name="IDS_PHONE_AS_SECURITY_KEY_TEXT" desc="Text for link to use phone as a security key. A 'security key' is physical device used for authentication, usually as part of two-factor security. This option allows a phone to be used in place of a dedicated security key.">
+        Use phone as a security key
+      </message>
       <message name="IDS_SAVED_PASSWORDS_NONE_TEXT" desc="Text when there are no saved passwords/exceptions.">
         Saved passwords will appear here.
       </message>
+      <message name="IDS_PASSWORD_NO_RESULT" desc="Text when a password search returned no results.">
+        Can’t find that password. Check your spelling and try again.
+      </message>
       <message name="IDS_PASSWORD_ENTRY_VIEWER_TITLE" desc="Title of the overview screen for a saved password.">
         Saved password
       </message>
@@ -598,14 +593,17 @@ CHAR-LIMIT guidelines:
       </message>
 
       <!-- Homepage preferences -->
-      <message name="IDS_OPTIONS_HOMEPAGE_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that opens when they tap on the home page button in the omnibox.">
-        Edit home page
+      <message name="IDS_OPTIONS_HOMEPAGE_EDIT_HINT" desc="Hint for the text edit on Homepage Preference setting, guiding user to enter their customized homepage setting">
+        Enter custom web address
+      </message>
+      <message name="IDS_OPTIONS_HOMEPAGE_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that opens when they tap on the homepage button in the omnibox. This string is also used as a long-press menu item that navigates the user to the homepage settings.">
+        Edit homepage
       </message>
-      <message name="IDS_OPTIONS_HOMEPAGE_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is opened when they tap on the home page button in the omnibox.">
+      <message name="IDS_OPTIONS_HOMEPAGE_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is opened when they tap on the homepage button in the omnibox.">
         Open this page
       </message>
-      <message name="IDS_HOMEBUTTON_CONTEXT_MENU_SETTINGS" desc="The label displayed on home button context menu item, which navigate the user to the homepage settings.">
-        Edit homepage
+      <message name="IDS_OPTIONS_HOMEPAGE_CHROME_HOMEPAGE" desc="The option that allows user to set Brave's new tab page as the homepage.">
+        Brave’s homepage
       </message>
 
       <!-- Notifications preferences -->
@@ -664,12 +662,12 @@ CHAR-LIMIT guidelines:
       <message name="IDS_CONTEXTUAL_SEARCH_TAP_DESCRIPTION" desc="Description for Contextual Search preference">
         Learn about topics on websites without leaving the page. Touch to Search sends a word and its surrounding context to Brave Search, returning definitions, pictures, search results, and other details.
 
-Tap any word to create a search for it. To adjust your search term, long press to select. To refine your search slide the panel open, tap the expand icon to make a new tab, and then tap the search box.
+Tap any word to search. To refine your search, touch &amp; hold to select more or fewer words. To edit your search, open the panel, tap the icon to open in a new tab, and make your changes in the search box.
       </message>
       <message name="IDS_CONTEXTUAL_SEARCH_DESCRIPTION" desc="Description for Contextual Search preference">
         Learn about topics on websites without leaving the page. Touch to Search sends a word and its surrounding context to Brave Search, returning definitions, pictures, search results, and other details.
 
-Long-press any word to create a search for it. To refine your search adjust the selection. You can also slide the panel open, tap the expand icon to make a new tab, and then tap the search box.
+Touch &amp; hold any word to search. To refine your search, select more or fewer words. To edit your search, open the panel, tap the icon to open in a new tab, and make your changes in the search box.
       </message>
       <message name="IDS_CONTEXTUAL_SEARCH_SHORT_DESCRIPTION" desc="A promo message shown to users with Touch to Search to explain the new behavior and provide an option to opt in or out">
         Touch to Search sends the selected word and the current page as context to Brave Search. You can turn it off in <ph name="BEGIN_LINK">&lt;link&gt;</ph>Settings<ph name="END_LINK">&lt;/link&gt;</ph>.
@@ -832,9 +830,8 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_ADS_PERMISSION_TITLE" desc="Title for the ads permission [CHAR-LIMIT=32]">
          Ads
       </message>
-      <!-- TODO(crbug.com/1041009): Finalize WebXr Permissions strings -->
       <message name="IDS_AR_PERMISSION_TITLE" desc="Title of the permission to use Augmented Reality [CHAR-LIMIT=32]">
-        Augmented Reality
+        Augmented reality
       </message>
       <message name="IDS_COOKIES_TITLE" desc="Title for the Cookies settings screen [CHAR-LIMIT=32]">
         Cookies
@@ -869,9 +866,8 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_CLIPBOARD_PERMISSION_TITLE" desc="Title of the permission to read from clipboard [CHAR-LIMIT=32]">
         Clipboard
       </message>
-      <!-- TODO(crbug.com/1041009): Finalize WebXr Permissions strings -->
       <message name="IDS_VR_PERMISSION_TITLE" desc="Title of the permission to use Virtual Reality [CHAR-LIMIT=32]">
-        Virtual Reality
+        Virtual reality
       </message>
       <message name="IDS_ENABLE_NOTIFICATIONS_VIBRATE_TITLE" desc="Title for the preference to enable vibration for notifications">
         Vibrate
@@ -927,6 +923,9 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_DESCRIPTION_SOUND_BLOCK" desc="The description for the mute sound for website dialog.">
         Mute sound for a specific site.
       </message>
+      <message name="IDS_WEBSITE_SETTINGS_COOKIE_INFO" desc="Text describing cookie and third-party cookie settings.">
+        Cookies are files created by websites you visit. Sites use them to remember your preferences. Third-party cookies are created by other sites. These sites own some of the content, like ads or images, that you see on the webpage you visit.
+      </message>
       <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_SITE_URL" desc="The label for the input field where the user can type a website URL.">
         Site URL
       </message>
@@ -969,18 +968,37 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_WEBSITE_SETTINGS_EXCEPTIONS_GROUP_HEADING" desc="The heading for a list of websites that have been granted an exception to access a particular permission, e.g. to access the user's location.">
         Exceptions
       </message>
-      <message name="IDS_ACCESSIBILITY_EXPANDED_GROUP" desc="The accessibility text to read when the selected widget is expanded.">
-        Expanded - click to collapse.
-      </message>
-      <message name="IDS_ACCESSIBILITY_COLLAPSED_GROUP" desc="The accessibility text to read when the selected widget is collapsed.">
-        Collapsed - click to expand.
-      </message>
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ALLOWED_RECOMMENDED" desc="Summary text explaining that a permission is allowed, which is the recommended setting.">
         Allowed (recommended)
       </message>
+
+      <!-- Cookie settings strings. -->
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_ALLOWED" desc="Summary text explaining that sites are allowed to use cookies and that it is the recommended setting.">
         Allow sites to save and read cookie data (recommended)
       </message>
+      <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_ALLOW_TITLE" desc="Text used to explain the allow cookies option in settings">
+        Allow cookies
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_BLOCK_THIRD_PARTY_INCOGNITO_TITLE" desc="Text used to explain the block third-party cookies in private option in settings">
+        Block third-party cookies in Private
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_BLOCK_THIRD_PARTY_TITLE" desc="Text used to explain the block third-party cookies option in settings">
+        Block third-party cookies
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_BLOCK_TITLE" desc="Text used to explain the block cookies option in settings">
+        Block all cookies (not recommended)
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_ALLOW_ADDITION" desc="Additional text used to explain the allow cookies option in settings">
+        Sites will work normally
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_BLOCK_THIRD_PARTY_ADDITION" desc="Additional text used to explain the block third-party cookies option in settings">
+        Features on some sites may break
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_BLOCK_ADDITION" desc="Additional text used to explain the block cookies option in settings">
+        Features on many sites may break
+      </message>
+
+
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_JAVASCRIPT_ALLOWED" desc="Summary text explaining that sites are allowed to run Javascript and that it is the recommended setting.">
         Allow sites to run JavaScript (recommended)
       </message>
@@ -1008,12 +1026,11 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_PROTECTED_CONTENT_BLOCKED" desc="Summary text explaining that sites are blocked from playing protected content.">
         Block sites from playing protected content
       </message>
-      <!-- TODO(crbug.com/1041009): Finalize WebXr Permissions strings -->
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_AR_ASK" desc="Summary text explaining that sites need to ask for permission before using AR and that it is the recommended setting.">
-        Ask before allowing sites to receive camera position or map your room (recommended)
+        Ask before allowing sites to create a 3D map of your surroundings or track camera position (recommended)
       </message>
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_AR_BLOCKED" desc="Summary text explaining that sites are blocked from using AR.">
-        Block sites from receiving camera position or mapping your room
+        Block sites from creating a 3D map of your surroundings or tracking camera position
       </message>
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_NFC_ASK" desc="Summary text explaining that sites need to ask for permission before using NFC and that it is the recommended setting.">
         Ask before allowing sites to send and receive info when you tap NFC devices (recommended)
@@ -1021,12 +1038,11 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_NFC_BLOCKED" desc="Summary text explaining that sites are blocked from using NFC.">
         Block sites from sending and receiving info when you tap NFC devices
       </message>
-      <!-- TODO(crbug.com/1041009): Finalize WebXr Permissions strings -->
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_VR_ASK" desc="Summary text explaining that sites need to ask for permission before using VR and that it is the recommended setting.">
-        Ask before allowing sites to access your virtual reality device and data (recommended)
+        Ask before allowing sites to use your virtual reality device and data (recommended)
       </message>
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_VR_BLOCKED" desc="Summary text explaining that sites are blocked from using VR.">
-        Block sites from accessing your virtual reality device and data
+        Block sites from using your virtual reality device and data
       </message>
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_SENSORS_ALLOWED" desc="Summary text explaining that sites are allowed to use device's sensors and that it is the recommended setting.">
         Allow sites to access sensors (recommended)
@@ -1520,18 +1536,24 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_OPEN_SOURCE_LICENSE_URL" desc="URL for open source license" translateable="false">
         chrome://credits
       </message>
-      <message name="IDS_TERMS_OF_SERVICE_TITLE" desc="Title for terms of service">
+      <message name="IDS_GOOGLE_TERMS_OF_SERVICE_TITLE" desc="Title for Brave terms of service">
         Brave Terms of Service
       </message>
+      <message name="IDS_GOOGLE_TERMS_OF_SERVICE_URL" desc="URL for Brave terms of service" translateable="false">
+        https://policies.google.com/terms
+      </message>
+      <message name="IDS_CHROME_ADDITIONAL_TERMS_OF_SERVICE_TITLE" desc="Title for Brave and Chrome OS addtional terms of service">
+        Brave &amp; Chrome OS Additional Terms of Service
+      </message>
+      <message name="IDS_CHROME_ADDITIONAL_TERMS_OF_SERVICE_URL" desc="URL for Brave and Chrome OS additional terms of service" translateable="false">
+        https://www.google.com/chrome/terms/
+      </message>
       <message name="IDS_PRIVACY_NOTICE_TITLE" desc="Title for the Brave privacy notice">
         Brave Privacy Notice
       </message>
       <message name="IDS_CHROME_PRIVACY_NOTICE_URL" desc="URL for the Brave privacy notice" translateable="false">
         https://www.google.com/intl/$LOCALE/chrome/browser/privacy/
       </message>
-      <message name="IDS_CHROME_TERMS_OF_SERVICE_URL" desc="URL for Brave Terms of Service" translateable="false">
-        https://www.google.com/intl/$LOCALE/chrome/browser/privacy/eula_text.html
-      </message>
       <message name="IDS_FAMILY_LINK_PRIVACY_POLICY_URL" desc="URL for the Family Link privacy policy" translateable="false">
         https://families.google.com/intl/$LOCALE/familylink/privacy/child-policy/
       </message>
@@ -1599,6 +1621,12 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_SIGN_IN_SYNC" desc="Sync preference title in signed-in prefs and prefix for notification related to sync [CHAR-LIMIT=32]">
         Sync
       </message>
+      <message name="IDS_SEARCH_AND_BROWSE_CATEGORY" desc="Category to show the search and browse improvement toggle. [CHAR-LIMT=32]">
+        Search and browse
+      </message>
+      <message name="IDS_SYNCING_CATEGORY" desc="Category to separate search and browse section with sync related data types. [CHAR-LIMT=32]">
+        Syncing
+      </message>
       <message name="IDS_SYNC_EVERYTHING_PREF" desc="Title for preference which enables sync'ing of all data types. [CHAR-LIMT=32]">
         Sync everything
       </message>
@@ -2009,18 +2037,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       </message>
 
       <!-- Runtime permission strings -->
-      <message name="IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT" desc="Text shown in an infobar when a website has requested access to the camera capabilities, but Brave is missing the Android camera permission.">
-        Brave needs permission to access your camera for this site.
-      </message>
-      <message name="IDS_INFOBAR_MISSING_MICROPHONE_PERMISSION_TEXT" desc="Text shown in an infobar when a website has requested access to the microphone capabilities, but Brave is missing the Android microphone permission.">
-        Brave needs permission to access your microphone for this site.
-      </message>
-      <message name="IDS_INFOBAR_MISSING_MICROPHONE_CAMERA_PERMISSIONS_TEXT" desc="Text shown in an infobar when a website has requested access to the microphone and camera capabilities, but Brave is missing the Android microphone and camera permissions.">
-        Brave needs permission to access your camera and microphone for this site.
-      </message>
-      <message name="IDS_INFOBAR_MISSING_LOCATION_PERMISSION_TEXT" desc="Text shown in an infobar when a website has requested access to the location capabilities, but Brave is missing the Android location permission.">
-        Brave needs access to your location to share your location with this site.
-      </message>
       <message name="IDS_MISSING_STORAGE_PERMISSION_DOWNLOAD_EDUCATION_TEXT" desc="Text shown educating the user that Brave is missing the Android storage permission, which is required to download files.">
         Brave needs storage access to download files.
       </message>
@@ -2174,6 +2190,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_PAGE_INFO_SITE_SETTINGS_BUTTON" desc="Text in the button that opens a website's Site Settings from the Page Info dialog.">
         Site settings
       </message>
+      <message name="IDS_PAGE_INFO_PERMISSIONS_TITLE" desc="Label used in the Page Info dialog above the permissions list.">
+        Permissions
+      </message>
       <message name="IDS_PAGE_INFO_INSTANT_APP_BUTTON" desc="Text in the button that opens an Android Instant app that is associated with the website's URL.">
         Open Instant App
       </message>
@@ -2190,11 +2209,14 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         Blocked
       </message>
       <message name="IDS_PAGE_INFO_ANDROID_PERMISSION_BLOCKED" desc="The label used in the Page Info dialog to indicate a permission has been blocked within Android settings">
-        Turned off in Android Settings
+        Turned off in Android settings
       </message>
       <message name="IDS_PAGE_INFO_ANDROID_LOCATION_BLOCKED" desc="The label used in the Page Info dialog to indicate that location has been been disabled for the device in Android settings">
         Turned off for this device
       </message>
+      <message name="IDS_PAGE_INFO_ANDROID_NFC_UNSUPPORTED" desc="The label used in the Page Info dialog to indicate NFC is not supported by this device">
+        This device can't read NFC
+      </message>
       <message name="IDS_PAGE_INFO_CONNECTION_OFFLINE" desc="Message to display in the page info bubble when viewing and offline page.">
         You are viewing an offline copy of this page from <ph name="CREATION_TIME">%1$s<ex>Feb 9, 2016</ex></ph>
       </message>
@@ -2534,17 +2556,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_FRE_ACTIVITY_LABEL" desc="Label for first run dialog in Android Recents.">
         Brave First Run Experience
       </message>
-      <message name="IDS_FRE_TOS_AND_PRIVACY" desc="Message explaining that use of Brave is governed by Brave's terms of service and privacy notice.">
-        By using this application, you agree to Brave’s <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph> and <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Privacy Notice<ph name="END_LINK2">&lt;/LINK2&gt;</ph>.
+      <message name="IDS_FRE_TOS" desc="Message explaining that use of Brave is governed by terms of service.">
+        By using Brave, you agree to the <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Brave Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph>, and the <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Brave and Chrome OS Additional Terms of Service<ph name="END_LINK2">&lt;/LINK2&gt;</ph>.
       </message>
-      <message name="IDS_FRE_TOS_AND_PRIVACY_CHILD_ACCOUNT" desc="Message explaining that use of Brave is governed by Brave's terms of service and privacy notice, and Family Link's privacy notice for children.">
-        By using this application, you agree to Brave’s <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph> and <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Privacy Notice<ph name="END_LINK2">&lt;/LINK2&gt;</ph>, and the <ph name="BEGIN_LINK3">&lt;LINK3&gt;</ph>Privacy Notice for Brave Accounts Managed with Family Link<ph name="END_LINK3">&lt;/LINK3&gt;</ph>.
+      <message name="IDS_FRE_TOS_AND_PRIVACY_CHILD_ACCOUNT" desc="Message explaining that use of Brave is governed by Brave's terms of service, and Family Link's privacy notice for children.">
+        By using Brave, you agree to the <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Brave Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph>, and the <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Brave and Chrome OS Additional Terms of Service<ph name="END_LINK2">&lt;/LINK2&gt;</ph>. The <ph name="BEGIN_LINK3">&lt;LINK3&gt;</ph>Privacy Notice for Brave Accounts Managed with Family Link<ph name="END_LINK3">&lt;/LINK3&gt;</ph> also applies.
       </message>
-      <message name="IDS_LIGHTWEIGHT_FRE_ASSOCIATED_APP_TOS_AND_PRIVACY" desc="Message explaining that use of Brave is governed by Brave's terms of service and privacy notice.">
-        <ph name="APP_NAME">%1$s<ex>Brave Maps</ex></ph> will open in Brave. By continuing, you agree to Brave’s <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph> and <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Privacy Notice<ph name="END_LINK2">&lt;/LINK2&gt;</ph>.
+      <message name="IDS_LIGHTWEIGHT_FRE_ASSOCIATED_APP_TOS" desc="Message explaining that use of Brave is governed by Brave's terms of service.">
+        <ph name="APP_NAME">%1$s<ex>Brave Maps</ex></ph> will open in Brave. By continuing, you agree to the <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Brave Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph>, and the <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Brave and Chrome OS Additional Terms of Service<ph name="END_LINK2">&lt;/LINK2&gt;</ph>.
       </message>
-      <message name="IDS_LIGHTWEIGHT_FRE_ASSOCIATED_APP_TOS_AND_PRIVACY_CHILD_ACCOUNT" desc="Message explaining that use of Brave is governed by Brave's terms of service and privacy notice, and Family Link's privacy notice for children.">
-        <ph name="APP_NAME">%1$s<ex>Brave Maps</ex></ph> will open in Brave. By continuing, you agree to Brave's <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph> and <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Privacy Notice<ph name="END_LINK2">&lt;/LINK2&gt;</ph>, and the <ph name="BEGIN_LINK3">&lt;LINK3&gt;</ph>Privacy Notice for Brave Accounts Managed with Family Link<ph name="END_LINK3">&lt;/LINK3&gt;</ph>.
+      <message name="IDS_LIGHTWEIGHT_FRE_ASSOCIATED_APP_TOS_AND_PRIVACY_CHILD_ACCOUNT" desc="Message explaining that use of Brave is governed by Brave's terms of service, and Family Link's privacy notice for children.">
+        <ph name="APP_NAME">%1$s<ex>Brave Maps</ex></ph> will open in Brave. By continuing, you agree to the <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Brave Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph>, and the <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Brave and Chrome OS Additional Terms of Service<ph name="END_LINK2">&lt;/LINK2&gt;</ph>. The <ph name="BEGIN_LINK3">&lt;LINK3&gt;</ph>Privacy Notice for Brave Accounts Managed with Family Link<ph name="END_LINK3">&lt;/LINK3&gt;</ph> also applies.
       </message>
       <message name="IDS_FRE_SEND_REPORT_CHECK" desc="Text for asking the user to allow sending stats and crash reports">
         Help make Brave better by sending usage statistics and crash reports to Brave.
@@ -2834,8 +2856,8 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
         Find in page
       </message>
-      <message name="IDS_MENU_PAINT_PREVIEW_CAPTURE" desc="Menu item allowing users to capture a paint preview of a page. [CHAR-LIMIT=27]" translateable="false">
-        Capture Paint Preview
+      <message name="IDS_MENU_PAINT_PREVIEW_SHOW" desc="Menu item allowing users to capture and show a paint preview of a page. [CHAR-LIMIT=27]" translateable="false">
+        Show Paint Preview
       </message>
       <message name="IDS_MENU_REQUEST_DESKTOP_SITE" desc="Menu item in Brave's overflow/options menu. By default, when a user navigates to a web page, Brave shows the mobile site, that is, the version of the site designed for mobile phones. If this menu item is selected, however, Brave will try to load the 'desktop' site instead, i.e. the site designed for desktop computers or laptop computers, which have larger screens. [CHAR-LIMIT=24]">
         Desktop site
@@ -2929,7 +2951,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         Search your bookmarks
       </message>
       <message name="IDS_BOOKMARK_NO_RESULT" desc="Text explaining that no bookmarks are found to match a search query">
-        No bookmarks found
+        Can’t find that bookmark. Check your spelling or add a new bookmark.
       </message>
       <message name="IDS_EDIT_BOOKMARK" desc="The string prompting the user to edit the content of a bookmark. [CHAR-LIMIT=30]">
         Edit bookmark
@@ -2988,6 +3010,14 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         See downloads
       </message>
 
+      <!-- Offline indicator v2 -->
+      <message name="IDS_OFFLINE_INDICATOR_V2_OFFLINE_TEXT" desc="Text to be displayed in the status indicator above the toolbar that lets the users know they are offline.">
+        No internet connection
+      </message>
+      <message name="IDS_OFFLINE_INDICATOR_V2_BACK_ONLINE_TEXT" desc="Text to be displayed in the status indicator above the toolbar when the device goes back online.">
+        Back online
+      </message>
+
       <!-- Find in page -->
       <message name="IDS_HINT_FIND_IN_PAGE" desc="Hint text to show for the find in page search field when the search field is empty.">
         Find in page
@@ -3054,15 +3084,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_ACCESSIBILITY_TOOLBAR_BTN_SITE_INFO" desc="Content description for the page icon that gives more site information when clicked. The icon can be a magnifier for search result pages, or other icons representing the page state.">
         Site information
       </message>
-      <message name="IDS_ACCESSIBILITY_SECURITY_BTN_WARN" desc="Content description for the security icon for pages with insecure passive content. The content description also includes the call to action for opening the page info bubble (Site information).">
-        Your connection to this site is not secure. Site information
-      </message>
-      <message name="IDS_ACCESSIBILITY_SECURITY_BTN_SECURE" desc="Content description for the security icon for pages with a valid certificate. The content description also includes the call to action for opening the page info bubble (Site information).">
-        Connection is secure. Site information
-      </message>
-      <message name="IDS_ACCESSIBILITY_SECURITY_BTN_DANGEROUS" desc="Content description for the security icon for dangerous pages. The content description also includes the call to action for opening the page info bubble (Site information).">
-        This page is dangerous. Site information
-      </message>
       <message name="IDS_ACCESSIBILITY_TOOLBAR_BTN_MIC" desc="Content description for the voice search button.">
         Start voice search
       </message>
@@ -3437,6 +3458,21 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_ACCESSIBILITY_PLAY_VIDEO" desc="The accessibility string for the play video button.">
         Play video
       </message>
+      <message name="IDS_ACCESSIBILITY_PAUSE_VIDEO" desc="The accessibility string for the pause video button.">
+        Pause video
+      </message>
+      <message name="IDS_ACCESSIBILITY_MUTE_VIDEO" desc="The accessibility string for the mute video button.">
+        Mute video
+      </message>
+      <message name="IDS_ACCESSIBILITY_UNMUTE_VIDEO" desc="The accessibility string for the unmute video button.">
+        Unmute video
+      </message>
+      <message name="IDS_ACCESSIBILITY_VIDEO_PLAYER" desc="The accessibility string for the video player.">
+        Video player
+      </message>
+      <message name="IDS_ACCESSIBILITY_PLAYBACK_TIME" desc="The accessibility string for how much time has elapsed while viewing the video and how long the video is in total.">
+        Elapsed time <ph name="ELAPSED_TIME">%1$s<ex>0:01</ex></ph> of <ph name="TOTAL_TIME">%2$s<ex>0:45</ex></ph>.
+      </message>
 
       <!-- Special locale UI strings -->
       <message name="IDS_SEARCH_WITH_SOGOU" desc="Text telling the user that the search engine will be switched to Sogou.">
@@ -3757,6 +3793,14 @@ Only you can see what your camera is looking at. The site can't see your camera'
         Go to Brave settings
       </message>
 
+      <!-- Sharing Hub -->
+      <message name="IDS_SHARING_HUB_NO_DEVICES_AVAILABLE_TEXT" desc="Text to show when no device targets are available for sharing.">
+        To share this page to another device, turn on sync in Brave settings on the other device
+      </message>
+      <message name="IDS_SHARING_HUB_SYNC_DISABLED_TEXT" desc="Text to show when sync is disabled on the current device.">
+        To share this page to another device, turn on sync in Brave settings
+      </message>
+
       <!-- ClickToCall -->
       <message name="IDS_CLICK_TO_CALL_NOTIFICATION_TEXT" desc="Text displayed in a click to call notification to call on a number.">
         Tap to make call
@@ -3980,10 +4024,42 @@ Only you can see what your camera is looking at. The site can't see your camera'
         Please enable your camera to scan a QR code
       </message>
 
+      <message name="IDS_QR_CODE_OPEN_SETTINGS_DESCRIPTION" desc="Text on QR code sharing tab indicating that user needs to open settings to give camera permission.">
+        To scan a QR code, change your settings so that Brave can use your camera
+      </message>
+
       <message name="IDS_QR_CODE_PERMISSION_CONTINUE_LABEL" desc="Text on button on QR code sharing tab triggering camera permission dialog.">
         Continue
       </message>
 
+      <message name="IDS_QR_CODE_NO_CAMERA_ERROR" desc="Error text shown when no camera is found.">
+        To scan a QR code, use a device with a camera.
+      </message>
+
+      <message name="IDS_QR_CODE_DISABLED_CAMERA_ERROR" desc="Error text shown when the camera is disabled by the device policy manager.">
+        The organization that manages your device has turned off your camera.
+      </message>
+
+      <message name="IDS_QR_CODE_IN_USE_CAMERA_ERROR" desc="Error text shown when the camera is in use by other apps.">
+        Can't open your camera. Restart your device and try again.
+      </message>
+
+      <message name="IDS_QR_CODE_HARDWARE_CAMERA_ERROR" desc="Error text shown when the camera cannot start due to a hardware error.">
+        Can't open your camera. Something went wrong.
+      </message>
+
+      <message name="IDS_QR_CODE_OPEN_SETTINGS_LABEL" desc="Text on button on QR code sharing tab triggering Android settings.">
+        Open Settings
+      </message>
+
+      <message name="IDS_QR_CODE_NOT_A_URL_LABEL" desc="Text on toast on QR code scanning tab indicating that the QR Code does not correspond to a URL and can not be opened.">
+        This QR Code is not a URL: <ph name="QrCodeValue">%1$s<ex>QR Code Text</ex></ph>
+      </message>
+
+      <message name="IDS_QR_CODE_FILENAME_PREFIX" desc="File name prefix for downloaded qrcode that is followed by timestamp.">
+        chrome_qrcode_<ph name="CURRENT_TIMESTAMP_MS">%1$s<ex>1582667748515</ex></ph>
+      </message>
+
       <!-- Chime DFM module strings -->
       <message name="IDS_CHIME_MODULE_TITLE" desc="Text shown when the chime module is referenced in install start, success, failure UI (e.g. in IDS_MODULE_INSTALL_START_TEXT, which will expand to 'Installing Brave Notifications Platform for Brave…').">
         Brave Notifications Platform
@@ -3995,15 +4071,29 @@ Only you can see what your camera is looking at. The site can't see your camera'
       </message>
 
       <!-- NFC prompt -->
-      <message name="IDS_NFC_DISABLED_ON_DEVICE_MESSAGE" desc="Text shown in a prompt to turn on NFC after user granted NFC permission to a website.">
-        To continue, turn on NFC in Android settings
-      </message>
-      <message name="IDS_NFC_PROMPT_TURN_ON" desc="Text on the positive button of the nfc prompt">
-        Turn on
-      </message>
       <message name="IDS_ANDROID_NFC_OFF_GLOBALLY" desc="The message to show when NFC has been turned off globally in Android. Contains a link to the settings menu to enable NFC.">
         NFC is off for this device. Turn it on in <ph name="BEGIN_LINK">&lt;link&gt;</ph>Android Settings<ph name="END_LINK">&lt;/link&gt;</ph>.
       </message>
+      <message name="IDS_ANDROID_NFC_UNSUPPORTED" desc="The message to show when NFC is not supported globally in Android">
+        This device can't read NFC
+      </message>
+
+      <!-- Paint Preview Demo -->
+      <message name="IDS_PAINT_PREVIEW_DEMO_CAPTURE_SUCCESS" desc="Toast message displayed when paint preview capture finishes successfully. Used in paint preview demo mode." translateable="false">
+        Paint Preview captured successfully.
+      </message>
+      <message name="IDS_PAINT_PREVIEW_DEMO_CAPTURE_FAILURE" desc="Toast message displayed when paint preview capture fails. Used in paint preview demo mode." translateable="false">
+        Failed to capture Paint Preview.
+      </message>
+      <message name="IDS_PAINT_PREVIEW_DEMO_PLAYBACK_START" desc="Toast message displayed when paint preview starts displaying. Used in paint preview demo mode." translateable="false">
+        Displaying Paint Preview. Press back to exit the Paint Preview demo.
+      </message>
+      <message name="IDS_PAINT_PREVIEW_DEMO_PLAYBACK_END" desc="Toast message displayed when the user exits paint preview demo. Used in paint preview demo mode." translateable="false">
+        Exited Paint Preview demo.
+      </message>
+      <message name="IDS_PAINT_PREVIEW_DEMO_PLAYBACK_FAILURE" desc="Toast message displayed when there is a failure in playing back a paint preview for the demo. Used in paint preview demo mode." translateable="false">
+        Paint Preview playback failed.
+      </message>
 
       <message name="IDS_AUTOCOMPLETE_TOP_SITES_TITLE" desc="The label for settings switch controlling whether or not top sites show up in autocomplete">
         Show top sites in autocomplete
diff --git a/components/autofill_strings.grdp b/components/autofill_strings.grdp
index 28f2822281ee..31ecce025d94 100644
--- a/components/autofill_strings.grdp
+++ b/components/autofill_strings.grdp
@@ -243,10 +243,10 @@
         </message>
       </if>
       <if expr="is_android">
-        <message name="IDS_ENABLE_CREDIT_CARD_FIDO_AUTH_LABEL" desc="The authentication mechanism on Android. Label for a toggle that allows users to control whether or not to use FIDO authentication for credit card unmasking. Title-Cased.">
+        <message name="IDS_ENABLE_CREDIT_CARD_FIDO_AUTH_LABEL" desc="The authentication mechanism on Android. Label for a toggle that allows users to control whether or not to use FIDO authentication for credit card unmasking. Title-Cased." formatter_data="android_java">
           Screen lock
         </message>
-        <message name="IDS_ENABLE_CREDIT_CARD_FIDO_AUTH_SUBLABEL" desc="Sublabel for a toggle that allows users to control whether or not to use FIDO authentication for credit card unmasking for Android. Sentence-Cased.">
+        <message name="IDS_ENABLE_CREDIT_CARD_FIDO_AUTH_SUBLABEL" desc="Sublabel for a toggle that allows users to control whether or not to use FIDO authentication for credit card unmasking for Android. Sentence-Cased." formatter_data="android_java">
           Use screen lock to confirm cards faster
         </message>
       </if>
diff --git a/components/components_brave_strings.grd b/components/components_brave_strings.grd
index d844be02dc00..82e02e0be156 100644
--- a/components/components_brave_strings.grd
+++ b/components/components_brave_strings.grd
@@ -170,6 +170,7 @@
     <file path="strings/components_chromium_strings_sl.xtb" lang="sl" />
     <file path="strings/components_chromium_strings_sq.xtb" lang="sq" />
     <file path="strings/components_chromium_strings_sr.xtb" lang="sr" />
+    <file path="strings/components_chromium_strings_sr-Latn.xtb" lang="sr-Latn" />
     <file path="strings/components_chromium_strings_sv.xtb" lang="sv" />
     <file path="strings/components_chromium_strings_sw.xtb" lang="sw" />
     <file path="strings/components_chromium_strings_ta.xtb" lang="ta" />
diff --git a/components/components_settings_strings.grdp b/components/components_settings_strings.grdp
index 40a6d6e611c0..6dd68e07aa95 100644
--- a/components/components_settings_strings.grdp
+++ b/components/components_settings_strings.grdp
@@ -16,4 +16,7 @@
   <message name="IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON" desc="The label of the 'Configure proxy settings' button">
     Change proxy settings...
   </message>
+  <message name="IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL" desc="Header for multiple automatic downloads page on Content Settings dialog">
+    Automatic Downloads
+  </message>
 </grit-part>
diff --git a/components/components_strings.grd b/components/components_strings.grd
index 1d233a0924e5..1f6f1c5f2fbc 100644
--- a/components/components_strings.grd
+++ b/components/components_strings.grd
@@ -256,6 +256,7 @@
     <file path="strings/components_strings_sl.xtb" lang="sl" />
     <file path="strings/components_strings_sq.xtb" lang="sq" />
     <file path="strings/components_strings_sr.xtb" lang="sr" />
+    <file path="strings/components_strings_sr-Latn.xtb" lang="sr-Latn" />
     <file path="strings/components_strings_sv.xtb" lang="sv" />
     <file path="strings/components_strings_sw.xtb" lang="sw" />
     <file path="strings/components_strings_ta.xtb" lang="ta" />
@@ -273,7 +274,6 @@
   </translations>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">
-      <part file="app_modal_strings.grdp" />
       <part file="autofill_assistant_strings.grdp" />
       <part file="autofill_payments_strings.grdp" />
       <part file="autofill_strings.grdp" />
@@ -288,6 +288,7 @@
       <part file="find_in_page_strings.grdp" />
       <part file="flags_strings.grdp" />
       <part file="history_strings.grdp" />
+      <part file="javascript_dialogs_strings.grdp" />
       <part file="login_dialog_strings.grdp" />
       <part file="media_message_center_strings.grdp" />
       <part file="new_or_sad_tab_strings.grdp" />
@@ -298,6 +299,7 @@
       <part file="password_manager_strings.grdp" />
       <part file="payments_strings.grdp" />
       <part file="pdf_strings.grdp" />
+      <part file="permissions_strings.grdp" />
       <part file="policy_strings.grdp" />
       <part file="print_media_strings.grdp" />
       <part file="printing_component_strings.grdp" />
diff --git a/components/crash_strings.grdp b/components/crash_strings.grdp
index f97b6d4cd1a6..94751624cd30 100644
--- a/components/crash_strings.grdp
+++ b/components/crash_strings.grdp
@@ -8,27 +8,42 @@
   <message name="IDS_CRASH_CRASH_COUNT_BANNER_FORMAT" desc="Format for crash count banner on chrome://crashes">
     Crashes (<ph name="CRASH_COUNT">$1<ex>3</ex></ph>)
   </message>
-  <message name="IDS_CRASH_CRASH_HEADER_FORMAT" desc="Format for crash entry headings on chrome://crashes">
-    Uploaded Crash Report ID <ph name="CRASH_ID">$1<ex>8fa95dbb6f2ec862</ex></ph> (Local Context: <ph name="CRASH_LOCAL_ID">$2<ex>123456-789789</ex></ph>)
+
+  <message name="IDS_CRASH_SHOW_DEVELOPER_DETAILS" desc="Label for button that shows advanced developer information on chrome://crashes">
+    Show developer details
+  </message>
+
+  <message name="IDS_CRASH_CAPTURE_TIME_FORMAT" desc="Format for the time at which the crash report was captured, to display on chrome://crashes">
+    Crash from <ph name="CRASH_TIME">$1<ex>Tuesday, January 25, 2011 2:58:02 PM</ex></ph>
+  </message>
+  <message name="IDS_CRASH_REPORT_STATUS" desc="Label on chrome://crashes for the status of a crash report.">
+    Status:
   </message>
-  <message name="IDS_CRASH_CRASH_HEADER_FORMAT_LOCAL_ONLY" desc="Format for crash entry headings on chrome://crashes that have not been uploaded">
-    Local Context <ph name="CRASH_LOCAL_ID">$1<ex>123456-789789</ex></ph>
+  <message name="IDS_CRASH_REPORT_STATUS_NOT_UPLOADED" desc="Value on chrome://crashes for the 'not uploaded' status of a crash report.">
+    Not uploaded
   </message>
-  <message name="IDS_CRASH_UPLOAD_TIME_FORMAT" desc="Format for crash report upload time displayed on chrome://crashes">
-    Crash report uploaded on <ph name="UPLOAD_TIME">$1<ex>Tuesday, January 25, 2011 2:58:02 PM</ex></ph>
+  <message name="IDS_CRASH_REPORT_STATUS_PENDING" desc="Value on chrome://crashes for the 'pending' status of a crash report.">
+    Not yet uploaded, or ignored
   </message>
-  <message name="IDS_CRASH_CAPTURE_AND_UPLOAD_TIME_FORMAT" desc="Format for the time and date at which the crash report was captured, and subsequently uploaded, to display on chrome://crashes">
-    Crash report captured on <ph name="CRASH_TIME">$1<ex>Tuesday, January 25, 2011 2:58:02 PM</ex></ph>, uploaded on <ph name="UPLOAD_TIME">$2<ex>Tuesday, January 25, 2011 2:58:02 PM</ex></ph>
+  <message name="IDS_CRASH_REPORT_STATUS_PENDING_USER_REQUESTED" desc="Value on chrome://crashes for the 'pending user requested' status of a crash report.">
+    Upload requested by user
   </message>
-  <message name="IDS_CRASH_CRASH_NOT_UPLOADED" desc="Format for crash entry occurrence on chrome://crashes that was not uploaded to the server">
-    Crash report captured on <ph name="CRASH_TIME">$1<ex>Tuesday, January 25, 2011 2:58:02 PM</ex></ph> was not uploaded
+  <message name="IDS_CRASH_REPORT_STATUS_UPLOADED" desc="Value on chrome://crashes for the 'uploaded' status of a crash report.">
+    Uploaded
   </message>
-  <message name="IDS_CRASH_CRASH_PENDING" desc="Format for crash entry occurrence on chrome://crashes that has been captured, but not yet uploaded or ignored">
-    Crash report captured on <ph name="CRASH_TIME">$1<ex>Tuesday, January 25, 2011 2:58:02 PM</ex></ph> (not yet uploaded or ignored)
+  <message name="IDS_CRASH_REPORT_UPLOADED_ID" desc="Label on chrome://crashes for the identifier for an uploaded crash report on chrome://crashes">
+    Uploaded Crash Report ID:
   </message>
-  <message name="IDS_CRASH_CRASH_USER_REQUESTED" desc="Format for crash entry occurrence on chrome://crashes that has been requested to be uploaded by user">
-    Crash report captured on <ph name="CRASH_TIME">$1<ex>Tuesday, January 25, 2011 2:58:02 PM</ex></ph> (upload requested by user, not yet uploaded)
+  <message name="IDS_CRASH_REPORT_UPLOADED_TIME" desc="Label on chrome://crashes for the time at which the crash report was uploaded.">
+    Upload Time:
   </message>
+  <message name="IDS_CRASH_REPORT_LOCAL_ID" desc="Label on chrome://crashes for the identifier of a crash report on the user's machine">
+    Local Crash Context:
+  </message>
+  <message name="IDS_CRASH_REPORT_FILE_SIZE" desc="Label on chrome://crashes for the file size of a crash report on the user's machine">
+    Size:
+  </message>
+
   <message name="IDS_CRASH_BUG_LINK_LABEL" desc="Link text for filing a crash bug on chrome://crashes">
     Provide additional details
   </message>
@@ -44,7 +59,4 @@
   <message name="IDS_CRASH_UPLOAD_NOW_LINK_TEXT" desc="Link text for manual uploads of a crash report">
     Send now
   </message>
-  <message name="IDS_CRASH_SIZE_MESSAGE" desc="Format for displaying file size information for not uploaded crash reports.">
-    The size on the local storage is <ph name="CRASH_SIZE">$1<ex>10 kB</ex></ph>.
-  </message>
 </grit-part>
diff --git a/components/dom_distiller_strings.grdp b/components/dom_distiller_strings.grdp
index 5ed49a1efd10..8d4a51facbf8 100644
--- a/components/dom_distiller_strings.grdp
+++ b/components/dom_distiller_strings.grdp
@@ -32,23 +32,26 @@
   <message name="IDS_DOM_DISTILLER_VIEWER_FAILED_TO_FIND_ARTICLE_CONTENT" desc="The text to show in place of reading list article content if the article is not found.">
     Could not find the requested article.
   </message>
-  <message name="IDS_DOM_DISTILLER_VIEWER_LOADING_TITLE" desc="The text to show in place of a reading list article title while the article is loading. Translation should match TC ID 7558334641404735182, 7078777000119799848, and 8486137854427127199.">
-    Simplified view
-  </message>
+  <if expr="is_android or is_ios">
+    <then>
+      <message name="IDS_DOM_DISTILLER_VIEWER_LOADING_TITLE" desc="The text to show in place of a reading list article title while the article is loading. Translation should match TC ID 7558334641404735182, 7078777000119799848, and 8486137854427127199.">
+        Simplified view
+      </message>
+    </then>
+    <else> <!-- Desktop -->
+      <message name="IDS_DOM_DISTILLER_VIEWER_LOADING_TITLE" desc="The text to show in place of a reading list article title while the article is loading.">
+        Loading...
+      </message>
+    </else>
+  </if>
   <message name="IDS_DOM_DISTILLER_VIEWER_NO_DATA_CONTENT" desc="The text to show in place of reading list article content if there is no data found.">
     No data found.
   </message>
-  <message name="IDS_DOM_DISTILLER_QUALITY_QUESTION" desc="Question to ask the user about whether the text from a web page was extracted correctly.">
-    Was the text extracted correctly?
-  </message>
-  <message name="IDS_DOM_DISTILLER_QUALITY_ANSWER_YES" desc="Text for the answering whether the text from a web page was extracted correctly and the answer is yes.">
-    Yes
-  </message>
-  <message name="IDS_DOM_DISTILLER_QUALITY_ANSWER_NO" desc="Text for the answering whether the text from a web page was extracted correctly and the answer is no.">
-    No
-  </message>
   <message name="IDS_DOM_DISTILLER_WEBUI_TITLE" desc="The title to show on the DOM Distiller debug page.">
     DOM Distiller
   </message>
+  <message name="IDS_DOM_DISTILLER_VIEWER_TITLE_SUFFIX" desc="The suffix to show after the page title to indicate we are in reader mode. For example, if the page title was 'An Article', this would be appended to create the title 'An Article - Reader Mode'.">
+    Reader Mode
+  </message>
 
 </grit-part>
diff --git a/components/flags_strings.grdp b/components/flags_strings.grdp
index f242c28cf51d..20b9d4b68b13 100644
--- a/components/flags_strings.grdp
+++ b/components/flags_strings.grdp
@@ -11,7 +11,7 @@
     Experiments
   </message>
   <message name="IDS_FLAGS_UI_PAGE_RESET" translateable="false" desc="Label for button that resets the flags to their default value.">
-    Reset all to default
+    Reset all
   </message>
   <message name="IDS_FLAGS_UI_PAGE_WARNING" desc="A warning stating that the features of the page are experimental.">
     Warning: Experimental features ahead!
@@ -76,7 +76,7 @@
   <!-- about:flags/deprecated
       New entries here should also be added for about:flags above -->
   <message name="IDS_DEPRECATED_FEATURES_PAGE_RESET" desc="Label for button that resets the features to their default value.">
-    Reset all to default
+    Reset all
   </message>
   <message name="IDS_DEPRECATED_FEATURES_OWNER_WARNING" desc="A warning stating what system-wide features can only be set by the owner.">
     Features that apply system-wide can only be set by the owner: <ph name="OWNER_EMAIL">$1<ex>owner@email.com</ex></ph>
diff --git a/components/app_modal_strings.grdp b/components/javascript_dialogs_strings.grdp
similarity index 100%
rename from components/app_modal_strings.grdp
rename to components/javascript_dialogs_strings.grdp
diff --git a/components/management_strings.grdp b/components/management_strings.grdp
index 7370ff089f6e..20bcf18c7a9e 100644
--- a/components/management_strings.grdp
+++ b/components/management_strings.grdp
@@ -100,6 +100,9 @@
     <message name="IDS_MANAGEMENT_REPORT_DEVICE_NETWORK_INTERFACES" desc="Message stating that administrators see device network interfaces.">
       Network addresses
     </message>
+    <message name="IDS_MANAGEMENT_REPORT_DEVICE_CRASH_REPORTS" desc="Message stating that administrators see the numbers and causes of the crashes that occurred on the device recently.">
+      Numbers and causes of the crashes that occurred recently
+    </message>
     <message name="IDS_MANAGEMENT_REPORT_PRINTING" desc="Message stating that administrators can see names of printed files.">
       Names of files that you print
     </message>
@@ -166,21 +169,21 @@
     Performance data and crash reports
   </message>
 
-  <!-- Strings related to Enterprise Service Hooks -->
-  <message name="IDS_MANAGEMENT_THREAT_PROTECTION" desc="Title of the Enterprise Service Hooks section of the page">
-    Enterprise Service Hooks
+  <!-- Strings related to Brave Enterprise Connectors -->
+  <message name="IDS_MANAGEMENT_THREAT_PROTECTION" desc="Title of the Brave Enterprise Connectors section of the page">
+    Brave Enterprise Connectors
   </message>
-  <message name="IDS_MANAGEMENT_THREAT_PROTECTION_DESCRIPTION" desc="Description of the Enterprise Service Hooks section of the page">
-    Your administrator has enabled Enterprise Service Hooks on your browser. These hooks have access to some of your data.
+  <message name="IDS_MANAGEMENT_THREAT_PROTECTION_DESCRIPTION" desc="Description of the Brave Enterprise Connectors section of the page">
+    Your administrator has enabled Brave Enterprise Connectors on your browser. These connectors have access to some of your data.
   </message>
-  <message name="IDS_MANAGEMENT_THREAT_PROTECTION_DESCRIPTION_BY" desc="Description of the Enterprise Service Hooks section of the page">
-    <ph name="ENROLLMENT_DOMAIN">$1<ex>example.com</ex></ph> has enabled Enterprise Service Hooks on your browser. These hooks have access to some of your data.
+  <message name="IDS_MANAGEMENT_THREAT_PROTECTION_DESCRIPTION_BY" desc="Description of the Brave Enterprise Connectors section of the page">
+    <ph name="ENROLLMENT_DOMAIN">$1<ex>example.com</ex></ph> has enabled Brave Enterprise Connectors on your browser. These connectors have access to some of your data.
   </message>
   <message name="IDS_MANAGEMENT_DATA_LOSS_PREVENTION_NAME" desc="Name for the data loss prevention feature">
     Data Loss Prevention
   </message>
-  <message name="IDS_MANAGEMENT_DATA_LOSS_PREVENTION_PERMISSIONS" desc="Permissions description for the data loss prevention feature">
-    Scan the contents of the files that you download or upload in Brave.
+  <message name="IDS_MANAGEMENT_DATA_LOSS_PREVENTION_PERMISSIONS" desc="Permissions description for the data loss prevention feature.  The part that says 'that you download or upload in Brave' applies only to files, not the clipboard">
+    Scan the contents of the clipboard, as well as files that you download or upload in Brave.
   </message>
   <message name="IDS_MANAGEMENT_MALWARE_SCANNING_NAME" desc="Name for the malware scanning feature">
     Malware Scanning
@@ -192,6 +195,6 @@
     Enterprise Reporting
   </message>
   <message name="IDS_MANAGEMENT_ENTERPRISE_REPORTING_PERMISSIONS" desc="Permissions description for the enterprise reporting feature">
-    Share data about security events that have been flagged by Enterprise Service Hooks with your administrator. This may include URLs of pages you visit, file names or metadata, and the username you use to sign in to your device and Brave.
+    Share data about security events that have been flagged by Brave Enterprise Connectors with your administrator. This may include URLs of pages you visit, file names or metadata, and the username you use to sign in to your device and Brave.
   </message>
 </grit-part>
diff --git a/components/new_or_sad_tab_strings.grdp b/components/new_or_sad_tab_strings.grdp
index 83ac4c961b42..1c7aa575a730 100644
--- a/components/new_or_sad_tab_strings.grdp
+++ b/components/new_or_sad_tab_strings.grdp
@@ -160,14 +160,14 @@
           <ph name="LIST_ITEM">&lt;li&gt;</ph>Your internet service provider
         <ph name="END_LIST">&lt;/ul&gt;</ph>
       </message>
-      <message name="IDS_NEW_TAB_OTR_COOKIE_CONTROLS_CONTROLLED_TOOLTIP_TEXT" desc="Text displayed in the settings tooltip when third-party cookie blocking is managed or turned on by the user.">
-        This setting is enforced by "<ph name="ENFORCING_SETTING">$1<ex>Block third-party cookies</ex></ph>" in "<ph name="SETTINGS_PAGE">$2<ex>Cookies and site data</ex></ph>"
+      <message name="IDS_NEW_TAB_OTR_COOKIE_CONTROLS_CONTROLLED_TOOLTIP_TEXT" desc="Text displayed in the settings tooltip when third-party cookie blocking is managed or turned on by the user." formatter_data="android_java">
+        This setting is controlled in Cookies settings.
       </message>
       <message name="IDS_NEW_TAB_OTR_THIRD_PARTY_COOKIE" desc="Label for the Block 3rd-party cookie checkbox on the Cookies category." formatter_data="android_java">
         Block third-party cookies
       </message>
       <message name="IDS_NEW_TAB_OTR_THIRD_PARTY_COOKIE_SUBLABEL" desc="A sub-label below the Block 3rd-party cookie checkbox." formatter_data="android_java">
-        When on, sites can’t use your browsing activity across different sites to personalize ads. Some sites may not work properly.
+        When on, sites can't use cookies that track you across the web. Features on some sites may break.
       </message>
 
 </grit-part>
diff --git a/components/omnibox_strings.grdp b/components/omnibox_strings.grdp
index 9b9dd7d5b243..9015e5274701 100644
--- a/components/omnibox_strings.grdp
+++ b/components/omnibox_strings.grdp
@@ -81,6 +81,9 @@
   <message name="IDS_OMNIBOX_FILE" desc="Text shown in the omnibox to indicate a user is viewing a file.">
     File
   </message>
+  <message name="IDS_OMNIBOX_READER_MODE" desc="Text shown in the omnibox to indicate a user is viewing the reader mode view of an article.">
+    Reader Mode
+  </message>
   <message name="IDS_DRIVE_SUGGESTION_DOCUMENT" desc="Google Docs product name, for use in omnibox Docs result descriptions.">
     Google Docs
   </message>
@@ -97,6 +100,12 @@
     Google Drive
   </message>
   <message name="IDS_DRIVE_SUGGESTION_DESCRIPTION_TEMPLATE" desc="Product description for Google Drive omnibox results.">
+    <ph name="RESULT_MODIFIED_DATE">$1<ex>12/31/2018</ex></ph> - <ph name="RESULT_OWNER">$2<ex>First Last</ex></ph> - <ph name="RESULT_PRODUCT_SOURCE">$3<ex>Google Docs</ex></ph>
+  </message>
+  <message name="IDS_DRIVE_SUGGESTION_DESCRIPTION_TEMPLATE_WITHOUT_DATE" desc="Product description for Google Drive omnibox results when date is missing.">
+    <ph name="RESULT_OWNER">$1<ex>First Last</ex></ph> - <ph name="RESULT_PRODUCT_SOURCE">$2<ex>Google Docs</ex></ph>
+  </message>
+  <message name="IDS_DRIVE_SUGGESTION_DESCRIPTION_TEMPLATE_WITHOUT_OWNER" desc="Product description for Google Drive omnibox results when owner is missing.">
     <ph name="RESULT_MODIFIED_DATE">$1<ex>12/31/2018</ex></ph> - <ph name="RESULT_PRODUCT_SOURCE">$2<ex>Google Docs</ex></ph>
   </message>
 
diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp
index 445139b563a7..6e9d504ad9ae 100644
--- a/components/page_info_strings.grdp
+++ b/components/page_info_strings.grdp
@@ -32,6 +32,12 @@
   <message name="IDS_PAGE_INFO_DEVTOOLS_PAGE" desc="Message to display in the page info bubble when the page you are on is a devtools:// page.">
     You're viewing a developer tools page
   </message>
+  <message name="IDS_PAGE_INFO_READER_MODE_PAGE_SECURE" desc="Message to display in the page info bubble when the page you are viewing is the reader mode version of an article which was retrieved over a secure connection.">
+    Brave simplified this page to make it easier to read. Brave retrieved the original page over a secure connection.
+  </message>
+  <message name="IDS_PAGE_INFO_READER_MODE_PAGE" desc="Message to display in the page info bubble when the page you are viewing is the reader mode version of an article which was retrieved over an insecure connection.">
+    Brave simplified this page to make it easier to read. Brave retrieved the original page over an insecure connection.
+  </message>
 
   <!-- Safety Tip summary strings -->
   <message name="IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_TITLE" desc="Message to display in the page info bubble when the page you are on triggered a safety tip.">
@@ -274,6 +280,9 @@
     <message name="IDS_PAGE_INFO_TYPE_SERIAL" desc="The label used for the serial port permission controls in the Page Info popup.">
       Serial ports
     </message>
+    <message name="IDS_PAGE_INFO_TYPE_BLUETOOTH" desc="The label used for the Bluetooth permission controls in the Page Info popup.">
+      Bluetooth devices
+    </message>
     <message name="IDS_PAGE_INFO_TYPE_NATIVE_FILE_SYSTEM_WRITE" desc="The label used for the native file system write permission controls in the Page Info popup. The write permission determines whether sites are allowed to save to the original file that was selected by the user through the Native File System API.">
       File editing
     </message>
@@ -283,12 +292,11 @@
     <message name="IDS_PAGE_INFO_TYPE_NFC" desc="The label used for the NFC permission controls in the Page Info popup.">
       NFC devices
     </message>
-      <!-- TODO(crbug.com/1041009): Finalize WebXr Permissions strings -->
     <message name="IDS_PAGE_INFO_TYPE_VR" desc="The label used for the VR permission controls in the Page Info popup.">
-      Virtual Reality
+      Virtual reality
     </message>
     <message name="IDS_PAGE_INFO_TYPE_AR" desc="The label used for the AR permission controls in the Page Info popup.">
-      Augmented Reality
+      Augmented reality
     </message>
     <!-- TODO(crbug.com/716303): A few permissions are missing here. -->
 
@@ -377,6 +385,12 @@
     <message name="IDS_PAGE_INFO_DELETE_SERIAL_PORT" desc="The tooltip displayed when hovering over the button that will remove permission to access a serial port that the user previously granted to the site.">
       Revoke access
     </message>
+    <message name="IDS_PAGE_INFO_BLUETOOTH_DEVICE_SECONDARY_LABEL" desc="The label displayed underneath the device name to inform the user that the item refers to a Bluetooth device.">
+      Bluetooth device
+    </message>
+    <message name="IDS_PAGE_INFO_DELETE_BLUETOOTH_DEVICE" desc="The tooltip displayed when hovering over the button that will remove permission to access a Bluetooth device that the user previously granted to the site.">
+      Revoke access
+    </message>
 
     <!-- Site settings link -->
     <message name="IDS_PAGE_INFO_SITE_SETTINGS_LINK" desc="This is the text of the link pointing to Brave's Site Settings page. This appears at the bottom of the Permissions pane of the Page Information Window.">
@@ -442,6 +456,15 @@
       <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SAVED_3_DOMAINS" desc="A short paragraph explaining to a Brave user that they have reused their saved password on the current website and to change their password on three domains.">
         You just entered your password on a deceptive site. Brave recommends going to <ph name="WEBSITE_1">$1<ex>www.google.com</ex></ph>, <ph name="WEBSITE_2">$2<ex>www.reddit.com</ex></ph>, <ph name="WEBSITE_3">$3<ex>www.amazon.com</ex></ph>, and other sites where you use this password and changing it now.
       </message>
+      <message name="IDS_PAGE_INFO_CHECK_PASSWORD_DETAILS_SAVED_1_DOMAIN" desc="A short paragraph explaining to a Brave user that they have reused their saved password on the current website and to check their password on one domain.">
+        You just entered your password on a deceptive site. Brave recommends checking your saved passwords for <ph name="WEBSITE_1">$1<ex>www.google.com</ex></ph> and other sites where you use this password now.
+      </message>
+      <message name="IDS_PAGE_INFO_CHECK_PASSWORD_DETAILS_SAVED_2_DOMAIN" desc="A short paragraph explaining to a Brave user that they have reused their saved password on the current website and to check their password on two domains.">
+        You just entered your password on a deceptive site. Brave recommends checking your saved passwords for <ph name="WEBSITE_1">$1<ex>www.google.com</ex></ph>, <ph name="WEBSITE_2">$2<ex>www.reddit.com</ex></ph>, and other sites where you use this password now.
+      </message>
+      <message name="IDS_PAGE_INFO_CHECK_PASSWORD_DETAILS_SAVED_3_DOMAIN" desc="A short paragraph explaining to a Brave user that they have reused their saved password on the current website and to check their password on three domains.">
+        You just entered your password on a deceptive site. Brave recommends checking your saved passwords for <ph name="WEBSITE_1">$1<ex>www.google.com</ex></ph>, <ph name="WEBSITE_2">$2<ex>www.reddit.com</ex></ph>, <ph name="WEBSITE_3">$3<ex>www.amazon.com</ex></ph>, and other sites where you use this password now.
+      </message>
       <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SYNC" desc="A short paragraph explaining to a Brave sync user that they have reused their Brave password on the current website.">
         Brave can help you protect your Brave Account and change your password.
       </message>
@@ -471,6 +494,15 @@
       <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SAVED_3_DOMAINS" desc="A short paragraph explaining to a Brave user that they have reused their saved password on the current website and to change their password on three domains.">
         You just entered your password on a deceptive site. Brave recommends going to <ph name="WEBSITE_1">$1<ex>www.google.com</ex></ph>, <ph name="WEBSITE_2">$2<ex>www.reddit.com</ex></ph>, <ph name="WEBSITE_3">$3<ex>www.amazon.com</ex></ph>, and other sites where you use this password and changing it now.
       </message>
+      <message name="IDS_PAGE_INFO_CHECK_PASSWORD_DETAILS_SAVED_1_DOMAIN" desc="A short paragraph explaining to a Brave user that they have reused their saved password on the current website and to check their password on one domain.">
+        You just entered your password on a deceptive site. Brave recommends checking your saved passwords for <ph name="WEBSITE_1">$1<ex>www.google.com</ex></ph> and other sites where you use this password now.
+      </message>
+      <message name="IDS_PAGE_INFO_CHECK_PASSWORD_DETAILS_SAVED_2_DOMAIN" desc="A short paragraph explaining to a Brave user that they have reused their saved password on the current website and to check their password on two domains.">
+        You just entered your password on a deceptive site. Brave recommends checking your saved passwords for <ph name="WEBSITE_1">$1<ex>www.google.com</ex></ph>, <ph name="WEBSITE_2">$2<ex>www.reddit.com</ex></ph>, and other sites where you use this password now.
+      </message>
+      <message name="IDS_PAGE_INFO_CHECK_PASSWORD_DETAILS_SAVED_3_DOMAIN" desc="A short paragraph explaining to a Brave user that they have reused their saved password on the current website and to check their password on three domains.">
+        You just entered your password on a deceptive site. Brave recommends checking your saved passwords for <ph name="WEBSITE_1">$1<ex>www.google.com</ex></ph>, <ph name="WEBSITE_2">$2<ex>www.reddit.com</ex></ph>, <ph name="WEBSITE_3">$3<ex>www.amazon.com</ex></ph>, and other sites where you use this password now.
+      </message>
       <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SYNC" desc="A short paragraph explaining to a Brave sync user that they have reused their Brave password on the current website.">
         Brave can help you protect your Brave Account and change your password.
       </message>
@@ -489,6 +521,9 @@
       <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_BUTTON" desc="In Title Case: The string used in the page info change password button.">
         Change Password
       </message>
+      <message name="IDS_PAGE_INFO_CHECK_PASSWORDS_BUTTON" desc="In Title Case: The string used in the page info check passwords button.">
+        Check Passwords
+      </message>
       <message name="IDS_PAGE_INFO_PROTECT_ACCOUNT_BUTTON" desc="In Title Case: The string used in the page info protect account button.">
         Protect Account
       </message>
@@ -500,6 +535,9 @@
       <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_BUTTON" desc="The string used in the page info change password button.">
         Change password
       </message>
+      <message name="IDS_PAGE_INFO_CHECK_PASSWORDS_BUTTON" desc="The string used in the page info check passwords button.">
+        Check passwords
+      </message>
       <message name="IDS_PAGE_INFO_PROTECT_ACCOUNT_BUTTON" desc="The string used in the page info protect account button.">
         Protect account
       </message>
@@ -527,4 +565,49 @@
   <message name="IDS_PAGE_INFO_VR_TURN_OFF_BUTTON_TEXT" desc="Label on the button that's used to turn off the VR presentation.">
     End
   </message>
+
+  <!-- Certificate viewer dialog strings that are shared across all the platforms -->
+  <message name="IDS_CERT_INFO_SUBJECT_GROUP" desc="The label of the Issued To group in the general page of the certificate info dialog">
+    Issued To
+  </message>
+  <message name="IDS_CERT_INFO_ISSUER_GROUP" desc="The label of the Issued By group in the general page of the certificate info dialog">
+    Issued By
+  </message>
+  <message name="IDS_CERT_INFO_COMMON_NAME_LABEL" desc="The label of the Common Name field in the general page of the certificate info dialog.  (CN) is the name of this field in the standard">
+    Common Name (CN)
+  </message>
+  <message name="IDS_CERT_INFO_ORGANIZATION_LABEL" desc="The label of the Organization field in the general page of the certificate info dialog.  (O) is the name of this field in the standard">
+    Organization (O)
+  </message>
+  <message name="IDS_CERT_INFO_ORGANIZATIONAL_UNIT_LABEL" desc="The label of the Organizational Unit field in the general page of the certificate info dialog.  (OU) is the name of this field in the standard">
+    Organizational Unit (OU)
+  </message>
+  <message name="IDS_CERT_INFO_SERIAL_NUMBER_LABEL" desc="The label of the Serial Number field in the general page of the certificate info dialog.">
+    Serial Number
+  </message>
+  <message name="IDS_CERT_INFO_VALIDITY_GROUP" desc="The label of the group showing the validity (issued and expired dates) in the general page of the certificate info dialog">
+    Validity Period
+  </message>
+  <message name="IDS_CERT_INFO_ISSUED_ON_LABEL" desc="The label of the Issued On field in the general page of the certificate info dialog">
+    Issued On
+  </message>
+  <message name="IDS_CERT_INFO_EXPIRES_ON_LABEL" desc="The label of the Issued On field in the general page of the certificate info dialog">
+    Expires On
+  </message>
+  <message name="IDS_CERT_INFO_FINGERPRINTS_GROUP" desc="The label of the group showing the certificate fingerprints in the general page of the certificate info dialog">
+    Fingerprints
+  </message>
+  <message name="IDS_CERT_INFO_SHA256_FINGERPRINT_LABEL" desc="The label of the SHA-256 Fingerprint field in the general page of the certificate info dialog">
+    SHA-256 Fingerprint
+  </message>
+  <message name="IDS_CERT_INFO_SHA1_FINGERPRINT_LABEL" desc="The label of the SHA-1 Fingerprint field in the general page of the certificate info dialog">
+    SHA-1 Fingerprint
+  </message>
+
+  <message name="IDS_CERT_DETAILS_EXTENSIONS" desc="The label of the Extensions element in the details page of the certificate info dialog.">
+    Extensions
+  </message>
+  <message name="IDS_CERT_X509_SUBJECT_ALT_NAME" desc="description of extension Certificate Subject Alternative Name">
+    Certificate Subject Alternative Name
+  </message>
 </grit-part>
diff --git a/components/password_manager_strings.grdp b/components/password_manager_strings.grdp
index 7269d128b4d2..46891f9c71e8 100644
--- a/components/password_manager_strings.grdp
+++ b/components/password_manager_strings.grdp
@@ -35,6 +35,12 @@
   <message name="IDS_PASSWORD_MANAGER_EMPTY_LOGIN" desc="A placeholder for the 'Manage Passwords' bubble's empty username label">
     No username
   </message>
+  <message name="IDS_PASSWORD_MANAGER_OPT_INTO_ACCOUNT_STORE" desc="A menu item allowing signed-in users to opt into using account-stored passwords.">
+    Use passwords stored in your Brave account
+  </message>
+  <message name="IDS_PASSWORD_MANAGER_OPT_INTO_ACCOUNT_STORED_GENERATION" desc="A menu item allowing signed-in users to opt into the account store and generate a password.">
+    Use your Brave account to generate a strong password
+  </message>
   <if expr="not use_titlecase">
     <message name="IDS_PASSWORD_MANAGER_MANAGE_PASSWORDS" desc="The menu item in the password field drop down that opens the list of saved passwords.">
       Manage passwords…
@@ -63,4 +69,7 @@
   <message name="IDS_PASSWORD_MANAGER_DEFAULT_EXPORT_FILENAME" desc="Brave suggests this file name when user chooses to export their passwords saved with Brave.">
     Brave Passwords
   </message>
+   <message name="IDS_PASSWORD_CHANGE" desc="The text of the change password button in the dialog for credentials leaked.">
+    Change password
+  </message>
 </grit-part>
diff --git a/components/payments_strings.grdp b/components/payments_strings.grdp
index 6c2015643d16..db1456039a79 100644
--- a/components/payments_strings.grdp
+++ b/components/payments_strings.grdp
@@ -209,6 +209,9 @@
     <message name="IDS_PAYMENTS_PAY_BUTTON" desc="The label for the button that finishes the payment process. Sentence-cased." formatter_data="android_java">
       Pay
     </message>
+    <message name="IDS_PAYMENTS_CONTINUE_BUTTON" desc="The label for the button that continues to the payment handler window. Sentence-cased." formatter_data="android_java">
+      Continue
+    </message>
     <message name="IDS_PAYMENTS_ADD_CONTACT" desc="Text on a button that lets a user add new contact details, like the user's full name, an email address or a phone number. Sentence-cased." formatter_data="android_java">
       Add contact info
     </message>
@@ -233,6 +236,9 @@
     <message name="IDS_PAYMENTS_PAY_BUTTON" desc="The label for the button that finishes the payment process. Title-Cased.">
       Pay
     </message>
+    <message name="IDS_PAYMENTS_CONTINUE_BUTTON" desc="The label for the button that continues to the payment handler window. Title-Cased.">
+      Continue
+    </message>
     <message name="IDS_PAYMENTS_ADD_CONTACT" desc="Text on a button that lets a user add new contact details, like the user's full name, an email address or a phone number. Title-Cased.">
       Add Contact Info
     </message>
diff --git a/components/pdf_strings.grdp b/components/pdf_strings.grdp
index 11882abf4684..6e4b1cf01330 100644
--- a/components/pdf_strings.grdp
+++ b/components/pdf_strings.grdp
@@ -47,6 +47,15 @@
     <message name="IDS_PDF_TOOLTIP_FIT_WIDTH" desc="Button tooltip for the button which zooms a PDF so that the width of a single page fills the window horizontally">
       Fit to width
     </message>
+    <!-- TODO(nigi): Remove the translateable="false" attributes for messages
+    IDS_PDF_TOOLTIP_TWO_UP_VIEW_ENABLE and IDS_PDF_TOOLTIP_TWO_UP_VIEW_DISABLE
+    once their tooltips are finalized. -->
+    <message name="IDS_PDF_TOOLTIP_TWO_UP_VIEW_ENABLE" desc="Button tooltip for the button which enables displaying two pages of a PDF on the screen horizontally" translateable="false">
+      Enable two-up view
+    </message>
+    <message name="IDS_PDF_TOOLTIP_TWO_UP_VIEW_DISABLE" desc="Button tooltip for the button which stops displaying two pages of a PDF on the screen horizontally" translateable="false">
+      Disable two-up view
+    </message>
     <message name="IDS_PDF_TOOLTIP_ZOOM_IN" desc="Button tooltip for the button which zooms in a PDF, so that the document appears larger">
       Zoom in
     </message>
@@ -59,12 +68,12 @@
     <message name="IDS_PDF_PAGE_INDEX" desc="Accessible label for each page, describing the page number">
       {COUNT, plural,
          =1 {Page 1}
-         other {Page #}}
+         other {Page {COUNT}}}
     </message>
     <message name="IDS_PDF_DOCUMENT_PAGE_COUNT" desc="Accessible name of PDF document. It gives information about the number of pages in the PDF file">
-      PDF document containing {COUNT, plural,
-      =1 {1 page}
-      other {# pages}}
+      {COUNT, plural,
+      =1 {PDF document containing {COUNT} page}
+      other {PDF document containing {COUNT} pages}}
     </message>
     <if expr="chromeos">
       <message name="IDS_PDF_DISCARD_FORM_CHANGES" desc="Title for a dialog that informs the user that the changes they have made to a form will be lost if they continue">
diff --git a/components/permissions_strings.grdp b/components/permissions_strings.grdp
new file mode 100644
index 000000000000..32329aea85d8
--- /dev/null
+++ b/components/permissions_strings.grdp
@@ -0,0 +1,137 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--This file is created by l10nUtil.js. Do not edit manually.-->
+<grit-part>
+  <if expr="not is_android">
+    <message name="IDS_GEOLOCATION_INFOBAR_TEXT" desc="Text requesting permission for a site to access the user's physical location">
+      <ph name="URL">$1<ex>maps.google.com</ex></ph> wants to use your computer's location
+    </message>
+  </if>
+  <if expr="is_android">
+    <message name="IDS_GEOLOCATION_INFOBAR_TEXT" desc="Mobile: Text requesting permission for a site to access the user's physical location">
+      <ph name="URL">$1<ex>maps.google.com</ex></ph> wants to use your device's location
+    </message>
+    <message name="IDS_ACCESSIBILITY_EVENTS_INFOBAR_TEXT" desc="Text requesting permission for a site to listen to accessibility events, for example if the user has a screen reader or braille device enabled">
+      <ph name="URL">$1<ex>maps.google.com</ex></ph> wants to respond to accessibility events
+    </message>
+    <message name="IDS_CLIPBOARD_INFOBAR_TEXT" desc="Text requesting permission for a site to read data from the system clipboard">
+      <ph name="URL">$1<ex>maps.google.com</ex></ph> wants to see text and images copied to the clipboard
+    </message>
+    <message name="IDS_NFC_INFOBAR_TEXT" desc="Text requesting permission for a site to use NFC">
+      <ph name="URL">$1<ex>google.com</ex></ph> wants to send and receive info when you tap your phone on an NFC device
+    </message>
+    <message name="IDS_VR_INFOBAR_TEXT" desc="Text requesting permission for a site to use VR">
+      <ph name="URL">$1<ex>google.com</ex></ph> wants to use your virtual reality device and data
+    </message>
+    <message name="IDS_AR_INFOBAR_TEXT" desc="Text requesting permission for a site to use AR">
+      <ph name="URL">$1<ex>google.com</ex></ph> wants to create a 3D map of your surroundings and track camera position
+    </message>
+    <message name="IDS_NOTIFICATION_QUIET_PERMISSION_PROMPT_TITLE" desc="Text used as notification title when requesting permission for Web Notifications via a notification.">
+      Notifications for <ph name="ORIGIN">$1<ex>example.com</ex></ph> are blocked
+    </message>
+    <message name="IDS_NOTIFICATION_QUIET_PERMISSION_PROMPT_MESSAGE" desc="Text used as notification message when requesting permission for Web Notifications via a notification.">
+      Notifications are automatically blocked for all sites except ones you allow
+    </message>
+    <message name="IDS_MEDIA_CAPTURE_AUDIO_ONLY_INFOBAR_TEXT" desc="Text requesting permission for a site to access the computer's microphone.">
+      <ph name="HOST">$1<ex>html5rocks.com</ex></ph> wants to use your microphone
+    </message>
+    <message name="IDS_MEDIA_CAPTURE_VIDEO_ONLY_INFOBAR_TEXT" desc="Text requesting permission for a site to access the computer's camera.">
+      <ph name="HOST">$1<ex>html5rocks.com</ex></ph> wants to use your camera
+    </message>
+    <message name="IDS_NOTIFICATIONS_INFOBAR_TEXT" desc="Text requesting permission for Web Notifications.">
+      <ph name="site">$1<ex>mail.google.com</ex></ph> wants to send you notifications
+    </message>
+    <message name="IDS_MIDI_SYSEX_INFOBAR_TEXT" desc="Text requesting permission for a site to access MIDI devices with system exclusive messages.">
+      <ph name="URL">$1<ex>www.google.com</ex></ph> wants to get full control of your MIDI devices
+    </message>
+    <message name="IDS_STORAGE_ACCESS_INFOBAR_TEXT" desc="Permission request shown if the user is visiting a site needs access to its data while it is embedded into another site.">
+      <ph name="EMBEDDED_URL">$1<ex>news.site</ex></ph> wants to use cookies and site data on <ph name="TOP_LEVEL_URL">$2<ex>content_domain.site</ex></ph>
+    </message>
+    <message name="IDS_INFOBAR_UPDATE_PERMISSIONS_BUTTON_TEXT" desc="Button text shown when Brave does not have the necessary permission required to complete the requested tasks (e.g. a website has request location information, but Brave is missing that Android permission).">
+      Continue
+    </message>
+    <message name="IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO_INFOBAR_TEXT" desc="Text requesting permission for a site to access the computer's microphone and camera.">
+      <ph name="HOST">$1<ex>html5rocks.com</ex></ph> wants to use your camera and microphone
+    </message>
+  </if>
+  <if expr="is_android or chromeos">
+    <message name="IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT" desc="Permission fragment shown in the permissions bubble when a web page requests access to the computer's protected media identifier.">
+      Know your unique device identifier
+    </message>
+    <message name="IDS_PROTECTED_MEDIA_IDENTIFIER_PER_ORIGIN_PROVISIONING_INFOBAR_TEXT" desc="Text requesting permission for a site to access protected media identifier. It shows the origin of the URL.">
+      <ph name="URL">$1<ex>https://www.youtube.com</ex></ph> wants to play protected content. Your device’s identity will be verified by Brave.
+    </message>
+    <message name="IDS_PROTECTED_MEDIA_IDENTIFIER_PER_DEVICE_PROVISIONING_INFOBAR_TEXT" desc="Text requesting permission for a site to access protected media identifier. It shows the origin of the URL.">
+      <ph name="URL">$1<ex>https://www.youtube.com</ex></ph> wants to play protected content. Your device's identity will be verified by Brave and may be accessed by this site.
+    </message>
+  </if>
+  <message name="IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT" desc="Permission fragment used in the permission bubble, after 'This site wants to:' asking for permission to access the user's physical location.">
+    Know your location
+  </message>
+  <message name="IDS_NOTIFICATION_PERMISSIONS_FRAGMENT" desc="Permission sentence fragment to show following the prompt 'This site wants to:' in a permissions request">
+    Show notifications
+  </message>
+  <message name="IDS_MIDI_SYSEX_PERMISSION_FRAGMENT" desc="Permission asked in the permission bubble when a URL wants to access MIDI devices with system exclusive messages, along with other permissions requests. Preceded by the prompt 'This site would like to:'">
+    Use your MIDI devices
+  </message>
+  <message name="IDS_FLASH_PERMISSION_FRAGMENT" desc="Permission asked in the permission bubble when a URL wants to use Flash Plugins on the page. Preceded by the prompt 'This site would like to:'. 'Flash' is the name of a plugin and should not be translated.">
+    Run Flash
+  </message>
+  <message name="IDS_FLASH_PERMISSION_WARNING_FRAGMENT" desc="Warning in the permission bubble when a URL wants to use Flash Plugins on the page.">
+    Flash Player will no longer be supported after December 2020.
+  </message>
+  <message name="IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_FRAGMENT" desc="Permission fragment shown in the permissions bubble when a web page requests access to the computer's microphone.">
+    Use your microphone
+  </message>
+  <message name="IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_FRAGMENT" desc="Permission fragment shown in the permissions bubble when a web page requests access to the computer's camera.">
+    Use your camera
+  </message>
+  <message name="IDS_ACCESSIBILITY_EVENTS_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to respond to accessibility events, for example if the user is using a screen reader and the site has custom accessibility features. Follows a prompt: 'This site would like to:'">
+    Respond to Accessibility Events
+  </message>
+  <message name="IDS_CLIPBOARD_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to read data from the system clipboard. Follows a prompt: 'This site would like to:'">
+    See text and images copied to the clipboard
+  </message>
+  <message name="IDS_NFC_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to use NFC. Follows a prompt: 'This site would like to:'">
+    Use NFC devices
+  </message>
+  <message name="IDS_VR_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to use VR. Follows a prompt: 'This site would like to:">
+    Use virtual reality devices and data
+  </message>
+  <message name="IDS_AR_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to use AR. Follows a prompt: 'This site would like to:">
+    Create a 3D map of your surroundings and track camera position
+  </message>
+  <message name="IDS_STORAGE_ACCESS_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site needs access to its data while it is embedded into another site. Follows a prompt: 'This site would like to:">
+    Access cookies and site data.
+
+Do you want to allow <ph name="EMBEDDED_URL">$1<ex>news.site</ex></ph> to use cookies and site data on <ph name="TOP_LEVEL_URL">$2<ex>content_domain.site</ex></ph>?
+
+This will otherwise be blocked by your privacy settings. This will allow the content you interacted with to work correctly, but may allow <ph name="EMBEDDED_URL">$1<ex>news.site</ex></ph> to track your activity.
+  </message>
+  <message name="IDS_PERMISSION_ALLOW" desc="Label on button to allow a permissions request.">
+    Allow
+  </message>
+  <message name="IDS_PERMISSION_DENY" desc="Label on button to deny a permissions request.">
+    Block
+  </message>
+
+  <!-- Quota messages -->
+  <if expr="is_android">
+    <message name="IDS_REQUEST_QUOTA_INFOBAR_TEXT" desc="Mobile: For Android device. Text requesting permission for a site to use a new (larger) quota to persistently store data on the device (e.g. for persistent-type filesystem).">
+      <ph name="URL">$1<ex>html5rocks.com</ex></ph> wants to permanently store data on your device
+    </message>
+    <message name="IDS_REQUEST_LARGE_QUOTA_INFOBAR_TEXT" desc="Mobile: For Android device. Text requesting permission for a site to use a new (larger) quota to persistently store large data on the user's device (e.g. for persistent-type filesystem).">
+      <ph name="URL">$1<ex>html5rocks.com</ex></ph> wants to permanently store large data on your device
+    </message>
+  </if>
+  <if expr="not is_android">
+    <message name="IDS_REQUEST_QUOTA_INFOBAR_TEXT" desc="Text requesting permission for a site to use a new (larger) quota to persistently store data on the user's local computer (e.g. for persistent-type filesystem).">
+      <ph name="URL">$1<ex>html5rocks.com</ex></ph> wants to permanently store data on your local computer
+    </message>
+    <message name="IDS_REQUEST_LARGE_QUOTA_INFOBAR_TEXT" desc="Text requesting permission for a site to use a new (larger) quota to persistently store large data on the user's local computer (e.g. for persistent-type filesystem).">
+      <ph name="URL">$1<ex>html5rocks.com</ex></ph> wants to permanently store large data on your local computer
+    </message>
+  </if>
+  <message name="IDS_REQUEST_QUOTA_PERMISSION_FRAGMENT" desc="Permission fragment presented in the permission bubble when the webapp requests new larger quota to persistently store data on the device. Follows a 'This site would like to:' prompt.">
+    Store files on this device
+  </message>
+</grit-part>
diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp
index d55928155722..a9090d442f7e 100644
--- a/components/policy_strings.grdp
+++ b/components/policy_strings.grdp
@@ -155,6 +155,9 @@
   <message name="IDS_POLICY_VALUE_FORMAT_ERROR" desc="The text displayed in the status column when a policy value doesn't match the expected format.">
     Value doesn't match format.
   </message>
+  <message name="IDS_POLICY_CLOUD_SOURCE_ONLY_ERROR" desc="The text displayed in the status column when a policy that should only be set in the cloud is set from another source.">
+    Ignored because the policy is not set by a cloud source.
+  </message>
   <message name="IDS_POLICY_DEFAULT_SEARCH_DISABLED" desc="The text displayed in the status column when a policy value has been ignored because default search has not been enabled.">
     Ignored because default search is not enabled by policy.
   </message>
@@ -182,9 +185,6 @@
   <message name="IDS_POLICY_INVALID_SECURE_DNS_MODE_ERROR" desc="The text displayed in the status column when the value for DnsOverHttpsMode is invalid.">
     Invalid DnsOverHttps mode.
   </message>
-  <message name="IDS_POLICY_SECURE_DNS_MODE_NOT_SUPPORTED_ERROR" desc="The text displayed in the status column when the value for DnsOverHttpsMode is secure, which is not supported yet.">
-    The DnsOverHttps mode <ph name="SECURE_DNS_MODE_SECURE">'secure'</ph> is not yet supported, the mode has been set to <ph name="SECURE_DNS_MODE_OFF">'off'</ph>.
-  </message>
   <message name="IDS_POLICY_SECURE_DNS_TEMPLATES_INVALID_ERROR" desc="The text displayed in the status column when one or more of the DnsOverHttpsTemplates server template URIs is invalid.">
     One or more of the DnsOverHttpsTemplates server template URIs is invalid and will not be used.
   </message>
@@ -361,6 +361,9 @@ Additional details:
   <message name="IDS_POLICY_LABEL_ERROR" desc="Label for the error row in the policy table.">
     Error
   </message>
+  <message name="IDS_POLICY_LABEL_DEPRECATED" desc="Label for the status of a deprecated policy.">
+    Deprecated
+  </message>
   <message name="IDS_POLICY_LABEL_IGNORED" desc="Label for the ignored row in the policy table.">
     Ignored
   </message>
@@ -529,4 +532,15 @@ Additional details:
   <message name="IDS_POLICY_SIGNIN_PROFILE" desc="Label to indicate that the policy is for the sign-in screen profile.">
     sign-in screen profile
   </message>
+
+  <!-- Strings for Disabled chrome://.* screen -->
+  <message name="IDS_CHROME_URLS_DISABLED_PAGE_HEADER" desc="A heading for the user when the application is blocked.">
+    Application is blocked
+  </message>
+  <message name="IDS_CHROME_URLS_DISABLED_PAGE_TITLE" desc="The title for the blocked chrome URLs page.">
+    Application blocked by your administrator
+  </message>
+  <message name="IDS_CHROME_URLS_DISABLED_PAGE_MESSAGE" desc="A paragraph informing the user that the application is blocked.">
+    The application has been blocked by your administrator
+  </message>
 </grit-part>
diff --git a/components/security_interstitials_strings.grdp b/components/security_interstitials_strings.grdp
index 21ec94e7f438..69694ed38c1f 100644
--- a/components/security_interstitials_strings.grdp
+++ b/components/security_interstitials_strings.grdp
@@ -141,6 +141,9 @@
   <message name="IDS_SSL_OVERRIDABLE_SAFETY_BUTTON" desc="The text for the button that takes the user back to the previous page.">
     Back to safety
   </message>
+  <message name="IDS_SSL_OVERRIDABLE_CLOSE_PAGE_BUTTON" desc="The text for the button that closes the page.">
+    Close page
+  </message>
   <message name="IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH" desc="The text for the paragraph at the bottom with the proceed link.">
     <ph name="BEGIN_LINK">&lt;a href="#" id="proceed-link"&gt;</ph>Proceed to <ph name="SITE">$1<ex>example.com</ex></ph> (unsafe)<ph name="END_LINK">&lt;/a&gt;</ph>
   </message>
@@ -413,33 +416,25 @@
     The site <ph name="ORIGIN">$2</ph> has requested that an origin policy
     will apply to all its request, but this policy cannot presently be applied.
   </message>
-  <message name="IDS_ORIGIN_POLICY_INFO2" desc="The second paragrpah of the text of the Origin Policy Error Interstitial. (Presently intentionally left blank.)" />
+  <message name="IDS_ORIGIN_POLICY_INFO2" desc="The second paragraph of the text of the Origin Policy Error Interstitial. (Presently intentionally left blank.)" />
   <message name="IDS_ORIGIN_POLICY_BUTTON" desc="The text for the Origin Policy Error Interstitial button that takes the user back to the previous page">
     Back to safety.
   </message>
   <message name="IDS_ORIGIN_POLICY_DETAILS" desc="The text for the Origin Policy Error Interstitial button that contains additional information.">
     Advanced
   </message>
-  <message name="IDS_ORIGIN_POLICY_EXPLANATION_CANNOT_LOAD" desc="The text of the Origin Policy Error Interstitial that will be displayed when the user presses the 'Advanced' button for additional information, for the case where the policy could not be loaded.">
+  <message name="IDS_ORIGIN_POLICY_EXPLANATION_CANNOT_LOAD" desc="The text of the Origin Policy Error Interstitial that will be displayed when the user presses the 'Advanced' button for additional information, for the case where the policy was requested but could not be loaded.">
     The server you are going to, <ph name="ORIGIN">$2</ph>, has requested that
     an origin policy will be applied to all requests to it. But it has now
     failed to deliver a policy, which prevents the browser from fulfilling
     your request for <ph name="SITE">$1</ph>. Origin policies can be used by
     site operators to configure security and other properties for a site.
   </message>
-  <message name="IDS_ORIGIN_POLICY_EXPLANATION_SHOULD_NOT_REDIRECT" desc="The text of the Origin Policy Error Interstitial that will be displayed when the user presses the 'Advanced' button for additional information, for the case where the policy request was met with a 'redirect' response.">
-    The server you are going to, <ph name="ORIGIN">$2</ph>, has requested that
-    an origin policy will be applied to all requests to it. But instead of
-    delivering a policy it has redirected the browser elsewhere, which prevents
-    the browser from fulfilling your request for <ph name="SITE">$1</ph>. Origin
-    policies can be used by site operators to configure security and other
-    properties for a site.
-  </message>
-  <message name="IDS_ORIGIN_POLICY_EXPLANATION_OTHER" desc="The text of the Origin Policy Error Interstitial that will be displayed when the user presses the 'Advanced' button for additional information, for cases other than redirect or load error.">
-    The server you are going to, <ph name="ORIGIN">$2</ph>, has requested that
-    an origin policy will be applied to all requests to it. But it has now
-    delivered an invalid policy, which means the browser cannot fullfil your
-    request for <ph name="SITE">$1</ph>. Origin policies can be used by
+  <message name="IDS_ORIGIN_POLICY_EXPLANATION_CANNOT_PARSE_HEADER" desc="The text of the Origin Policy Error Interstitial that will be displayed when the user presses the 'Advanced' button for additional information, for the case where the policy header could not be parsed.">
+    The server you are going to, <ph name="ORIGIN">$2</ph>, has set a header
+    requiring that an origin policy will be applied to all requests to it. But
+    the header is malformed, which prevents the browser from fulfilling
+    your request for <ph name="SITE">$1</ph>. Origin policies can be used by
     site operators to configure security and other properties for a site.
   </message>
   <message name="IDS_ORIGIN_POLICY_FINAL_PARAGRAPH" desc="The text of the Origin Policy Error Interstitial that a user can click to proceed to the site, despite the error.">

From da51aa0cf9c499f59753758f7c2f98e8c9c8a1d4 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 20 May 2020 09:55:12 -0400
Subject: [PATCH 133/161] Code Review fixes.

---
 browser/autoplay/BUILD.gn                        | 1 +
 browser/autoplay/autoplay_permission_context.cc  | 1 +
 components/brave_webtorrent/browser/net/BUILD.gn | 1 +
 3 files changed, 3 insertions(+)

diff --git a/browser/autoplay/BUILD.gn b/browser/autoplay/BUILD.gn
index 260b0cf0641c..125358d7e4c9 100644
--- a/browser/autoplay/BUILD.gn
+++ b/browser/autoplay/BUILD.gn
@@ -11,6 +11,7 @@ source_set("autoplay") {
     "//chrome/common",
     "//components/content_settings/core/common",
     "//components/permissions",
+    "//content/public/browser",
     "//third_party/blink/public/mojom:web_feature_mojo_bindings",
   ]
 }
diff --git a/browser/autoplay/autoplay_permission_context.cc b/browser/autoplay/autoplay_permission_context.cc
index 964c441b3f16..a92ad78f4408 100644
--- a/browser/autoplay/autoplay_permission_context.cc
+++ b/browser/autoplay/autoplay_permission_context.cc
@@ -12,6 +12,7 @@
 #include "chrome/common/chrome_features.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/permissions/permission_request_id.h"
+#include "content/public/browser/browser_context.h"
 #include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
 
 AutoplayPermissionContext::AutoplayPermissionContext(
diff --git a/components/brave_webtorrent/browser/net/BUILD.gn b/components/brave_webtorrent/browser/net/BUILD.gn
index 17aecd34ca18..1936c4a4379f 100644
--- a/components/brave_webtorrent/browser/net/BUILD.gn
+++ b/components/brave_webtorrent/browser/net/BUILD.gn
@@ -10,5 +10,6 @@ source_set("net") {
     "//brave/components/brave_webtorrent/browser",
     "//extensions/browser",
     "//net",
+    "//third_party/blink/public/mojom:mojom_platform_headers",
   ]
 }

From 3b821fa92410b4fbec088fb14692fa075305efe4 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 20 May 2020 11:39:02 -0400
Subject: [PATCH 134/161] Do not try to copy redirect-cc.py in redirect-cc.cmd.

Instead moved copying to brave-browser/lib/util.js util.copyRedirectCC.
---
 script/redirect-cc.cmd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/redirect-cc.cmd b/script/redirect-cc.cmd
index 486fd51925a1..f58ae4674a7c 100644
--- a/script/redirect-cc.cmd
+++ b/script/redirect-cc.cmd
@@ -1,3 +1,4 @@
 @ECHO OFF
-XCOPY /D /Y /Q "..\..\brave\script\redirect-cc.py" "%CD%/redirect.*" 1>nul
+:: brave/script/redirect-cc.py is copied to %CD% and renamed to redirect.py in
+:: the beginning of the build. See brave-browser/lib/util.js util.copyRedirectCC
 python redirect.py %*

From 433c9106a3452877ccef71ab8e6dfb22459d7c9b Mon Sep 17 00:00:00 2001
From: bridiver <github@brianjohnson.cc>
Date: Wed, 20 May 2020 13:55:06 -0700
Subject: [PATCH 135/161] simplify patches for max expiration date

---
 .../android_webview/browser/cookie_manager.cc |   9 --
 .../ui/hats/hats_survey_status_checker.cc     |   9 --
 .../devtools_url_loader_interceptor.cc        |   9 --
 .../content/public/test/browser_test_utils.cc |   9 --
 .../brave_canonical_cookie_unittest.cc        | 106 ++++++------------
 chromium_src/net/cookies/canonical_cookie.cc  |  36 +++---
 chromium_src/net/cookies/canonical_cookie.h   |  15 ---
 .../net/url_request/url_request_http_job.cc   |  10 --
 .../network/restricted_cookie_manager.cc      |  10 --
 .../modules/cookie_store/cookie_store.cc      |  24 ++++
 .../platform/cookie/canonical_cookie.cc       |   9 --
 .../weblayer/browser/cookie_manager_impl.cc   |   9 --
 ...id_webview-browser-cookie_manager.cc.patch |  13 ---
 ...-mock_browsing_data_cookie_helper.cc.patch |  12 --
 ...i-hats-hats_survey_status_checker.cc.patch |  12 --
 ...s-devtools_url_loader_interceptor.cc.patch |  12 --
 patches/net-cookies-canonical_cookie.cc.patch |  26 ++---
 patches/net-cookies-canonical_cookie.h.patch  |  12 --
 ...-url_request-url_request_http_job.cc.patch |  12 --
 ...network-restricted_cookie_manager.cc.patch |  14 ---
 ...modules-cookie_store-cookie_store.cc.patch |  12 ++
 ...-platform-cookie-canonical_cookie.cc.patch |  12 --
 22 files changed, 94 insertions(+), 298 deletions(-)
 delete mode 100644 chromium_src/android_webview/browser/cookie_manager.cc
 delete mode 100644 chromium_src/chrome/browser/ui/hats/hats_survey_status_checker.cc
 delete mode 100644 chromium_src/content/browser/devtools/devtools_url_loader_interceptor.cc
 delete mode 100644 chromium_src/content/public/test/browser_test_utils.cc
 delete mode 100644 chromium_src/net/cookies/canonical_cookie.h
 delete mode 100644 chromium_src/net/url_request/url_request_http_job.cc
 delete mode 100644 chromium_src/services/network/restricted_cookie_manager.cc
 create mode 100644 chromium_src/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
 delete mode 100644 chromium_src/third_party/blink/renderer/platform/cookie/canonical_cookie.cc
 delete mode 100644 chromium_src/weblayer/browser/cookie_manager_impl.cc
 delete mode 100644 patches/android_webview-browser-cookie_manager.cc.patch
 delete mode 100644 patches/chrome-browser-browsing_data-mock_browsing_data_cookie_helper.cc.patch
 delete mode 100644 patches/chrome-browser-ui-hats-hats_survey_status_checker.cc.patch
 delete mode 100644 patches/content-browser-devtools-devtools_url_loader_interceptor.cc.patch
 delete mode 100644 patches/net-cookies-canonical_cookie.h.patch
 delete mode 100644 patches/net-url_request-url_request_http_job.cc.patch
 delete mode 100644 patches/services-network-restricted_cookie_manager.cc.patch
 create mode 100644 patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch
 delete mode 100644 patches/third_party-blink-renderer-platform-cookie-canonical_cookie.cc.patch

diff --git a/chromium_src/android_webview/browser/cookie_manager.cc b/chromium_src/android_webview/browser/cookie_manager.cc
deleted file mode 100644
index 151eb63939d0..000000000000
--- a/chromium_src/android_webview/browser/cookie_manager.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#define BRAVE_SETCOOKIEHELPER true /*is_from_http*/
-
-#include "../../../../android_webview/browser/cookie_manager.cc"
-#undef BRAVE_SETCOOKIEHELPER
diff --git a/chromium_src/chrome/browser/ui/hats/hats_survey_status_checker.cc b/chromium_src/chrome/browser/ui/hats/hats_survey_status_checker.cc
deleted file mode 100644
index c6dd997d3eb2..000000000000
--- a/chromium_src/chrome/browser/ui/hats/hats_survey_status_checker.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#define BRAVE_HATS_SURVEY_STATUS_CHECKER true /*is_from_http*/,
-
-#include "../../../../../../chrome/browser/ui/hats/hats_survey_status_checker.cc"
-#undef BRAVE_HATS_SURVEY_STATUS_CHECKER
diff --git a/chromium_src/content/browser/devtools/devtools_url_loader_interceptor.cc b/chromium_src/content/browser/devtools/devtools_url_loader_interceptor.cc
deleted file mode 100644
index 70d59fd9b508..000000000000
--- a/chromium_src/content/browser/devtools/devtools_url_loader_interceptor.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#define BRAVE_PROCESSSETCOOKIES true /*is_from_http*/,
-
-#include "../../../../content/browser/devtools/devtools_url_loader_interceptor.cc"
-#undef BRAVE_PROCESSSETCOOKIES
diff --git a/chromium_src/content/public/test/browser_test_utils.cc b/chromium_src/content/public/test/browser_test_utils.cc
deleted file mode 100644
index 4386c2b44c44..000000000000
--- a/chromium_src/content/public/test/browser_test_utils.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#define BRAVE_SETCOOKIE true /*is_from_http*/,
-
-#include "../../../../content/public/test/browser_test_utils.cc"
-#undef BRAVE_SETCOOKIE
diff --git a/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc b/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc
index 9aff5d2853b5..fb985877eee5 100644
--- a/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc
+++ b/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc
@@ -5,112 +5,80 @@
 
 #include "net/cookies/canonical_cookie.h"
 
+#include "base/time/time.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_options.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-static const char cookie_line1[] =
+using base::TimeDelta;
+
+static const char max_expires_date_cookie[] =
     "test1=yes; expires=Fri, 31 Dec 9999 23:59:59 GMT";
-static const char cookie_line2[] =
+static const char max_age_cookie[] =
     "test2=yes; max-age=630720000";  // 20 years
-static const char cookie_line3[] =
+static const char max_expires_and_max_age_cookie[] =
     "test3=yes; max-age=630720000; expires=Fri, 31 Dec 9999 23:59:59 GMT";
-static const char cookie_line4[] =
+static const char short_expiration_cookie[] =
     "test4=yes; max-age=172800";  // 2 days
 static const char cookie_line5[] =
     "test5=yes; httponly; expires=Fri, 31 Dec 9999 23:59:59 GMT";
+static const char no_expiration_cookie[] =
+    "test5=yes";
 
 namespace net {
 
-TEST(BraveCanonicalCookieTest, ClientSide) {
-  using base::TimeDelta;
+const base::Time creation_time = base::Time::Now();
+constexpr base::TimeDelta kMaxCookieExpiration =
+    base::TimeDelta::FromDays(30*6);  // 6 months
 
+TEST(BraveCanonicalCookieTest, SetMaxExpiration) {
   GURL url("https://www.example.com/test");
-  base::Time creation_time = base::Time::Now();
-  bool is_from_http = false;
 
   std::unique_ptr<CanonicalCookie> cookie(
-      CanonicalCookie::Create(is_from_http, url, cookie_line1, creation_time,
-                              base::nullopt /* server_time */));
+      CanonicalCookie::Create(url, max_expires_date_cookie, creation_time, base::nullopt));
   EXPECT_TRUE(cookie.get());
-  EXPECT_LT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(8));
-  EXPECT_GT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(6));
+  EXPECT_EQ(cookie->ExpiryDate(), creation_time + kMaxCookieExpiration);
 
   cookie =
-      CanonicalCookie::Create(is_from_http, url, cookie_line2, creation_time,
-                              base::nullopt /* server_time */);
+      CanonicalCookie::Create(url, max_age_cookie, creation_time, base::nullopt);
   EXPECT_TRUE(cookie.get());
-  EXPECT_LT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(8));
-  EXPECT_GT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(6));
+  EXPECT_EQ(cookie->ExpiryDate(), creation_time + kMaxCookieExpiration);
 
   cookie =
-      CanonicalCookie::Create(is_from_http, url, cookie_line3, creation_time,
-                              base::nullopt /* server_time */);
+      CanonicalCookie::Create(url, max_expires_and_max_age_cookie, creation_time, base::nullopt);
   EXPECT_TRUE(cookie.get());
-  EXPECT_LT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(8));
-  EXPECT_GT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(6));
+  EXPECT_EQ(cookie->ExpiryDate(), creation_time + kMaxCookieExpiration);
+}
 
+TEST(BraveCanonicalCookieTest, AllowShorterThanMaxExpiration) {
+  GURL url("https://www.example.com/test");
   // Short-lived cookies get to keep their shorter expiration.
-  cookie =
-      CanonicalCookie::Create(is_from_http, url, cookie_line4, creation_time,
-                              base::nullopt /* server_time */);
+  std::unique_ptr<CanonicalCookie> cookie =
+      CanonicalCookie::Create(url, short_expiration_cookie, creation_time, base::nullopt);
   EXPECT_TRUE(cookie.get());
-  EXPECT_LT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(3));
-  EXPECT_GT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(1));
-
-  // document.cookie API 'httponly' works as expected.
-  cookie =
-      CanonicalCookie::Create(is_from_http, url, cookie_line5, creation_time,
-                              base::nullopt /* server_time */);
-  EXPECT_TRUE(cookie.get());
-  EXPECT_LT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(8));
-  EXPECT_GT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(6));
+  EXPECT_EQ(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(2));
 }
 
-TEST(BraveCanonicalCookieTest, ServerSide) {
-  using base::TimeDelta;
-
+TEST(BraveCanonicalCookieTest, SetHTTPOnlyMaxExpiration) {
   GURL url("https://www.example.com/test");
-  base::Time creation_time = base::Time::Now();
-  bool is_from_http = true;
-
-  std::unique_ptr<CanonicalCookie> cookie(
-      CanonicalCookie::Create(is_from_http, url, cookie_line1, creation_time,
-                              base::nullopt /* server_time */));
-  EXPECT_TRUE(cookie.get());
-  EXPECT_LT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(30*7));
-  EXPECT_GT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(30*5));
 
-  cookie =
-      CanonicalCookie::Create(is_from_http, url, cookie_line2, creation_time,
-                              base::nullopt /* server_time */);
+  // HTTP cookies with 'httponly' work as expected.
+  std::unique_ptr<CanonicalCookie> cookie =
+      CanonicalCookie::Create(url, cookie_line5, creation_time, base::nullopt);
   EXPECT_TRUE(cookie.get());
-  EXPECT_LT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(30*7));
-  EXPECT_GT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(30*5));
+  EXPECT_EQ(cookie->ExpiryDate(), creation_time + kMaxCookieExpiration);
+}
 
-  cookie =
-      CanonicalCookie::Create(is_from_http, url, cookie_line3, creation_time,
-                              base::nullopt /* server_time */);
-  EXPECT_TRUE(cookie.get());
-  EXPECT_LT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(30*7));
-  EXPECT_GT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(30*5));
+TEST(BraveCanonicalCookieTest, NoExpirationCookie) {
+  GURL url("https://www.example.com/test");
 
-  // Short-lived cookies get to keep their shorter expiration.
-  cookie =
-      CanonicalCookie::Create(is_from_http, url, cookie_line4, creation_time,
-                              base::nullopt /* server_time */);
-  EXPECT_TRUE(cookie.get());
-  EXPECT_LT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(3));
-  EXPECT_GT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(1));
+  base::Time creation_time = base::Time::Now();
 
-  // HTTP cookies with 'httponly' work as expected.
-  cookie =
-      CanonicalCookie::Create(is_from_http, url, cookie_line5, creation_time,
-                              base::nullopt /* server_time */);
+  std::unique_ptr<CanonicalCookie> cookie(
+      CanonicalCookie::Create(url, no_expiration_cookie, creation_time, base::nullopt));
   EXPECT_TRUE(cookie.get());
-  EXPECT_LT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(30*7));
-  EXPECT_GT(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(30*5));
+  EXPECT_EQ(cookie->IsPersistent(), false);
 }
 
 }  // namespace net
diff --git a/chromium_src/net/cookies/canonical_cookie.cc b/chromium_src/net/cookies/canonical_cookie.cc
index 79476ae17a4a..46d6d3fd43d9 100644
--- a/chromium_src/net/cookies/canonical_cookie.cc
+++ b/chromium_src/net/cookies/canonical_cookie.cc
@@ -3,37 +3,27 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#include "net/cookies/canonical_cookie.h"
-#include "net/cookies/parsed_cookie.h"
+#include <algorithm>
+
+#include "base/time/time.h"
 
 namespace {
 
-const base::TimeDelta kMaxClientSideExpiration = base::TimeDelta::FromDays(7);
-const base::TimeDelta kMaxServerSideExpiration =
+// Javascript max expiration is handled by blink::CookieStore
+constexpr base::TimeDelta kMaxCookieExpiration =
     base::TimeDelta::FromDays(30*6);  // 6 months
 
-base::Time BraveCanonExpiration(const net::ParsedCookie& pc,
-                                const base::Time& current,
-                                const base::Time& server_time,
-                                const bool is_from_http) {
-  const base::Time max_expiration =
-      current +
-      (is_from_http ? kMaxServerSideExpiration : kMaxClientSideExpiration);
-
-  return std::min(
-      net::CanonicalCookie::CanonExpiration(pc, current, server_time),
-      max_expiration);
+base::Time BraveCanonExpiration(const base::Time& cookie_expires,
+                                const base::Time& creation_time) {
+  const base::Time max_expiration = creation_time + kMaxCookieExpiration;
+
+  return std::min(cookie_expires, max_expiration);
 }
 
 }  // namespace
 
-#define BRAVE_CANONICALCOOKIE_CREATE_EXTRA_PARAMS \
-  const bool is_from_http,
-
-#define BRAVE_CANONICALCOOKIE_CREATE_BRAVECANONEXPIRATION \
-  Time cookie_expires = BraveCanonExpiration(             \
-      parsed_cookie, creation_time, cookie_server_time, is_from_http);
+#define BRAVE_CREATE \
+  cookie_expires = BraveCanonExpiration(cookie_expires, creation_time);
 
 #include "../../../../net/cookies/canonical_cookie.cc"
-#undef BRAVE_CANONICALCOOKIE_CREATE_BRAVECANONEXPIRATION
-#undef BRAVE_CANONICALCOOKIE_CREATE_EXTRA_PARAMS
+#undef BRAVE_CREATE
diff --git a/chromium_src/net/cookies/canonical_cookie.h b/chromium_src/net/cookies/canonical_cookie.h
deleted file mode 100644
index 7c9a97e5ee8f..000000000000
--- a/chromium_src/net/cookies/canonical_cookie.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#ifndef BRAVE_CHROMIUM_SRC_NET_COOKIES_CANONICAL_COOKIE_H_
-#define BRAVE_CHROMIUM_SRC_NET_COOKIES_CANONICAL_COOKIE_H_
-
-#define BRAVE_CANONICAL_COOKIE_H_CREATE_EXTRA_PARAMS \
-  const bool is_from_http,
-
-#include "../../../../net/cookies/canonical_cookie.h"
-#undef BRAVE_CANONICAL_COOKIE_H_CREATE_EXTRA_PARAMS
-
-#endif  // BRAVE_CHROMIUM_SRC_NET_COOKIES_CANONICAL_COOKIE_H_
diff --git a/chromium_src/net/url_request/url_request_http_job.cc b/chromium_src/net/url_request/url_request_http_job.cc
deleted file mode 100644
index 39a35aa3ec19..000000000000
--- a/chromium_src/net/url_request/url_request_http_job.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#define BRAVE_SAVECOOKIESANDNOTIFYHEADERSCOMPLETE \
-  !options.exclude_httponly() /*is_from_http*/,
-
-#include "../../../../net/url_request/url_request_http_job.cc"
-#undef BRAVE_SAVECOOKIESANDNOTIFYHEADERSCOMPLETE
diff --git a/chromium_src/services/network/restricted_cookie_manager.cc b/chromium_src/services/network/restricted_cookie_manager.cc
deleted file mode 100644
index ef959fae0f65..000000000000
--- a/chromium_src/services/network/restricted_cookie_manager.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#define BRAVE_SETCOOKIEFROMSTRING \
-  role_ != mojom::RestrictedCookieManagerRole::SCRIPT /*is_from_http*/,
-
-#include "../../../../services/network/restricted_cookie_manager.cc"
-#undef BRAVE_SETCOOKIEFROMSTRING
diff --git a/chromium_src/third_party/blink/renderer/modules/cookie_store/cookie_store.cc b/chromium_src/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
new file mode 100644
index 000000000000..2e2a6ecfaa60
--- /dev/null
+++ b/chromium_src/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
@@ -0,0 +1,24 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#include <algorithm>
+
+#include "base/time/time.h"
+
+namespace {
+
+constexpr base::TimeDelta kJavascriptCookieExpiration =
+    base::TimeDelta::FromDays(7);
+
+base::Time BraveCanonExpiration(const base::Time& current) {
+  // creation time is always now for new JS cookies
+  return std::min(base::Time::Now() + kJavascriptCookieExpiration, current);
+}
+
+}  // namespace
+
+#define BRAVE_TO_CANONICAL_COOKIE expires = BraveCanonExpiration(expires);
+#include "../../../../../../../third_party/blink/renderer/modules/cookie_store/cookie_store.cc"
+#undef BRAVE_TO_CANONICAL_COOKIE
diff --git a/chromium_src/third_party/blink/renderer/platform/cookie/canonical_cookie.cc b/chromium_src/third_party/blink/renderer/platform/cookie/canonical_cookie.cc
deleted file mode 100644
index 4933286871fc..000000000000
--- a/chromium_src/third_party/blink/renderer/platform/cookie/canonical_cookie.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#define BRAVE_CANONICALCOOKIE_CREATE false /*is_from_http*/,
-
-#include "../../../../../../../third_party/blink/renderer/platform/cookie/canonical_cookie.cc"
-#undef BRAVE_CANONICALCOOKIE_CREATE
diff --git a/chromium_src/weblayer/browser/cookie_manager_impl.cc b/chromium_src/weblayer/browser/cookie_manager_impl.cc
deleted file mode 100644
index 4dc0f8dd2c8a..000000000000
--- a/chromium_src/weblayer/browser/cookie_manager_impl.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#define BRAVE_SETCOOKIEINTERNAL true /*is_from_http*/,
-
-#include "../../../../weblayer/browser/cookie_manager_impl.cc"
-#undef BRAVE_SETCOOKIEINTERNAL
diff --git a/patches/android_webview-browser-cookie_manager.cc.patch b/patches/android_webview-browser-cookie_manager.cc.patch
deleted file mode 100644
index 8cc65abc6144..000000000000
--- a/patches/android_webview-browser-cookie_manager.cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/android_webview/browser/cookie_manager.cc b/android_webview/browser/cookie_manager.cc
-index 4344f15143f75d56a2253586792f7b644eaf25c4..9245d3e8dd35f5172f93fca36c6155e30a8a44bc 100644
---- a/android_webview/browser/cookie_manager.cc
-+++ b/android_webview/browser/cookie_manager.cc
-@@ -478,7 +478,7 @@ void CookieManager::SetCookieHelper(const GURL& host,
- 
-   net::CanonicalCookie::CookieInclusionStatus status;
-   std::unique_ptr<net::CanonicalCookie> cc(
--      net::CanonicalCookie::Create(new_host, value, base::Time::Now(),
-+      net::CanonicalCookie::Create(BRAVE_SETCOOKIEHELPER, new_host, value, base::Time::Now(),
-                                    base::nullopt /* server_time */, &status));
- 
-   if (!cc || !should_allow_cookie) {
diff --git a/patches/chrome-browser-browsing_data-mock_browsing_data_cookie_helper.cc.patch b/patches/chrome-browser-browsing_data-mock_browsing_data_cookie_helper.cc.patch
deleted file mode 100644
index 290454ec3cf5..000000000000
--- a/patches/chrome-browser-browsing_data-mock_browsing_data_cookie_helper.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc
-index 5f79dd0333e03850926281c18a8511f3b1eaac9b..a08349cd189693ca9278997d2dbc80117f2ff582 100644
---- a/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc
-+++ b/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc
-@@ -38,6 +38,7 @@ void MockBrowsingDataCookieHelper::DeleteCookie(
- void MockBrowsingDataCookieHelper::AddCookieSamples(
-     const GURL& url, const std::string& cookie_line) {
-   std::unique_ptr<net::CanonicalCookie> cc(net::CanonicalCookie::Create(
-+      BRAVE_ADDCOOKIESAMPLES
-       url, cookie_line, base::Time::Now(), base::nullopt /* server_time */));
- 
-   if (cc.get()) {
diff --git a/patches/chrome-browser-ui-hats-hats_survey_status_checker.cc.patch b/patches/chrome-browser-ui-hats-hats_survey_status_checker.cc.patch
deleted file mode 100644
index 28de4f241915..000000000000
--- a/patches/chrome-browser-ui-hats-hats_survey_status_checker.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/chrome/browser/ui/hats/hats_survey_status_checker.cc b/chrome/browser/ui/hats/hats_survey_status_checker.cc
-index 328080d846c6df9400ee912489d98b973cf60940..9ff78c9c96254a7111738ba536f40ccb8e3b3e91 100644
---- a/chrome/browser/ui/hats/hats_survey_status_checker.cc
-+++ b/chrome/browser/ui/hats/hats_survey_status_checker.cc
-@@ -41,6 +41,7 @@ HatsSurveyStatusChecker::HatsSurveyStatusChecker(Profile* profile)
-   // To fetch the survey status directly, we need to set the cookie, but it is
-   // ok to use a non-conforming value.
-   auto survey_cookie = net::CanonicalCookie::Create(
-+      BRAVE_HATS_SURVEY_STATUS_CHECKER
-       GURL("https://www.google.com"), "PAIDCONTENT=0", base::Time::Now(),
-       base::nullopt);
-   content::StoragePartition* partition =
diff --git a/patches/content-browser-devtools-devtools_url_loader_interceptor.cc.patch b/patches/content-browser-devtools-devtools_url_loader_interceptor.cc.patch
deleted file mode 100644
index 73923bcf437b..000000000000
--- a/patches/content-browser-devtools-devtools_url_loader_interceptor.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/content/browser/devtools/devtools_url_loader_interceptor.cc b/content/browser/devtools/devtools_url_loader_interceptor.cc
-index 50e5b36392930e74fde4477df3e05f53f98ffcf3..9c6f116fd369345ae8db7da05f032c15213cac9f 100644
---- a/content/browser/devtools/devtools_url_loader_interceptor.cc
-+++ b/content/browser/devtools/devtools_url_loader_interceptor.cc
-@@ -1089,6 +1089,7 @@ void InterceptionJob::ProcessSetCookies(const net::HttpResponseHeaders& headers,
-   size_t iter = 0;
-   while (headers.EnumerateHeader(&iter, name, &cookie_line)) {
-     std::unique_ptr<net::CanonicalCookie> cookie = net::CanonicalCookie::Create(
-+      BRAVE_PROCESSSETCOOKIES
-         create_loader_params_->request.url, cookie_line, now, server_time);
-     if (cookie)
-       cookies.emplace_back(std::move(cookie));
diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch
index 47e825db5291..19b1af413d59 100644
--- a/patches/net-cookies-canonical_cookie.cc.patch
+++ b/patches/net-cookies-canonical_cookie.cc.patch
@@ -1,22 +1,12 @@
 diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
-index fb17243ed6ab8a5809971777d2c94954fb2ad5bd..b5d92c99f52578bde2689dd4b4640449ddf5db6d 100644
+index fb17243ed6ab8a5809971777d2c94954fb2ad5bd..6237af262923e2a161606ec690f1b52a8e394df8 100644
 --- a/net/cookies/canonical_cookie.cc
 +++ b/net/cookies/canonical_cookie.cc
-@@ -273,6 +273,7 @@ Time CanonicalCookie::CanonExpiration(const ParsedCookie& pc,
+@@ -336,6 +336,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
+                                          ? CookieSourceScheme::kSecure
+                                          : CookieSourceScheme::kNonSecure;
  
- // static
- std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
-+    BRAVE_CANONICALCOOKIE_CREATE_EXTRA_PARAMS
-     const GURL& url,
-     const std::string& cookie_line,
-     const base::Time& creation_time,
-@@ -313,8 +314,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
-     cookie_server_time = server_time.value();
- 
-   DCHECK(!creation_time.is_null());
--  Time cookie_expires = CanonicalCookie::CanonExpiration(
--      parsed_cookie, creation_time, cookie_server_time);
-+  BRAVE_CANONICALCOOKIE_CREATE_BRAVECANONEXPIRATION
- 
-   CookiePrefix prefix = GetCookiePrefix(parsed_cookie.Name());
-   bool is_cookie_prefix_valid = IsCookiePrefixValid(prefix, url, parsed_cookie);
++  BRAVE_CREATE
+   std::unique_ptr<CanonicalCookie> cc(std::make_unique<CanonicalCookie>(
+       parsed_cookie.Name(), parsed_cookie.Value(), cookie_domain, cookie_path,
+       creation_time, cookie_expires, creation_time, parsed_cookie.IsSecure(),
diff --git a/patches/net-cookies-canonical_cookie.h.patch b/patches/net-cookies-canonical_cookie.h.patch
deleted file mode 100644
index 381354fc445a..000000000000
--- a/patches/net-cookies-canonical_cookie.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/net/cookies/canonical_cookie.h b/net/cookies/canonical_cookie.h
-index 8bd8b2eaccbe6b9f01da57cd29ea8f7a9d5245c6..d2bb1732140e9f44f318c03c4dbda253f4b14f6c 100644
---- a/net/cookies/canonical_cookie.h
-+++ b/net/cookies/canonical_cookie.h
-@@ -80,6 +80,7 @@ class NET_EXPORT CanonicalCookie {
-   //
-   // If a cookie is returned, |cookie->IsCanonical()| will be true.
-   static std::unique_ptr<CanonicalCookie> Create(
-+      BRAVE_CANONICAL_COOKIE_H_CREATE_EXTRA_PARAMS
-       const GURL& url,
-       const std::string& cookie_line,
-       const base::Time& creation_time,
diff --git a/patches/net-url_request-url_request_http_job.cc.patch b/patches/net-url_request-url_request_http_job.cc.patch
deleted file mode 100644
index 72da19ccf2c9..000000000000
--- a/patches/net-url_request-url_request_http_job.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
-index 221d7cd946d427ce66827bea58e3627371d87269..3a6b1f8bf6136f25019558c1262195dd9dd8de32 100644
---- a/net/url_request/url_request_http_job.cc
-+++ b/net/url_request/url_request_http_job.cc
-@@ -712,6 +712,7 @@ void URLRequestHttpJob::SaveCookiesAndNotifyHeadersComplete(int result) {
-     num_cookie_lines_left_++;
- 
-     std::unique_ptr<CanonicalCookie> cookie = net::CanonicalCookie::Create(
-+        BRAVE_SAVECOOKIESANDNOTIFYHEADERSCOMPLETE
-         request_->url(), cookie_string, base::Time::Now(), server_time,
-         &returned_status);
- 
diff --git a/patches/services-network-restricted_cookie_manager.cc.patch b/patches/services-network-restricted_cookie_manager.cc.patch
deleted file mode 100644
index 3430b3cb36c4..000000000000
--- a/patches/services-network-restricted_cookie_manager.cc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
-index b0da2ecbd260f477692d17850b7f163c8c588b83..ae1184157136a8190b1968f8102826b28709a602 100644
---- a/services/network/restricted_cookie_manager.cc
-+++ b/services/network/restricted_cookie_manager.cc
-@@ -443,7 +443,8 @@ void RestrictedCookieManager::SetCookieFromString(
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- 
-   std::unique_ptr<net::CanonicalCookie> parsed_cookie =
--      net::CanonicalCookie::Create(url, cookie, base::Time::Now(),
-+      net::CanonicalCookie::Create(BRAVE_SETCOOKIEFROMSTRING
-+                                   url, cookie, base::Time::Now(),
-                                    base::nullopt /* server_time */);
-   if (!parsed_cookie) {
-     std::move(callback).Run();
diff --git a/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch b/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch
new file mode 100644
index 000000000000..c0c68f84bd77
--- /dev/null
+++ b/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch
@@ -0,0 +1,12 @@
+diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
+index 97b6c8d4785e947af93aaba27865081511b8127a..1c7f1ee0686abb4e8819833fefc35f97a201fa3e 100644
+--- a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
++++ b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
+@@ -81,6 +81,7 @@ base::Optional<CanonicalCookie> ToCanonicalCookie(
+   base::Time expires = options->hasExpires()
+                            ? base::Time::FromJavaTime(options->expires())
+                            : base::Time();
++  BRAVE_TO_CANONICAL_COOKIE
+ 
+   String cookie_url_host = cookie_url.Host();
+   String domain;
diff --git a/patches/third_party-blink-renderer-platform-cookie-canonical_cookie.cc.patch b/patches/third_party-blink-renderer-platform-cookie-canonical_cookie.cc.patch
deleted file mode 100644
index 6251606932b6..000000000000
--- a/patches/third_party-blink-renderer-platform-cookie-canonical_cookie.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/third_party/blink/renderer/platform/cookie/canonical_cookie.cc b/third_party/blink/renderer/platform/cookie/canonical_cookie.cc
-index ea02c4fc617e6eae0bf5b4c56fd9ce04e379b932..0b77bb5ae1059cfcf4fb5eb1e430629038d8a796 100644
---- a/third_party/blink/renderer/platform/cookie/canonical_cookie.cc
-+++ b/third_party/blink/renderer/platform/cookie/canonical_cookie.cc
-@@ -114,6 +114,7 @@ base::Optional<CanonicalCookie> CanonicalCookie::Create(
-     const WebString& cookie_line,
-     base::Time creation_time) {
-   std::unique_ptr<net::CanonicalCookie> cookie = net::CanonicalCookie::Create(
-+      BRAVE_CANONICALCOOKIE_CREATE
-       ToGURL(url), cookie_line.Utf8(), creation_time,
-       base::nullopt /* server_time */);
-   if (!cookie)

From 664cac86e7da55916a577afdbb1d900fb2e21f9f Mon Sep 17 00:00:00 2001
From: Max Karolinskiy <max@brave.com>
Date: Wed, 20 May 2020 21:40:05 -0400
Subject: [PATCH 136/161] Removed no longer needed patch.

Part of the preceding commit "simplify patches for max expiration date".
---
 .../content-public-test-browser_test_utils.cc.patch  | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 patches/content-public-test-browser_test_utils.cc.patch

diff --git a/patches/content-public-test-browser_test_utils.cc.patch b/patches/content-public-test-browser_test_utils.cc.patch
deleted file mode 100644
index bb01c3770cf0..000000000000
--- a/patches/content-public-test-browser_test_utils.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
-index d7f88a819505305d690e35b3b78862c1b9fd8f5e..0754ca74f7041521aa32c33a36fd91946d612fda 100644
---- a/content/public/test/browser_test_utils.cc
-+++ b/content/public/test/browser_test_utils.cc
-@@ -1906,6 +1906,7 @@ bool SetCookie(BrowserContext* browser_context,
-       ->GetNetworkContext()
-       ->GetCookieManager(cookie_manager.BindNewPipeAndPassReceiver());
-   std::unique_ptr<net::CanonicalCookie> cc(net::CanonicalCookie::Create(
-+      BRAVE_SETCOOKIE
-       url, value, base::Time::Now(), base::nullopt /* server_time */));
-   DCHECK(cc.get());
- 

From e88d57907463638047b3f48bde3844f59c5aa47f Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 20 May 2020 17:56:31 -0400
Subject: [PATCH 137/161] Moved ads/rewards unit tests to their components.

---
 .gitignore                                    |  1 -
 browser/BUILD.gn                              |  3 +-
 components/brave_ads/test/BUILD.gn            | 98 +++++++++++++++++++
 .../brave_rewards}/test/BUILD.gn              | 57 +----------
 components/services/bat_ads/BUILD.gn          |  1 -
 components/services/bat_ledger/BUILD.gn       |  1 -
 script/brave_license_helper.py                |  3 -
 test/BUILD.gn                                 |  3 +-
 test/testing.gni                              | 10 +-
 vendor/bat-native-ads/BUILD.gn                |  2 +
 vendor/bat-native-confirmations/BUILD.gn      |  4 +-
 vendor/bat-native-ledger/BUILD.gn             |  2 +-
 12 files changed, 119 insertions(+), 66 deletions(-)
 create mode 100644 components/brave_ads/test/BUILD.gn
 rename {vendor => components/brave_rewards}/test/BUILD.gn (69%)

diff --git a/.gitignore b/.gitignore
index 7aa61945e985..4997b0935bd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@
 !/vendor/bat-native-ads
 !/vendor/brave-ios
 !/vendor/CPPLINT.cfg
-!/vendor/test
 node_modules/
 patches/**/*.patchinfo
 *.xcodeproj
diff --git a/browser/BUILD.gn b/browser/BUILD.gn
index ba691ec354c9..0d0b860ed556 100644
--- a/browser/BUILD.gn
+++ b/browser/BUILD.gn
@@ -23,8 +23,9 @@ source_set("browser_process") {
     "//chrome/browser/*",
     "//brave/browser/*",
     "//brave:browser_dependencies",
+    "//brave/components/brave_ads/test:*",
+    "//brave/components/brave_rewards/test:*",
     "//brave/test:*",
-    "//brave/vendor/test:*",
   ]
 
   sources = [
diff --git a/components/brave_ads/test/BUILD.gn b/components/brave_ads/test/BUILD.gn
new file mode 100644
index 000000000000..e5a0ef41d819
--- /dev/null
+++ b/components/brave_ads/test/BUILD.gn
@@ -0,0 +1,98 @@
+# Copyright (c) 2019 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import("//brave/build/config.gni")
+import("//brave/components/brave_ads/browser/buildflags/buildflags.gni")
+import("//testing/test.gni")
+
+if (!is_ios) {
+test("brave_ads_unit_tests") {
+  testonly = true
+  public_deps = [
+    "//base/test:test_support",
+    "//brave/test:brave_test_support_unit",
+  ]
+
+  data = [ "//brave/test/data/" ]
+  sources = []
+  deps = []
+
+  if (is_android) {
+    deps += [
+      "//brave:brave_pak_assets",
+      "//chrome/test/android:chrome_java_test_support",
+      "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
+      "//v8:v8_external_startup_data_assets",
+    ]
+
+    if (is_component_build) {
+      deps += [ "//chrome/gpu" ]
+    }
+
+    sources += [
+      "../../../../chrome/app/chrome_main_delegate.cc",
+      "../../../../chrome/app/chrome_main_delegate.h",
+    ]
+  }
+
+  if (brave_ads_enabled) {
+    sources += [
+      "//brave/components/brave_ads/browser/ads_service_impl_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_is_mobile_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_client_mock.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_client_mock.h",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/client_mock.h",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/client_mock.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_confirmation_filter_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_conversion_confirmation_type_filter_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_date_range_filter_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/conversion_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/total_max_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/sorts/ad_conversions_sort_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/sorts/ads_history_sort_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/page_classifier/page_classifier_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/funnel_sites_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/keywords_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/purchase_intent_classifier_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/url_util_unittest.cc",
+    ]
+
+    if (!is_android) {
+      # TODO(https://github.com/brave/brave-browser/issues/9550):
+      # Temporarily disable Brave Ads tests which are passing in the detailed
+      # logs but failing in the summary
+      sources += [ "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_tabs_unittest.cc" ]
+    }
+
+    deps += [
+      "//brave/browser:browser_process",
+      "//brave/components/brave_ads/browser:browser",
+      "//brave/components/brave_ads/browser:testutil",
+      "//brave/components/brave_rewards/browser:browser",
+      "//brave/components/brave_rewards/common:common",
+      "//brave/vendor/bat-native-ads",
+      "//brave/vendor/bat-native-usermodel",
+      "//chrome/browser:browser",
+      "//components/prefs:prefs",
+      "//content/test:test_support",
+    ]
+
+    data += [
+      "//brave/vendor/bat-native-ads/resources/",
+      "//brave/vendor/bat-native-ads/test/data/",
+    ]
+
+    configs += [ "//brave/vendor/bat-native-ads:internal_config" ]
+
+  }  # if (brave_ads_enabled)
+}  # test("brave_ads_unit_tests")
+}  # if (!is_ios)
+
diff --git a/vendor/test/BUILD.gn b/components/brave_rewards/test/BUILD.gn
similarity index 69%
rename from vendor/test/BUILD.gn
rename to components/brave_rewards/test/BUILD.gn
index 96803c9ee321..bc6e5cbb362c 100644
--- a/vendor/test/BUILD.gn
+++ b/components/brave_rewards/test/BUILD.gn
@@ -4,7 +4,6 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import("//brave/build/config.gni")
-import("//brave/components/brave_ads/browser/buildflags/buildflags.gni")
 import("//brave/components/brave_rewards/browser/buildflags/buildflags.gni")
 import("//testing/test.gni")
 
@@ -17,9 +16,7 @@ test("brave_rewards_unit_tests") {
   ]
 
   data = [ "//brave/test/data/" ]
-
   sources = []
-
   deps = []
 
   if (is_android) {
@@ -35,8 +32,8 @@ test("brave_rewards_unit_tests") {
     }
 
     sources += [
-      "../../../chrome/app/chrome_main_delegate.cc",
-      "../../../chrome/app/chrome_main_delegate.h",
+      "../../../../chrome/app/chrome_main_delegate.cc",
+      "../../../../chrome/app/chrome_main_delegate.h",
     ]
   }
 
@@ -74,9 +71,6 @@ test("brave_rewards_unit_tests") {
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.h",
       "//brave/components/brave_rewards/browser/rewards_service_impl_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_is_mobile_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_client_mock.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_client_mock.h",
       "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/ad_grants_unittest.cc",
       "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/payments_unittest.cc",
       "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_impl_mock.cc",
@@ -106,7 +100,6 @@ test("brave_rewards_unit_tests") {
         "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/redeem_token_mock.cc",
         "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/redeem_token_mock.h",
         "//brave/vendor/bat-native-confirmations/src/bat/confirmations/internal/redeem_token_unittest.cc",
-        "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_tabs_unittest.cc",
 
         # TODO(https://github.com/brave-intl/bat-native-usermodel/issues/26):
         # Fix bat-native-user-model unittests fail to load data files from
@@ -117,11 +110,9 @@ test("brave_rewards_unit_tests") {
 
     deps += [
       "//brave/browser:browser_process",
-      "//brave/components/brave_ads/browser:testutil",
       "//brave/components/brave_rewards/browser:browser",
       "//brave/components/brave_rewards/browser:testutil",
       "//brave/components/brave_rewards/resources:static_resources_grit",
-      "//brave/vendor/bat-native-ads",
       "//brave/vendor/bat-native-confirmations",
       "//brave/vendor/bat-native-ledger",
       "//brave/vendor/bat-native-rapidjson",
@@ -135,53 +126,11 @@ test("brave_rewards_unit_tests") {
     ]
 
     configs += [ "//brave/vendor/bat-native-ledger:internal_config" ]
-    configs += [ "//brave/vendor/bat-native-ads:internal_config" ]
     configs += [ "//brave/vendor/bat-native-confirmations:internal_config" ]
 
     data += [ "//brave/vendor/bat-native-confirmations/test/data/" ]
-  }  # if (brave_rewards_enabled)
-
-  if (brave_ads_enabled) {
-    sources += [
-      "//brave/components/brave_ads/browser/ads_service_impl_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/client_mock.h",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/client_mock.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_confirmation_filter_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_conversion_confirmation_type_filter_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_date_range_filter_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/conversion_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/daily_cap_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_day_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/per_hour_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/total_max_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/minimum_wait_time_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_day_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/ads_per_hour_frequency_cap_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/sorts/ad_conversions_sort_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/sorts/ads_history_sort_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/page_classifier/page_classifier_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/funnel_sites_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/keywords_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/purchase_intent/purchase_intent_classifier_unittest.cc",
-      "//brave/vendor/bat-native-ads/src/bat/ads/internal/url_util_unittest.cc",
-    ]
-
-    deps += [
-      "//brave/browser:browser_process",
-      "//brave/components/brave_ads/browser:browser",
-      "//brave/components/brave_rewards/browser:browser",
-      "//brave/components/brave_rewards/common:common",
-      "//chrome/browser:browser",
-      "//components/prefs:prefs",
-      "//content/test:test_support",
 
-    ]
-
-    data += [
-      "//brave/vendor/bat-native-ads/resources/",
-      "//brave/vendor/bat-native-ads/test/data/",
-    ]
-  }  # if (brave_ads_enabled)
+  }  # if (brave_rewards_enabled)
 }  # test("brave_rewards_unit_tests")
 }  # if (!is_ios)
 
diff --git a/components/services/bat_ads/BUILD.gn b/components/services/bat_ads/BUILD.gn
index 88508adb332b..d36a6c6cbc55 100644
--- a/components/services/bat_ads/BUILD.gn
+++ b/components/services/bat_ads/BUILD.gn
@@ -2,7 +2,6 @@ static_library("lib") {
   visibility = [
     "//brave/utility:*",
     "//brave/test:*",
-    "//brave/vendor/test:*",
   ]
 
   sources = [
diff --git a/components/services/bat_ledger/BUILD.gn b/components/services/bat_ledger/BUILD.gn
index 571ad98c9dac..4ec4866445e3 100644
--- a/components/services/bat_ledger/BUILD.gn
+++ b/components/services/bat_ledger/BUILD.gn
@@ -2,7 +2,6 @@ static_library("lib") {
   visibility = [
     "//brave/utility:*",
     "//brave/test:*",
-    "//brave/vendor/test:*",
   ]
 
   sources = [
diff --git a/script/brave_license_helper.py b/script/brave_license_helper.py
index 3a9c6a323839..07ed81f5ca4e 100644
--- a/script/brave_license_helper.py
+++ b/script/brave_license_helper.py
@@ -29,9 +29,6 @@ def AddBraveCredits(prune_paths, special_cases, prune_dirs, additional_paths):
         os.path.join('brave', 'vendor', 'brave-ios'),
         os.path.join('brave', 'vendor', 'brave_base'),
 
-        # Not an external component
-        os.path.join('brave', 'vendor', 'test'),
-
         # Brave overrides to third-party code, also covered by main notice.
         os.path.join('brave', 'third_party', 'android_deps'),
         os.path.join('brave', 'third_party', 'blink'),
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 01a4672bcff0..cf4abb44822c 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -89,7 +89,8 @@ group("all_unit_tests") {
   testonly = true
   deps = [
     ":brave_unit_tests",
-    "//brave/vendor/test:brave_rewards_unit_tests",
+    "//brave/components/brave_ads/test:brave_ads_unit_tests",
+    "//brave/components/brave_rewards/test:brave_rewards_unit_tests",
   ]
   if (!is_android) {
     deps += [ ":brave_installer_unittests" ]
diff --git a/test/testing.gni b/test/testing.gni
index b4c1a11f2cc4..69ec9c6bbdf2 100644
--- a/test/testing.gni
+++ b/test/testing.gni
@@ -28,6 +28,7 @@ if (is_mac) {
       deps = [
         ":" + target_name + "_unit_tests",
         ":" + target_name + "_browser_tests",
+        ":" + target_name + "_ads_unit_tests",
         ":" + target_name + "_rewards_unit_tests",
       ]
     }
@@ -45,12 +46,19 @@ if (is_mac) {
       outputs = [ "$root_build_dir/alwaysrunbrowsertests/$target_name" ]
       deps = [ "//brave/test:brave_browser_tests" ]
     }
+    fix_testing_install_name_impl(target_name + "_ads_unit_tests") {
+      forward_variables_from(invoker, "*")
+      executable_path = "$root_build_dir/brave_ads_unit_tests"
+      # input is the same as the output so just fake it
+      outputs = [ "$root_build_dir/alwaysrununittests/ads_$target_name" ]
+      deps = [ "//brave/components/brave_ads/test:brave_ads_unit_tests" ]
+    }
     fix_testing_install_name_impl(target_name + "_rewards_unit_tests") {
       forward_variables_from(invoker, "*")
       executable_path = "$root_build_dir/brave_rewards_unit_tests"
       # input is the same as the output so just fake it
       outputs = [ "$root_build_dir/alwaysrununittests/rewards_$target_name" ]
-      deps = [ "//brave/vendor/test:brave_rewards_unit_tests" ]
+      deps = [ "//brave/components/brave_rewards/test:brave_rewards_unit_tests" ]
     }
   }
 }
diff --git a/vendor/bat-native-ads/BUILD.gn b/vendor/bat-native-ads/BUILD.gn
index 67972728fe65..1b7d190c8257 100644
--- a/vendor/bat-native-ads/BUILD.gn
+++ b/vendor/bat-native-ads/BUILD.gn
@@ -21,6 +21,7 @@ config("external_config") {
 config("internal_config") {
   visibility = [
     ":*",
+    "//brave/components/brave_ads/test:*",
     "//brave/test:*",
   ]
   include_dirs = [ "src" ]
@@ -56,6 +57,7 @@ static_library("bat-native-ads-standalone") {
 source_set("headers") {
   visibility = [
     ":*",
+    "//brave/components/brave_ads/test:*",
     "//brave/test:*",
   ]
 
diff --git a/vendor/bat-native-confirmations/BUILD.gn b/vendor/bat-native-confirmations/BUILD.gn
index d8f811e655c2..6bbefd3be34b 100644
--- a/vendor/bat-native-confirmations/BUILD.gn
+++ b/vendor/bat-native-confirmations/BUILD.gn
@@ -21,8 +21,8 @@ config("external_config") {
 config("internal_config") {
   visibility = [
     ":*",
+    "//brave/components/brave_rewards/test:*",
     "//brave/test:*",
-    "//brave/vendor/test:*",
   ]
   include_dirs = [ "src" ]
 }
@@ -34,8 +34,8 @@ source_set("bat-native-confirmations") {
   visibility = [
     ":*",
     rebase_path("bat-native-ledger", dep_base) + ":*",
+    "//brave/components/brave_rewards/test:*",
     "//brave/test:*",
-    "//brave/vendor/test:*",
   ]
 
   sources = [
diff --git a/vendor/bat-native-ledger/BUILD.gn b/vendor/bat-native-ledger/BUILD.gn
index 6e446e7e50c7..86ed7b0bac82 100644
--- a/vendor/bat-native-ledger/BUILD.gn
+++ b/vendor/bat-native-ledger/BUILD.gn
@@ -22,8 +22,8 @@ config("external_config") {
 config("internal_config") {
   visibility = [
     ":*",
+    "//brave/components/brave_rewards/test:*",
     "//brave/test:*",
-    "//brave/vendor/test:*",
   ]
   include_dirs = [ "src" ]
 }

From e5c8c1955f78c4a04ed3dd488016f9f3f4397db7 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Wed, 20 May 2020 22:01:58 -0400
Subject: [PATCH 138/161] [Android] Removed no longer needed patch.

Part of the preceding commit "simplify patches for max expiration date".
---
 .../weblayer-browser-cookie_manager_impl.cc.patch  | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 patches/weblayer-browser-cookie_manager_impl.cc.patch

diff --git a/patches/weblayer-browser-cookie_manager_impl.cc.patch b/patches/weblayer-browser-cookie_manager_impl.cc.patch
deleted file mode 100644
index d9197f6f9eb3..000000000000
--- a/patches/weblayer-browser-cookie_manager_impl.cc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/weblayer/browser/cookie_manager_impl.cc b/weblayer/browser/cookie_manager_impl.cc
-index 702bf23cc2b0e1bdd5b9de8c8ffb82b8e09ebf65..dd3d70373bdcddf5761e966986ec7c264c1fee76 100644
---- a/weblayer/browser/cookie_manager_impl.cc
-+++ b/weblayer/browser/cookie_manager_impl.cc
-@@ -139,7 +139,8 @@ void CookieManagerImpl::RemoveCookieChangedCallback(JNIEnv* env, int id) {
- bool CookieManagerImpl::SetCookieInternal(const GURL& url,
-                                           const std::string& value,
-                                           SetCookieCallback callback) {
--  auto cc = net::CanonicalCookie::Create(url, value, base::Time::Now(),
-+  auto cc = net::CanonicalCookie::Create(BRAVE_SETCOOKIEINTERNAL
-+                                         url, value, base::Time::Now(),
-                                          base::nullopt);
-   if (!cc) {
-     return false;

From 6eb240db2f191ebaedd3331bf6451597de5bf2c5 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 20 May 2020 23:16:53 -0400
Subject: [PATCH 139/161] Roll Ads/Rewards unit tests back into
 brave_unit_tests binary.

---
 components/brave_ads/test/BUILD.gn     | 39 ++++----------------------
 components/brave_rewards/test/BUILD.gn | 39 ++++----------------------
 test/BUILD.gn                          |  5 ++--
 test/testing.gni                       | 16 -----------
 4 files changed, 13 insertions(+), 86 deletions(-)

diff --git a/components/brave_ads/test/BUILD.gn b/components/brave_ads/test/BUILD.gn
index e5a0ef41d819..9249d956d519 100644
--- a/components/brave_ads/test/BUILD.gn
+++ b/components/brave_ads/test/BUILD.gn
@@ -7,38 +7,11 @@ import("//brave/build/config.gni")
 import("//brave/components/brave_ads/browser/buildflags/buildflags.gni")
 import("//testing/test.gni")
 
-if (!is_ios) {
-test("brave_ads_unit_tests") {
+source_set("brave_ads_unit_tests") {
   testonly = true
-  public_deps = [
-    "//base/test:test_support",
-    "//brave/test:brave_test_support_unit",
-  ]
-
-  data = [ "//brave/test/data/" ]
-  sources = []
-  deps = []
-
-  if (is_android) {
-    deps += [
-      "//brave:brave_pak_assets",
-      "//chrome/test/android:chrome_java_test_support",
-      "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
-      "//v8:v8_external_startup_data_assets",
-    ]
-
-    if (is_component_build) {
-      deps += [ "//chrome/gpu" ]
-    }
-
-    sources += [
-      "../../../../chrome/app/chrome_main_delegate.cc",
-      "../../../../chrome/app/chrome_main_delegate.h",
-    ]
-  }
 
   if (brave_ads_enabled) {
-    sources += [
+    sources = [
       "//brave/components/brave_ads/browser/ads_service_impl_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_is_mobile_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_client_mock.cc",
@@ -72,7 +45,7 @@ test("brave_ads_unit_tests") {
       sources += [ "//brave/vendor/bat-native-ads/src/bat/ads/internal/ads_tabs_unittest.cc" ]
     }
 
-    deps += [
+    deps = [
       "//brave/browser:browser_process",
       "//brave/components/brave_ads/browser:browser",
       "//brave/components/brave_ads/browser:testutil",
@@ -85,7 +58,7 @@ test("brave_ads_unit_tests") {
       "//content/test:test_support",
     ]
 
-    data += [
+    data = [
       "//brave/vendor/bat-native-ads/resources/",
       "//brave/vendor/bat-native-ads/test/data/",
     ]
@@ -93,6 +66,4 @@ test("brave_ads_unit_tests") {
     configs += [ "//brave/vendor/bat-native-ads:internal_config" ]
 
   }  # if (brave_ads_enabled)
-}  # test("brave_ads_unit_tests")
-}  # if (!is_ios)
-
+}  # source_set("brave_ads_unit_tests")
diff --git a/components/brave_rewards/test/BUILD.gn b/components/brave_rewards/test/BUILD.gn
index bc6e5cbb362c..17a0d2e817e3 100644
--- a/components/brave_rewards/test/BUILD.gn
+++ b/components/brave_rewards/test/BUILD.gn
@@ -7,38 +7,11 @@ import("//brave/build/config.gni")
 import("//brave/components/brave_rewards/browser/buildflags/buildflags.gni")
 import("//testing/test.gni")
 
-if (!is_ios) {
-test("brave_rewards_unit_tests") {
+source_set("brave_rewards_unit_tests") {
   testonly = true
-  public_deps = [
-    "//base/test:test_support",
-    "//brave/test:brave_test_support_unit",
-  ]
-
-  data = [ "//brave/test/data/" ]
-  sources = []
-  deps = []
-
-  if (is_android) {
-    deps += [
-      "//brave:brave_pak_assets",
-      "//chrome/test/android:chrome_java_test_support",
-      "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
-      "//v8:v8_external_startup_data_assets",
-    ]
-
-    if (is_component_build) {
-      deps += [ "//chrome/gpu" ]
-    }
-
-    sources += [
-      "../../../../chrome/app/chrome_main_delegate.cc",
-      "../../../../chrome/app/chrome_main_delegate.h",
-    ]
-  }
 
   if (brave_rewards_enabled) {
-    sources += [
+    sources = [
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_monthly_util_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_activity_info_unittest.cc",
@@ -108,7 +81,7 @@ test("brave_rewards_unit_tests") {
       ]
     }
 
-    deps += [
+    deps = [
       "//brave/browser:browser_process",
       "//brave/components/brave_rewards/browser:browser",
       "//brave/components/brave_rewards/browser:testutil",
@@ -128,9 +101,7 @@ test("brave_rewards_unit_tests") {
     configs += [ "//brave/vendor/bat-native-ledger:internal_config" ]
     configs += [ "//brave/vendor/bat-native-confirmations:internal_config" ]
 
-    data += [ "//brave/vendor/bat-native-confirmations/test/data/" ]
+    data = [ "//brave/vendor/bat-native-confirmations/test/data/" ]
 
   }  # if (brave_rewards_enabled)
-}  # test("brave_rewards_unit_tests")
-}  # if (!is_ios)
-
+}  # source_set("brave_rewards_unit_tests")
diff --git a/test/BUILD.gn b/test/BUILD.gn
index cf4abb44822c..43ad05536522 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -85,13 +85,13 @@ static_library("brave_test_support_unit") {
 }
 
 if (!is_ios) {
-group("all_unit_tests") {
+group("other_unit_tests") {
   testonly = true
   deps = [
-    ":brave_unit_tests",
     "//brave/components/brave_ads/test:brave_ads_unit_tests",
     "//brave/components/brave_rewards/test:brave_rewards_unit_tests",
   ]
+
   if (!is_android) {
     deps += [ ":brave_installer_unittests" ]
   } else {
@@ -154,6 +154,7 @@ test("brave_unit_tests") {
   ]
 
   deps = [
+    ":other_unit_tests",
     "//brave/browser/safebrowsing",
     "//brave/components/brave_private_cdn",
     "//brave/components/ntp_background_images/browser",
diff --git a/test/testing.gni b/test/testing.gni
index 69ec9c6bbdf2..824774cc9070 100644
--- a/test/testing.gni
+++ b/test/testing.gni
@@ -28,8 +28,6 @@ if (is_mac) {
       deps = [
         ":" + target_name + "_unit_tests",
         ":" + target_name + "_browser_tests",
-        ":" + target_name + "_ads_unit_tests",
-        ":" + target_name + "_rewards_unit_tests",
       ]
     }
     fix_testing_install_name_impl(target_name + "_unit_tests") {
@@ -46,19 +44,5 @@ if (is_mac) {
       outputs = [ "$root_build_dir/alwaysrunbrowsertests/$target_name" ]
       deps = [ "//brave/test:brave_browser_tests" ]
     }
-    fix_testing_install_name_impl(target_name + "_ads_unit_tests") {
-      forward_variables_from(invoker, "*")
-      executable_path = "$root_build_dir/brave_ads_unit_tests"
-      # input is the same as the output so just fake it
-      outputs = [ "$root_build_dir/alwaysrununittests/ads_$target_name" ]
-      deps = [ "//brave/components/brave_ads/test:brave_ads_unit_tests" ]
-    }
-    fix_testing_install_name_impl(target_name + "_rewards_unit_tests") {
-      forward_variables_from(invoker, "*")
-      executable_path = "$root_build_dir/brave_rewards_unit_tests"
-      # input is the same as the output so just fake it
-      outputs = [ "$root_build_dir/alwaysrununittests/rewards_$target_name" ]
-      deps = [ "//brave/components/brave_rewards/test:brave_rewards_unit_tests" ]
-    }
   }
 }

From d25f703e47c94d209543080325bbb632bfe1c209 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Thu, 21 May 2020 09:42:03 -0400
Subject: [PATCH 140/161] [Android] Reverted: Fix for hiding rewards button
 when safetynet is failed

Issue fixed in PR https://github.com/brave/brave-core/pull/5612
---
 .../chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
index 3a4baec8942c..f13c86b44ede 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
@@ -192,7 +192,6 @@ void onNativeLibraryReady() {
 
       SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
       if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS)
-              && !BravePrefServiceBridge.getInstance().getSafetynetCheckFailed()
               && !sharedPreferences.getBoolean(
                       AppearancePreferences.PREF_HIDE_BRAVE_REWARDS_ICON, false)
               && mRewardsLayout != null) {

From b78549139668748ac905a7f26d626746769d6e6a Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Thu, 21 May 2020 10:37:49 -0400
Subject: [PATCH 141/161] [Android] Moved buildflags out of guard

---
 chromium_src/chrome/browser/ui/webui/favicon_source.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chromium_src/chrome/browser/ui/webui/favicon_source.cc b/chromium_src/chrome/browser/ui/webui/favicon_source.cc
index 456b91bb258f..f14c0e0b9b96 100644
--- a/chromium_src/chrome/browser/ui/webui/favicon_source.cc
+++ b/chromium_src/chrome/browser/ui/webui/favicon_source.cc
@@ -4,9 +4,9 @@
 // you can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include "build/build_config.h"
+#include "extensions/buildflags/buildflags.h"
 
 #if defined(OS_ANDROID)
-#include "extensions/buildflags/buildflags.h"
 #include "ui/native_theme/native_theme.h"
 
 #define GetInstanceForNativeUi BraveGetInstanceForNativeUi

From 7ae715d58823571bf2809fb368eb7845e5f64a22 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Thu, 21 May 2020 11:26:16 -0400
Subject: [PATCH 142/161] [Android] Added resources definitions after pulling
 master

---
 android/brave_java_resources.gni | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni
index f2174b177836..a0060c0a4c9b 100644
--- a/android/brave_java_resources.gni
+++ b/android/brave_java_resources.gni
@@ -5,7 +5,9 @@
 # See 'chrome/android/chrome_java_resources.gni' on how to generate this list
 brave_java_resources = [
   "java/res/anim/activity_fade_in.xml",
+  "java/res/anim/cycle.xml",
   "java/res/anim/activity_fade_out.xml",
+  "java/res/anim/shake.xml",
   "java/res/drawable/radio_button_selected_bg.xml",
   "java/res/drawable/bat_panel_gradient.xml",
   "java/res/drawable/brave_sync_btn.xml",
@@ -19,6 +21,7 @@ brave_java_resources = [
   "java/res/drawable/brave_sync_toggle_off_btn_right.xml",
   "java/res/drawable/rewards_image_button.xml",
   "java/res/drawable/rewards_button_purple_border.xml",
+  "java/res/drawable/rounded_filled.xml",
   "java/res/drawable/rounded_shape.xml",
   "java/res/drawable/brave_badge_rewards_background_large.xml",
   "java/res/drawable/rewards_button_orange.xml",
@@ -40,10 +43,12 @@ brave_java_resources = [
   "java/res/drawable/publisher_favicon_background.xml",
   "java/res/drawable/brave_sync_toggle_on_btn_left.xml",
   "java/res/drawable/brave_sync_top_rounded.xml",
+  "java/res/drawable/rate_feedback_background.xml",
   "java/res/drawable/brave_badge_rewards_background_small.xml",
   "java/res/drawable/circular_progress.xml",
   "java/res/drawable/rounded_corners.xml",
   "java/res/drawable/bat_rewards_summary_gradient.xml",
+  "java/res/drawable/rounded_holo.xml",
   "java/res/drawable/wallet_verify_button.xml",
   "java/res/drawable/plain_checkbox.xml",
   "java/res/drawable/rect_round_corners_12.xml",
@@ -58,6 +63,7 @@ brave_java_resources = [
   "java/res/drawable-hdpi/slide_up.png",
   "java/res/drawable-hdpi/brave_ads_launch_graphic.png",
   "java/res/drawable-hdpi/shortcut_incognito.png",
+  "java/res/drawable-hdpi/smiley_sad.png",
   "java/res/drawable-hdpi/header.png",
   "java/res/drawable-hdpi/changetip_icon.png",
   "java/res/drawable-hdpi/uphold_white.png",
@@ -127,6 +133,7 @@ brave_java_resources = [
   "java/res/drawable-hdpi/btn_mic.png",
   "java/res/drawable-hdpi/btn_star_filled.png",
   "java/res/drawable-hdpi/ic_chrome.png",
+  "java/res/drawable-hdpi/smiley_neutral.png",
   "java/res/drawable-hdpi/modern_location_bar.9.png",
   "java/res/drawable-hdpi/btn_brave.png",
   "java/res/drawable-hdpi/search_engine_startpage.png",
@@ -146,6 +153,7 @@ brave_java_resources = [
   "java/res/drawable-hdpi/icn_twitch.png",
   "java/res/drawable-hdpi/btn_right_tablet.png",
   "java/res/drawable-hdpi/brave_onboarding.png",
+  "java/res/drawable-hdpi/smiley_happy.png",
   "java/res/drawable-hdpi/notification_header_warning.png",
   "java/res/drawable-hdpi/search_engine_bing.png",
   "java/res/drawable-hdpi/coins.png",
@@ -162,6 +170,7 @@ brave_java_resources = [
   "java/res/drawable-mdpi/slide_up.png",
   "java/res/drawable-mdpi/brave_ads_launch_graphic.png",
   "java/res/drawable-mdpi/shortcut_incognito.png",
+  "java/res/drawable-mdpi/smiley_sad.png",
   "java/res/drawable-mdpi/header.png",
   "java/res/drawable-mdpi/changetip_icon.png",
   "java/res/drawable-mdpi/uphold_white.png",
@@ -231,6 +240,7 @@ brave_java_resources = [
   "java/res/drawable-mdpi/btn_mic.png",
   "java/res/drawable-mdpi/btn_star_filled.png",
   "java/res/drawable-mdpi/ic_chrome.png",
+  "java/res/drawable-mdpi/smiley_neutral.png",
   "java/res/drawable-mdpi/modern_location_bar.9.png",
   "java/res/drawable-mdpi/btn_brave.png",
   "java/res/drawable-mdpi/search_engine_startpage.png",
@@ -248,6 +258,7 @@ brave_java_resources = [
   "java/res/drawable-mdpi/icn_twitch.png",
   "java/res/drawable-mdpi/btn_right_tablet.png",
   "java/res/drawable-mdpi/brave_onboarding.png",
+  "java/res/drawable-mdpi/smiley_happy.png",
   "java/res/drawable-mdpi/notification_header_warning.png",
   "java/res/drawable-mdpi/search_engine_bing.png",
   "java/res/drawable-mdpi/coins.png",
@@ -309,6 +320,7 @@ brave_java_resources = [
   "java/res/drawable-xhdpi/slide_up.png",
   "java/res/drawable-xhdpi/brave_ads_launch_graphic.png",
   "java/res/drawable-xhdpi/shortcut_incognito.png",
+  "java/res/drawable-xhdpi/smiley_sad.png",
   "java/res/drawable-xhdpi/header.png",
   "java/res/drawable-xhdpi/changetip_icon.png",
   "java/res/drawable-xhdpi/uphold_white.png",
@@ -378,6 +390,7 @@ brave_java_resources = [
   "java/res/drawable-xhdpi/btn_mic.png",
   "java/res/drawable-xhdpi/btn_star_filled.png",
   "java/res/drawable-xhdpi/ic_chrome.png",
+  "java/res/drawable-xhdpi/smiley_neutral.png",
   "java/res/drawable-xhdpi/modern_location_bar.9.png",
   "java/res/drawable-xhdpi/btn_brave.png",
   "java/res/drawable-xhdpi/search_engine_startpage.png",
@@ -395,6 +408,7 @@ brave_java_resources = [
   "java/res/drawable-xhdpi/icn_twitch.png",
   "java/res/drawable-xhdpi/btn_right_tablet.png",
   "java/res/drawable-xhdpi/brave_onboarding.png",
+  "java/res/drawable-xhdpi/smiley_happy.png",
   "java/res/drawable-xhdpi/notification_header_warning.png",
   "java/res/drawable-xhdpi/search_engine_bing.png",
   "java/res/drawable-xhdpi/coins.png",
@@ -411,6 +425,7 @@ brave_java_resources = [
   "java/res/drawable-xxhdpi/slide_up.png",
   "java/res/drawable-xxhdpi/brave_ads_launch_graphic.png",
   "java/res/drawable-xxhdpi/shortcut_incognito.png",
+  "java/res/drawable-xxhdpi/smiley_sad.png",
   "java/res/drawable-xxhdpi/header.png",
   "java/res/drawable-xxhdpi/changetip_icon.png",
   "java/res/drawable-xxhdpi/uphold_white.png",
@@ -480,6 +495,7 @@ brave_java_resources = [
   "java/res/drawable-xxhdpi/btn_mic.png",
   "java/res/drawable-xxhdpi/btn_star_filled.png",
   "java/res/drawable-xxhdpi/ic_chrome.png",
+  "java/res/drawable-xxhdpi/smiley_neutral.png",
   "java/res/drawable-xxhdpi/modern_location_bar.9.png",
   "java/res/drawable-xxhdpi/btn_brave.png",
   "java/res/drawable-xxhdpi/search_engine_startpage.png",
@@ -498,6 +514,7 @@ brave_java_resources = [
   "java/res/drawable-xxhdpi/icn_twitch.png",
   "java/res/drawable-xxhdpi/btn_right_tablet.png",
   "java/res/drawable-xxhdpi/brave_onboarding.png",
+  "java/res/drawable-xxhdpi/smiley_happy.png",
   "java/res/drawable-xxhdpi/notification_header_warning.png",
   "java/res/drawable-xxhdpi/search_engine_bing.png",
   "java/res/drawable-xxhdpi/coins.png",
@@ -514,6 +531,7 @@ brave_java_resources = [
   "java/res/drawable-xxxhdpi/slide_up.png",
   "java/res/drawable-xxxhdpi/brave_ads_launch_graphic.png",
   "java/res/drawable-xxxhdpi/shortcut_incognito.png",
+  "java/res/drawable-xxxhdpi/smiley_sad.png",
   "java/res/drawable-xxxhdpi/header.png",
   "java/res/drawable-xxxhdpi/changetip_icon.png",
   "java/res/drawable-xxxhdpi/uphold_white.png",
@@ -577,6 +595,7 @@ brave_java_resources = [
   "java/res/drawable-xxxhdpi/btn_mic.png",
   "java/res/drawable-xxxhdpi/btn_star_filled.png",
   "java/res/drawable-xxxhdpi/ic_chrome.png",
+  "java/res/drawable-xxxhdpi/smiley_neutral.png",
   "java/res/drawable-xxxhdpi/btn_brave.png",
   "java/res/drawable-xxxhdpi/btn_brave_off.png",
   "java/res/drawable-xxxhdpi/qrcode_dark.png",
@@ -589,6 +608,7 @@ brave_java_resources = [
   "java/res/drawable-xxxhdpi/omnibox_info_red.png",
   "java/res/drawable-xxxhdpi/icn_twitch.png",
   "java/res/drawable-xxxhdpi/btn_right_tablet.png",
+  "java/res/drawable-xxxhdpi/smiley_happy.png",
   "java/res/drawable-xxxhdpi/notification_header_warning.png",
   "java/res/drawable-xxxhdpi/coins.png",
   "java/res/drawable-xxxhdpi/btn_right.png",
@@ -633,6 +653,7 @@ brave_java_resources = [
   "java/res/layout/brave_sync_done.xml",
   "java/res/layout/fragment_brave_rewards_onboarding.xml",
   "java/res/layout/new_tab_page_layout.xml",
+  "java/res/layout/fragment_rate_dialog.xml",
   "java/res/layout/brave_ads_new_user_dialog_layout.xml",
   "java/res/layout/brave_shields_text_item.xml",
   "java/res/layout/new_tab_page_view.xml",
@@ -670,6 +691,7 @@ brave_java_resources = [
   "java/res/values-v21/brave_styles.xml",
   "java/res/xml/brave_main_preferences.xml",
   "java/res/xml/background_video_playback_preference.xml",
+  "java/res/xml/brave_rewards_debug_preferences.xml",
   "java/res/xml/background_images_preferences.xml",
   "java/res/xml/developer_preferences.xml",
   "java/res/xml/use_custom_tabs_brave_preference.xml",

From f45680c6d9232fb3be7c7b906568d142f0d35255 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Thu, 21 May 2020 11:47:49 -0400
Subject: [PATCH 143/161] [Android] Fixed build issues related to renaming

Caused by latest master pull to cr83
---
 .../org/chromium/chrome/browser/rate/RateDialogFragment.java  | 2 +-
 .../org/chromium/chrome/browser/rate/RateFeedbackUtils.java   | 4 ++--
 .../settings/developer/BraveRewardsDebugPreferences.java      | 4 ++--
 android/java/res/layout/fragment_rate_dialog.xml              | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java b/android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java
index 83e2a9de2044..1671e8f4a7bd 100644
--- a/android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java
+++ b/android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java
@@ -23,7 +23,7 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.Toast;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.content.DialogInterface;
 import android.util.DisplayMetrics;
 import android.content.res.Configuration;
diff --git a/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java b/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java
index fe7149b81751..07d3f7350464 100644
--- a/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java
+++ b/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java
@@ -24,8 +24,8 @@
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.task.AsyncTask;
-import org.chromium.chrome.browser.settings.about.AboutChromeSettings;
-import org.chromium.chrome.browser.settings.about.AboutSettingsBridge;
+import org.chromium.chrome.browser.about_settings.AboutChromeSettings;
+import org.chromium.chrome.browser.about_settings.AboutSettingsBridge;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge;
 
diff --git a/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java b/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java
index 876996821c6c..c4231979bfa1 100644
--- a/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java
+++ b/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java
@@ -10,12 +10,12 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveRelaunchUtils;
 import org.chromium.chrome.browser.settings.BravePreferenceFragment;
-import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.chrome.browser.util.BraveDbUtil;
 
 /**
diff --git a/android/java/res/layout/fragment_rate_dialog.xml b/android/java/res/layout/fragment_rate_dialog.xml
index aece1ef9c4cc..b95c790d88d9 100644
--- a/android/java/res/layout/fragment_rate_dialog.xml
+++ b/android/java/res/layout/fragment_rate_dialog.xml
@@ -18,7 +18,7 @@
         android:layout_margin="16dp"
         android:text="@string/how_would_you_rate"
         android:textSize="20sp"
-        android:textColor="@color/standard_mode_tint"
+        android:textColor="@color/default_icon_color_tint_list"
         android:textStyle="bold" />
 
     <LinearLayout
@@ -65,7 +65,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:text="@string/share_your_thoughts"
-        android:textColor="@color/standard_mode_tint"
+        android:textColor="@color/default_icon_color_tint_list"
         android:textStyle="bold"
         android:textSize="20sp"
         android:visibility="gone" />

From 7380e81aa0c74fd330ad899325e8e90fb283cb83 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Thu, 21 May 2020 12:52:21 -0400
Subject: [PATCH 144/161] [Android] Fixed crashes related to renaming

Caused by latest master pull to cr83
---
 android/java/res/xml/brave_rewards_debug_preferences.xml | 2 +-
 android/java/res/xml/qa_preferences.xml                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/java/res/xml/brave_rewards_debug_preferences.xml b/android/java/res/xml/brave_rewards_debug_preferences.xml
index 74576c1b2fed..fcf5bc1edbef 100644
--- a/android/java/res/xml/brave_rewards_debug_preferences.xml
+++ b/android/java/res/xml/brave_rewards_debug_preferences.xml
@@ -7,7 +7,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:orderingFromXml="true">
 
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:key="export_rewards_db"
         android:title="Export Rewards Database" />
 
diff --git a/android/java/res/xml/qa_preferences.xml b/android/java/res/xml/qa_preferences.xml
index 2bae6d7c8c94..55d3ac036937 100644
--- a/android/java/res/xml/qa_preferences.xml
+++ b/android/java/res/xml/qa_preferences.xml
@@ -27,11 +27,11 @@
         android:summaryOff="@string/text_off"
         android:defaultValue="false" />
 
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:key="qa_import_rewards_db"
         android:title="Import Rewards Database"/>
 
-    <org.chromium.chrome.browser.settings.ChromeBasePreference
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:key="qa_export_rewards_db"
         android:title="Export Rewards Database" />
 

From a26057d4c2f5be9b53334e5c06641fbf35e1234a Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 21 May 2020 12:47:28 -0400
Subject: [PATCH 145/161] Updated patches after rebase over master.

---
 patches/chrome-VERSION.patch                           | 2 +-
 patches/chrome-installer-mini_installer-BUILD.gn.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index c9749b6c5142..cb2f433ad2ef 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 07080fbf46a01d484563f39453de329026005e74..1179402dd3ae70fd77377a3a1e56f77546789ff2 100644
+index 07080fbf46a01d484563f39453de329026005e74..a56979948f281f47ef12c354a415f50ab59a4109 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
diff --git a/patches/chrome-installer-mini_installer-BUILD.gn.patch b/patches/chrome-installer-mini_installer-BUILD.gn.patch
index b89a499fe845..69864b18561d 100644
--- a/patches/chrome-installer-mini_installer-BUILD.gn.patch
+++ b/patches/chrome-installer-mini_installer-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
-index b2c99d4721dd90a750f85fbedcb2bec4502e1ed7..93079f85a2d28756977f87d1f135e05294f3b814 100644
+index b2c99d4721dd90a750f85fbedcb2bec4502e1ed7..b399566d8c71a935629a2a4b9cccb13b1e91ad35 100644
 --- a/chrome/installer/mini_installer/BUILD.gn
 +++ b/chrome/installer/mini_installer/BUILD.gn
 @@ -11,6 +11,7 @@ import("//third_party/icu/config.gni")

From 12e1c889d95c46665735191025cb6d7318fe0659 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 21 May 2020 12:48:38 -0400
Subject: [PATCH 146/161] Dummy out AccountInfo.gaia

---
 .../components/sync/driver/profile_sync_service.cc   |  2 --
 .../brave_sync/brave_profile_sync_service_impl.cc    |  1 +
 ...ponents-sync-driver-profile_sync_service.cc.patch | 12 ++----------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/chromium_src/components/sync/driver/profile_sync_service.cc b/chromium_src/components/sync/driver/profile_sync_service.cc
index 921141d18a80..5b995a855e87 100644
--- a/chromium_src/components/sync/driver/profile_sync_service.cc
+++ b/chromium_src/components/sync/driver/profile_sync_service.cc
@@ -71,8 +71,6 @@ void BraveInit(base::WeakPtr<ProfileSyncService> profile_sync_service,
 #if BUILDFLAG(ENABLE_BRAVE_SYNC)
 #define IsSyncFeatureEnabled() IsBraveSyncEnabled(this)
 #endif
-#define BRAVE_PROFILE_SYNC_SERVICE_START_UP_SLOW_ENGINE_COMPONENTS_IF_FALSE \
-  if (false)
 #define BRAVE_PROFILE_SYNC_SERVICE_START_UP_SLOW_ENGINE_COMPONENTS \
   BraveInit(sync_enabled_weak_factory_.GetWeakPtr(), &sync_prefs_, &params);
 
diff --git a/components/brave_sync/brave_profile_sync_service_impl.cc b/components/brave_sync/brave_profile_sync_service_impl.cc
index 682ed2a99337..70a8ede7b1f3 100644
--- a/components/brave_sync/brave_profile_sync_service_impl.cc
+++ b/components/brave_sync/brave_profile_sync_service_impl.cc
@@ -61,6 +61,7 @@ namespace {
 AccountInfo GetDummyAccountInfo() {
   AccountInfo account_info;
   account_info.account_id = CoreAccountId::FromString("dummy_account_id");
+  account_info.gaia = "dummy_gaia";
   return account_info;
 }
 
diff --git a/patches/components-sync-driver-profile_sync_service.cc.patch b/patches/components-sync-driver-profile_sync_service.cc.patch
index 9e7455bcbf5f..11f59b29f954 100644
--- a/patches/components-sync-driver-profile_sync_service.cc.patch
+++ b/patches/components-sync-driver-profile_sync_service.cc.patch
@@ -1,16 +1,8 @@
 diff --git a/components/sync/driver/profile_sync_service.cc b/components/sync/driver/profile_sync_service.cc
-index 44a6eb15256323c76a10dcd6c412e228ae822e60..0b21c447f9a80295d4a38b948904fa8e5d7904b8 100644
+index 44a6eb15256323c76a10dcd6c412e228ae822e60..c76f70ddc3ad115051eb1f30c6bd84b7edd97319 100644
 --- a/components/sync/driver/profile_sync_service.cc
 +++ b/components/sync/driver/profile_sync_service.cc
-@@ -568,6 +568,7 @@ void ProfileSyncService::StartUpSlowEngineComponents() {
-   } else {
-     // Except for local sync (roaming profiles), the user must be signed in for
-     // sync to start.
-+    BRAVE_PROFILE_SYNC_SERVICE_START_UP_SLOW_ENGINE_COMPONENTS_IF_FALSE
-     DCHECK(!authenticated_account_info.gaia.empty());
-     DCHECK(!authenticated_account_info.account_id.empty());
-   }
-@@ -617,6 +618,7 @@ void ProfileSyncService::StartUpSlowEngineComponents() {
+@@ -617,6 +617,7 @@ void ProfileSyncService::StartUpSlowEngineComponents() {
        create_http_post_provider_factory_cb_, MakeUserAgentForSync(channel_),
        url_loader_factory_->Clone(), network_time_update_callback_);
    params.authenticated_account_id = authenticated_account_info.account_id;

From e02b4c74eaf5ec79cc671ad8273433e4cf8b4e35 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 21 May 2020 13:29:33 -0400
Subject: [PATCH 147/161] Makes page_info/BUILD.gn patch more generic.

---
 components/page_info/BUILD.gn               | 8 ++++++++
 patches/components-page_info-BUILD.gn.patch | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 components/page_info/BUILD.gn

diff --git a/components/page_info/BUILD.gn b/components/page_info/BUILD.gn
new file mode 100644
index 000000000000..506101a3948e
--- /dev/null
+++ b/components/page_info/BUILD.gn
@@ -0,0 +1,8 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+group("page_info") {
+  deps = [ "//brave/components/vector_icons" ]
+}
diff --git a/patches/components-page_info-BUILD.gn.patch b/patches/components-page_info-BUILD.gn.patch
index 7478548ff573..6f0409c82a04 100644
--- a/patches/components-page_info-BUILD.gn.patch
+++ b/patches/components-page_info-BUILD.gn.patch
@@ -1,12 +1,12 @@
 diff --git a/components/page_info/BUILD.gn b/components/page_info/BUILD.gn
-index 8fecfec436e938370d5a52baa54fe1b312bbf832..2ecc7b8e8356d76b1f08ee5e1d37ce9b929b5100 100644
+index 8fecfec436e938370d5a52baa54fe1b312bbf832..f8248c52a51764f47f84886abe3350f6d198db0d 100644
 --- a/components/page_info/BUILD.gn
 +++ b/components/page_info/BUILD.gn
 @@ -37,6 +37,7 @@ static_library("page_info") {
      "//services/device/public/cpp:device_features",
      "//services/metrics/public/cpp:ukm_builders",
    ]
-+  deps += [ "//brave/components/vector_icons" ]
++  deps += [ "//brave/components/page_info" ]
  
    if (is_android) {
      deps += [

From 8eedab0ccd56f926910b3ed37c27a93abd75a407 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 21 May 2020 13:29:53 -0400
Subject: [PATCH 148/161] Lint fix.

---
 .../brave_canonical_cookie_unittest.cc        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc b/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc
index fb985877eee5..9fdfcb6902e4 100644
--- a/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc
+++ b/chromium_src/net/cookies/brave_canonical_cookie_unittest.cc
@@ -35,18 +35,18 @@ constexpr base::TimeDelta kMaxCookieExpiration =
 TEST(BraveCanonicalCookieTest, SetMaxExpiration) {
   GURL url("https://www.example.com/test");
 
-  std::unique_ptr<CanonicalCookie> cookie(
-      CanonicalCookie::Create(url, max_expires_date_cookie, creation_time, base::nullopt));
+  std::unique_ptr<CanonicalCookie> cookie(CanonicalCookie::Create(
+      url, max_expires_date_cookie, creation_time, base::nullopt));
   EXPECT_TRUE(cookie.get());
   EXPECT_EQ(cookie->ExpiryDate(), creation_time + kMaxCookieExpiration);
 
-  cookie =
-      CanonicalCookie::Create(url, max_age_cookie, creation_time, base::nullopt);
+  cookie = CanonicalCookie::Create(url, max_age_cookie, creation_time,
+                                   base::nullopt);
   EXPECT_TRUE(cookie.get());
   EXPECT_EQ(cookie->ExpiryDate(), creation_time + kMaxCookieExpiration);
 
-  cookie =
-      CanonicalCookie::Create(url, max_expires_and_max_age_cookie, creation_time, base::nullopt);
+  cookie = CanonicalCookie::Create(url, max_expires_and_max_age_cookie,
+                                   creation_time, base::nullopt);
   EXPECT_TRUE(cookie.get());
   EXPECT_EQ(cookie->ExpiryDate(), creation_time + kMaxCookieExpiration);
 }
@@ -54,8 +54,8 @@ TEST(BraveCanonicalCookieTest, SetMaxExpiration) {
 TEST(BraveCanonicalCookieTest, AllowShorterThanMaxExpiration) {
   GURL url("https://www.example.com/test");
   // Short-lived cookies get to keep their shorter expiration.
-  std::unique_ptr<CanonicalCookie> cookie =
-      CanonicalCookie::Create(url, short_expiration_cookie, creation_time, base::nullopt);
+  std::unique_ptr<CanonicalCookie> cookie = CanonicalCookie::Create(
+      url, short_expiration_cookie, creation_time, base::nullopt);
   EXPECT_TRUE(cookie.get());
   EXPECT_EQ(cookie->ExpiryDate(), creation_time + TimeDelta::FromDays(2));
 }
@@ -75,8 +75,8 @@ TEST(BraveCanonicalCookieTest, NoExpirationCookie) {
 
   base::Time creation_time = base::Time::Now();
 
-  std::unique_ptr<CanonicalCookie> cookie(
-      CanonicalCookie::Create(url, no_expiration_cookie, creation_time, base::nullopt));
+  std::unique_ptr<CanonicalCookie> cookie(CanonicalCookie::Create(
+      url, no_expiration_cookie, creation_time, base::nullopt));
   EXPECT_TRUE(cookie.get());
   EXPECT_EQ(cookie->IsPersistent(), false);
 }

From 404085a462215a27baf1429a62dbfffe624a9cd4 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 21 May 2020 13:58:58 -0400
Subject: [PATCH 149/161] Restores a line accidentally removed by patching.

---
 ...s-site_settings_page-site_settings_page.js.patch | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
index 6b9bfb365abc..9215e33dceef 100644
--- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
+++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
-index 15cbc1bd0ebe97c497287723fb883056f61f9db4..3a638f1900996c1af3f7f4a60c4626825f223d7e 100644
+index 15cbc1bd0ebe97c497287723fb883056f61f9db4..4a176a3cb63a2886aba05f088b85c039ddd21515 100644
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
 @@ -27,6 +27,7 @@
@@ -42,7 +42,7 @@ index 15cbc1bd0ebe97c497287723fb883056f61f9db4..3a638f1900996c1af3f7f4a60c462682
        {
          route: settings.routes.SITE_SETTINGS_BLUETOOTH_DEVICES,
          id: Id.BLUETOOTH_DEVICES,
-@@ -337,13 +349,15 @@
+@@ -337,12 +349,15 @@
                  Id.MIC,
                  Id.SENSORS,
                  Id.NOTIFICATIONS,
@@ -54,12 +54,11 @@ index 15cbc1bd0ebe97c497287723fb883056f61f9db4..3a638f1900996c1af3f7f4a60c462682
 +/*
                  Id.ADS,
                  Id.BACKGROUND_SYNC,
--                Id.SOUND,
 +*/
+                 Id.SOUND,
                  Id.AUTOMATIC_DOWNLOADS,
                  Id.UNSANDBOXED_PLUGINS,
-                 Id.PROTOCOL_HANDLERS,
-@@ -372,7 +386,9 @@
+@@ -372,7 +387,9 @@
                Id.CAMERA,
                Id.MIC,
                Id.NOTIFICATIONS,
@@ -69,7 +68,7 @@ index 15cbc1bd0ebe97c497287723fb883056f61f9db4..3a638f1900996c1af3f7f4a60c462682
              ]),
              permissionsAdvanced: buildItemListFromIds([
                Id.SENSORS,
-@@ -392,6 +408,7 @@
+@@ -392,6 +409,7 @@
                Id.VR,
              ]),
              contentBasic: buildItemListFromIds([
@@ -77,7 +76,7 @@ index 15cbc1bd0ebe97c497287723fb883056f61f9db4..3a638f1900996c1af3f7f4a60c462682
                Id.COOKIES,
                Id.JAVASCRIPT,
                Id.PLUGINS,
-@@ -400,7 +417,9 @@
+@@ -400,7 +418,9 @@
              ]),
              contentAdvanced: buildItemListFromIds([
                Id.SOUND,

From 1d0394b765b962e3fa2dd0ac57c042544bbb4cda Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Thu, 21 May 2020 16:11:21 -0400
Subject: [PATCH 150/161] [Android] Additional fixes for crashes related to
 renaming

Caused by latest master pull to cr83
---
 android/java/res/xml/brave_privacy_preferences.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/java/res/xml/brave_privacy_preferences.xml b/android/java/res/xml/brave_privacy_preferences.xml
index 2052d45161b5..1fbb982d48a6 100644
--- a/android/java/res/xml/brave_privacy_preferences.xml
+++ b/android/java/res/xml/brave_privacy_preferences.xml
@@ -32,11 +32,11 @@
         android:title="@string/autocomplete_searches_and_urls_title"
         android:summary="@string/autocomplete_searches_and_urls_summary"
         android:persistent="false"/>
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="autocomplete_top_sites"
         android:title="@string/autocomplete_top_sites_title"
         android:persistent="false"/>
-    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="autocomplete_brave_suggested_sites"
         android:title="@string/autocomplete_brave_suggested_sites_title"
         android:persistent="false"/>

From 9b068aedd848f8bb20597f4c3ba4a73217bf9c58 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 21 May 2020 17:49:12 -0400
Subject: [PATCH 151/161] Make //build/config/compiler patch extensible.

---
 build/config/brave_build.gni                 |  1 +
 build/config/compiler.gni                    | 10 ++++++++++
 patches/build-config-compiler-BUILD.gn.patch | 14 +++++++-------
 3 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 build/config/compiler.gni

diff --git a/build/config/brave_build.gni b/build/config/brave_build.gni
index 0afbaa413120..6fec95b80c76 100644
--- a/build/config/brave_build.gni
+++ b/build/config/brave_build.gni
@@ -2,6 +2,7 @@
 # This file is included in most gn files either directly or through
 # import("//build/config/chrome_build.gni") in compiler.gni
 import("//brave/brave_repack_locales.gni")
+import("//brave/build/config/compiler.gni")
 import("//brave/build/features.gni")
 import("//brave/net/sources.gni")
 import("//brave/third_party/blink/renderer/includes.gni")
diff --git a/build/config/compiler.gni b/build/config/compiler.gni
new file mode 100644
index 000000000000..4941a236cc7f
--- /dev/null
+++ b/build/config/compiler.gni
@@ -0,0 +1,10 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Adjusts compiler flags in //build/config/compiler:chromium_code.
+brave_removed_chromium_code_cflags = []
+if (is_clang) {
+  brave_removed_chromium_code_cflags += [ "-Wunreachable-code" ]
+}
diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch
index 1c8813a65227..6e4a7ee7bb6c 100644
--- a/patches/build-config-compiler-BUILD.gn.patch
+++ b/patches/build-config-compiler-BUILD.gn.patch
@@ -1,12 +1,12 @@
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 3d5e4dede0ba6f01b5d002e46e835a16b6eb3a45..27fb13271336fb1e245321513b5041743c936e80 100644
+index 3d5e4dede0ba6f01b5d002e46e835a16b6eb3a45..e2035ec882a8ee3b1ed5327db8168c55559bdf4d 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1593,6 +1593,7 @@ config("chromium_code") {
-     # use_libfuzzer: https://crbug.com/1063180
-     if (!is_nacl && !use_libfuzzer) {
-       cflags += [ "-Wunreachable-code" ]
-+      cflags -= [ "-Wunreachable-code" ]
+@@ -1620,6 +1620,7 @@ config("chromium_code") {
+       cflags += [ "-Wextra-semi" ]
      }
+   }
++  cflags -= brave_removed_chromium_code_cflags
  
-     # Thread safety analysis is broken under nacl: https://crbug.com/982423.
+   configs = [ ":default_warnings" ]
+ }

From 78c6e75e1e4fae3fccbe8e278cefadc3810812e1 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 21 May 2020 17:53:25 -0400
Subject: [PATCH 152/161] Patch doesn't need to remove a line.

---
 patches/build-toolchain-win-setup_toolchain.py.patch | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/patches/build-toolchain-win-setup_toolchain.py.patch b/patches/build-toolchain-win-setup_toolchain.py.patch
index 4e61ee105afd..6fbb7158418d 100644
--- a/patches/build-toolchain-win-setup_toolchain.py.patch
+++ b/patches/build-toolchain-win-setup_toolchain.py.patch
@@ -1,12 +1,11 @@
 diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py
-index 2ab240da454821965080c82899c382a57d674d80..3d4381a30486655965aebd84ee152dce939d1801 100644
+index 2ab240da454821965080c82899c382a57d674d80..6163afd0959c6e9746a88c7637b5f0bbd0739035 100644
 --- a/build/toolchain/win/setup_toolchain.py
 +++ b/build/toolchain/win/setup_toolchain.py
-@@ -272,7 +272,7 @@ def main():
-       def q(s):  # Quote s if it contains spaces or other weird characters.
+@@ -273,6 +273,7 @@ def main():
          return s if re.match(r'^[a-zA-Z0-9._/\\:-]*$', s) else '"' + s + '"'
        include_I = ' '.join([q('/I' + i) for i in include])
--      include_imsvc = ' '.join([q('-imsvc' + i) for i in include])
+       include_imsvc = ' '.join([q('-imsvc' + i) for i in include])
 +      import win32api; include_imsvc = ' '.join([q('-imsvc' + win32api.GetShortPathName(i)) for i in include])
        libpath_flags = ' '.join([q('-libpath:' + i) for i in lib])
  

From c780d77eabed9a761bb0302a9562cbf7c265f636 Mon Sep 17 00:00:00 2001
From: Jocelyn Liu <yrliou@gmail.com>
Date: Thu, 21 May 2020 16:05:49 -0700
Subject: [PATCH 153/161] Remove
 TorProfileServiceFactory::ServiceIsNULLWhileTesting override.

Will crash running BraveProfileManagerTest.ProxyConfigMonitorInTorProfile unit
test if we do not instantiate TorProfileService, because we will need
TorProfileService to create the proxy config service for Tor profile.
---
 browser/profiles/brave_profile_manager_unittest.cc      | 1 -
 browser/tor/tor_profile_service_factory.cc              | 4 ----
 browser/tor/tor_profile_service_factory.h               | 1 -
 chromium_src/chrome/browser/net/proxy_config_monitor.cc | 1 +
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/browser/profiles/brave_profile_manager_unittest.cc b/browser/profiles/brave_profile_manager_unittest.cc
index 4b5da1940a07..04744562026b 100644
--- a/browser/profiles/brave_profile_manager_unittest.cc
+++ b/browser/profiles/brave_profile_manager_unittest.cc
@@ -238,7 +238,6 @@ TEST_F(BraveProfileManagerTest, NoWebtorrentInTorProfile) {
 }
 
 TEST_F(BraveProfileManagerTest, ProxyConfigMonitorInTorProfile) {
-  ScopedTorLaunchPreventerForTest prevent_tor_process;
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   base::FilePath dest_path =
       temp_dir_.GetPath().AppendASCII(TestingProfile::kTestUserProfileDir);
diff --git a/browser/tor/tor_profile_service_factory.cc b/browser/tor/tor_profile_service_factory.cc
index e1424a0959ff..700a66f40c29 100644
--- a/browser/tor/tor_profile_service_factory.cc
+++ b/browser/tor/tor_profile_service_factory.cc
@@ -77,10 +77,6 @@ content::BrowserContext* TorProfileServiceFactory::GetBrowserContextToUse(
   return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }
 
-bool TorProfileServiceFactory::ServiceIsNULLWhileTesting() const {
-  return true;
-}
-
 void TorProfileServiceFactory::BrowserContextShutdown(
     content::BrowserContext* context) {
 #if BUILDFLAG(ENABLE_TOR)
diff --git a/browser/tor/tor_profile_service_factory.h b/browser/tor/tor_profile_service_factory.h
index 7a0c7df6ac4a..845948de9a1b 100644
--- a/browser/tor/tor_profile_service_factory.h
+++ b/browser/tor/tor_profile_service_factory.h
@@ -35,7 +35,6 @@ class TorProfileServiceFactory : public BrowserContextKeyedServiceFactory {
       content::BrowserContext* context) const override;
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
-  bool ServiceIsNULLWhileTesting() const override;
   void BrowserContextShutdown(content::BrowserContext* context) override;
   void BrowserContextDestroyed(content::BrowserContext* context) override;
 
diff --git a/chromium_src/chrome/browser/net/proxy_config_monitor.cc b/chromium_src/chrome/browser/net/proxy_config_monitor.cc
index a61bc1d01969..513cc914aa43 100644
--- a/chromium_src/chrome/browser/net/proxy_config_monitor.cc
+++ b/chromium_src/chrome/browser/net/proxy_config_monitor.cc
@@ -20,6 +20,7 @@ namespace {
 std::unique_ptr<net::ProxyConfigService> CreateProxyConfigServiceTor(
     Profile* profile) {
   auto* tor_service = TorProfileServiceFactory::GetForProfile(profile);
+  DCHECK(tor_service);
   return tor_service->CreateProxyConfigService();
 }
 #endif  // BUILDFLAG(ENABLE_TOR)

From ed72c03d7f60f8447db124b43d336f0cead66f21 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Thu, 21 May 2020 21:49:21 -0400
Subject: [PATCH 154/161] Disable kAutofillEnableAccountWalletStorage feature.

This feature was disabled by default in C81, but is enabled by default
in C83. It causes a crash when navigating to brave://settings/payments.

commit f8d01800e4c08fb9ed7af6a5446f14553a0e2c6e
Author: Jared Saul <jsaul@google.com>
Date:   Mon Mar 23 22:53:41 2020 +0000

    [AF] Enable AutofillEnableAccountWalletStorage by default

    Also cleans up the fieldtrial_testing_config entry for the
    SyncButterWallet launch now that it's enabled ToT (and 100% launched).

    Per request, not going to clean up the code usage of the flag quite yet
    because Butter for Mobile may be coming in the near future.

    Bug: 983940
---
 app/brave_main_delegate.cc             | 34 ++++++++++++++------------
 app/brave_main_delegate_browsertest.cc |  1 +
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
index 2d5b27859a0a..13d47c1f114e 100644
--- a/app/brave_main_delegate.cc
+++ b/app/brave_main_delegate.cc
@@ -152,15 +152,16 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
 
   // Enabled features.
   std::unordered_set<const char*> enabled_features = {
-    // Upgrade all mixed content
+      // Upgrade all mixed content
       blink::features::kMixedContentAutoupgrade.name,
       password_manager::features::kPasswordImport.name,
-    // Remove URL bar mixed control and allow site specific override instead
+      // Remove URL bar mixed control and allow site specific override instead
       features::kMixedContentSiteSetting.name,
-    // Warn about Mixed Content optionally blockable content
+      // Warn about Mixed Content optionally blockable content
       security_state::features::kPassiveMixedContentWarning.name,
-    // Enable webui dark theme: @media (prefers-color-scheme: dark) is gated on
-    // this feature.
+      // Enable webui dark theme: @media (prefers-color-scheme: dark) is gated
+      // on
+      // this feature.
       features::kWebUIDarkMode.name,
   };
 
@@ -171,18 +172,19 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
 
   // Disabled features.
   const std::unordered_set<const char*> disabled_features = {
-      autofill::features::kAutofillServerCommunication.name,
-      blink::features::kTextFragmentAnchor.name,
-      features::kAllowPopupsDuringPageUnload.name,
-      features::kLookalikeUrlNavigationSuggestionsUI.name,
-      features::kNotificationTriggers.name,
-      features::kSmsReceiver.name,
-      features::kVideoPlaybackQuality.name,
-      features::kTabHoverCards.name,
+    autofill::features::kAutofillEnableAccountWalletStorage.name,
+    autofill::features::kAutofillServerCommunication.name,
+    blink::features::kTextFragmentAnchor.name,
+    features::kAllowPopupsDuringPageUnload.name,
+    features::kLookalikeUrlNavigationSuggestionsUI.name,
+    features::kNotificationTriggers.name,
+    features::kSmsReceiver.name,
+    features::kVideoPlaybackQuality.name,
+    features::kTabHoverCards.name,
 #if defined(OS_ANDROID)
-      feed::kInterestFeedContentSuggestions.name,
-      translate::kTranslateUI.name,
-      offline_pages::kPrefetchingOfflinePagesFeature.name,
+    feed::kInterestFeedContentSuggestions.name,
+    translate::kTranslateUI.name,
+    offline_pages::kPrefetchingOfflinePagesFeature.name,
 #endif
   };
   command_line.AppendFeatures(enabled_features, disabled_features);
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
index 2e9188cbe0b2..ff2bd7a3e004 100644
--- a/app/brave_main_delegate_browsertest.cc
+++ b/app/brave_main_delegate_browsertest.cc
@@ -42,6 +42,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisableHyperlinkAuditing) {
 
 IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
   const base::Feature* disabled_features[] = {
+      &autofill::features::kAutofillEnableAccountWalletStorage,
       &autofill::features::kAutofillServerCommunication,
       &blink::features::kTextFragmentAnchor,
       &features::kAllowPopupsDuringPageUnload,

From 9bd0985c7227c3e91272ed15f897afc91d0a5f97 Mon Sep 17 00:00:00 2001
From: Max Karolinskiy <max@brave.com>
Date: Fri, 22 May 2020 11:20:08 -0400
Subject: [PATCH 155/161] Reverted single gn target for rust fixes.

Doesn't seem to work for unit tests binary.
---
 test/BUILD.gn | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/test/BUILD.gn b/test/BUILD.gn
index 43ad05536522..64337431dde4 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -44,15 +44,6 @@ group("fix_brave_test_install_name_speedreader") {
   }
 }
 
-group("fix_all_tests") {
-  testonly = true
-  deps = [
-    ":fix_brave_test_install_name",
-    ":fix_brave_test_install_name_adblock",
-    ":fix_brave_test_install_name_speedreader",
-  ]
-}
-
 static_library("brave_test_support_unit") {
   testonly = true
   sources = [

From 7e26070099f8ed8231c512873383244ae8871c30 Mon Sep 17 00:00:00 2001
From: Pete Miller <miller.pete@gmail.com>
Date: Thu, 21 May 2020 22:06:58 -0700
Subject: [PATCH 156/161] Settings WebUI - Instead of patching content settings
 subsection navigation, use js overrides

---
 .../settings/brave_settings_overrides.html    |  1 +
 .../settings/brave_settings_overrides.js      | 38 ++++++++
 ...-settings-site_settings-constants.js.patch | 12 ---
 ..._settings_page-site_settings_page.js.patch | 88 -------------------
 4 files changed, 39 insertions(+), 100 deletions(-)
 delete mode 100644 patches/chrome-browser-resources-settings-site_settings-constants.js.patch
 delete mode 100644 patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch

diff --git a/browser/resources/settings/brave_settings_overrides.html b/browser/resources/settings/brave_settings_overrides.html
index 78a841c5ef80..86d80b0119e4 100644
--- a/browser/resources/settings/brave_settings_overrides.html
+++ b/browser/resources/settings/brave_settings_overrides.html
@@ -10,6 +10,7 @@
 <link rel="import" href="brave_sync_page/brave_sync_page.html">
 <link rel="import" href="brave_help_tips_page/brave_help_tips_page.html">
 <link rel="import" href="brave_new_tab_page/brave_new_tab_page.html">
+<link rel="import" href="site_settings/constants.html">
 
 <dom-module id="brave-settings-getting-started">
   <template>
diff --git a/browser/resources/settings/brave_settings_overrides.js b/browser/resources/settings/brave_settings_overrides.js
index 2bbad1ab75d7..b2a6b1c3cec5 100644
--- a/browser/resources/settings/brave_settings_overrides.js
+++ b/browser/resources/settings/brave_settings_overrides.js
@@ -103,6 +103,11 @@ const BraveClearSettingsMenuHighlightBehavior = {
   }
 }
 
+const SITE_SETTINGS_REMOVE_IDS = [
+  settings.ContentSettingsTypes.ADS,
+  settings.ContentSettingsTypes.BACKGROUND_SYNC,
+]
+
 // Polymer Component Behavior injection (like superclasses)
 BravePatching.RegisterPolymerComponentBehaviors({
   'settings-clear-browsing-data-dialog': [
@@ -135,6 +140,39 @@ BravePatching.RegisterPolymerComponentBehaviors({
             this.selected_.extensions)
       }
     }
+  }],
+  'settings-site-settings-page': [{
+    registered: function() {
+      if (!this.properties || !this.properties.lists_ || !this.properties.lists_.value) {
+        console.error('[Brave Settings Overrides] Could not find polymer lists_ property')
+        return
+      }
+      const oldListsGetter = this.properties.lists_.value
+      this.properties.lists_.value = function () {
+        const lists_ = oldListsGetter()
+        if (!lists_ || !lists_.all) {
+          console.error('[Brave Settings Overrides] did not get lists_ data')
+          return
+        }
+        lists_.all = lists_.all.filter(item => !SITE_SETTINGS_REMOVE_IDS.includes(item.id))
+        let indexForAutoplay = lists_.all.findIndex(item => item.id === settings.ContentSettingsTypes.AUTOMATIC_DOWNLOADS)
+        if (indexForAutoplay === -1) {
+          console.error('Could not find automatic downloads site settings item')
+        } else {
+          indexForAutoplay++
+          const autoplayItem = {
+            route: settings.routes.SITE_SETTINGS_AUTOPLAY,
+            id: 'autoplay',
+            label: 'siteSettingsAutoplay',
+            icon: 'cr:extension',
+            enabledLabel: 'siteSettingsAutoplayAsk',
+            disabledLabel: 'siteSettingsBlocked'
+          }
+          lists_.all.splice(indexForAutoplay, 0, autoplayItem)
+        }
+        return lists_
+      }
+    }
   }]
 })
 
diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.js.patch b/patches/chrome-browser-resources-settings-site_settings-constants.js.patch
deleted file mode 100644
index 8d71ab54418c..000000000000
--- a/patches/chrome-browser-resources-settings-site_settings-constants.js.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/chrome/browser/resources/settings/site_settings/constants.js b/chrome/browser/resources/settings/site_settings/constants.js
-index 0bc63a422d1d1ca468a1222dd699d5fa9bb65d26..4cfa27279c3b54c67769a2bc9e1c0613a25ab2a7 100644
---- a/chrome/browser/resources/settings/site_settings/constants.js
-+++ b/chrome/browser/resources/settings/site_settings/constants.js
-@@ -35,6 +35,7 @@ cr.define('settings', function() {
-     ADS: 'ads',
-     CLIPBOARD: 'clipboard',
-     SENSORS: 'sensors',
-+    AUTOPLAY: 'autoplay',
-     PAYMENT_HANDLER: 'payment-handler',
-     MIXEDSCRIPT: 'mixed-script',
-     BLUETOOTH_SCANNING: 'bluetooth-scanning',
diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
deleted file mode 100644
index 9215e33dceef..000000000000
--- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.js.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
-index 15cbc1bd0ebe97c497287723fb883056f61f9db4..4a176a3cb63a2886aba05f088b85c039ddd21515 100644
---- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
-+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
-@@ -27,6 +27,7 @@
-     // The following list is ordered alphabetically by |id|. The order in which
-     // these appear in the UI is determined elsewhere in this file.
-     const categoryList = [
-+/*
-       {
-         route: settings.routes.SITE_SETTINGS_ADS,
-         id: Id.ADS,
-@@ -37,6 +38,7 @@
-         shouldShow: () =>
-             loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter'),
-       },
-+*/
-       {
-         route: settings.routes.SITE_SETTINGS_AR,
-         id: Id.AR,
-@@ -54,6 +56,15 @@
-         enabledLabel: 'siteSettingsAutoDownloadAsk',
-         disabledLabel: 'siteSettingsAutoDownloadBlock',
-       },
-+      {
-+        route: settings.routes.SITE_SETTINGS_AUTOPLAY,
-+        id: Id.AUTOPLAY,
-+        label: 'siteSettingsAutoplay',
-+        icon: 'cr:extension',
-+        enabledLabel: 'siteSettingsAutoplayAsk',
-+        disabledLabel: 'siteSettingsBlocked',
-+      },
-+/*
-       {
-         route: settings.routes.SITE_SETTINGS_BACKGROUND_SYNC,
-         id: Id.BACKGROUND_SYNC,
-@@ -62,6 +73,7 @@
-         enabledLabel: 'siteSettingsAllowRecentlyClosedSites',
-         disabledLabel: 'siteSettingsBackgroundSyncBlocked',
-       },
-+*/
-       {
-         route: settings.routes.SITE_SETTINGS_BLUETOOTH_DEVICES,
-         id: Id.BLUETOOTH_DEVICES,
-@@ -337,12 +349,15 @@
-                 Id.MIC,
-                 Id.SENSORS,
-                 Id.NOTIFICATIONS,
-+                Id.AUTOPLAY,
-                 Id.JAVASCRIPT,
-                 Id.PLUGINS,
-                 Id.IMAGES,
-                 Id.POPUPS,
-+/*
-                 Id.ADS,
-                 Id.BACKGROUND_SYNC,
-+*/
-                 Id.SOUND,
-                 Id.AUTOMATIC_DOWNLOADS,
-                 Id.UNSANDBOXED_PLUGINS,
-@@ -372,7 +387,9 @@
-               Id.CAMERA,
-               Id.MIC,
-               Id.NOTIFICATIONS,
-+/*
-               Id.BACKGROUND_SYNC,
-+*/
-             ]),
-             permissionsAdvanced: buildItemListFromIds([
-               Id.SENSORS,
-@@ -392,6 +409,7 @@
-               Id.VR,
-             ]),
-             contentBasic: buildItemListFromIds([
-+              Id.AUTOPLAY,
-               Id.COOKIES,
-               Id.JAVASCRIPT,
-               Id.PLUGINS,
-@@ -400,7 +418,9 @@
-             ]),
-             contentAdvanced: buildItemListFromIds([
-               Id.SOUND,
-+/*
-               Id.ADS,
-+*/
-               Id.ZOOM_LEVELS,
-               'pdfDocuments',
-               Id.PROTECTED_CONTENT,

From 4cc8ed00a15c44000b8fb72ad3326b5c8aef8747 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 22 May 2020 13:13:07 -0400
Subject: [PATCH 157/161] Removed chromium_src override that's no longer used.

This was a leftover from the CreateCookie patches cleanup.
---
 .../browsing_data/mock_browsing_data_cookie_helper.cc    | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 chromium_src/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc

diff --git a/chromium_src/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc b/chromium_src/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc
deleted file mode 100644
index 8b35baa4c01c..000000000000
--- a/chromium_src/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#define BRAVE_ADDCOOKIESAMPLES false /*is_from_http*/,
-
-#include "../../../../chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc"
-#undef BRAVE_ADDCOOKIESAMPLES

From 3a964edee2c31c5125d084f914ef700f814a37b3 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 22 May 2020 14:10:25 -0400
Subject: [PATCH 158/161] Added missing dep

---
 components/permissions/BUILD.gn               |  8 ++++++++
 patches/components-permissions-BUILD.gn.patch | 12 ++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 components/permissions/BUILD.gn
 create mode 100644 patches/components-permissions-BUILD.gn.patch

diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn
new file mode 100644
index 000000000000..44c94171e4b5
--- /dev/null
+++ b/components/permissions/BUILD.gn
@@ -0,0 +1,8 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+source_set("permissions") {
+  deps = [ "//brave/components/resources:strings" ]
+}
diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch
new file mode 100644
index 000000000000..60b5d71c098e
--- /dev/null
+++ b/patches/components-permissions-BUILD.gn.patch
@@ -0,0 +1,12 @@
+diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn
+index 2a4eb7e3a8c106687f80656051c6a0a9e70e0ce3..1e74754c75de0b7dd5e09f5bb27e8b4c98e5ab53 100644
+--- a/components/permissions/BUILD.gn
++++ b/components/permissions/BUILD.gn
+@@ -55,6 +55,7 @@ source_set("permissions") {
+     "//ui/base",
+     "//url",
+   ]
++  deps += [ "//brave/components/permissions" ]
+   if (is_android) {
+     sources += [
+       "android/permission_dialog_delegate.cc",

From b348e371ce48ccbe5c3dfc8f7d731f9dc440ac97 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Tue, 26 May 2020 10:47:00 -0400
Subject: [PATCH 159/161] [Android] Updated definitions for resources

Related to recent master pull
---
 android/brave_java_resources.gni | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni
index a0060c0a4c9b..4af28eb8056c 100644
--- a/android/brave_java_resources.gni
+++ b/android/brave_java_resources.gni
@@ -21,16 +21,21 @@ brave_java_resources = [
   "java/res/drawable/brave_sync_toggle_off_btn_right.xml",
   "java/res/drawable/rewards_image_button.xml",
   "java/res/drawable/rewards_button_purple_border.xml",
+  "java/res/drawable/ic_toggle_up.xml",
   "java/res/drawable/rounded_filled.xml",
   "java/res/drawable/rounded_shape.xml",
   "java/res/drawable/brave_badge_rewards_background_large.xml",
   "java/res/drawable/rewards_button_orange.xml",
   "java/res/drawable/progress_indeterminate_orange.xml",
   "java/res/drawable/radiobutton_background.xml",
+  "java/res/drawable/transparent_bg_bordered.xml",
+  "java/res/drawable/ic_back.xml",
   "java/res/drawable/brave_badge_shields_background_large.xml",
   "java/res/drawable/brave_sync_toggle_off_btn_left.xml",
   "java/res/drawable/brave_gradient_shadow.xml",
+  "java/res/drawable/ic_toggle_down.xml",
   "java/res/drawable/brave_modern_toolbar_text_box_background.xml",
+  "java/res/drawable/ic_thank_you.xml",
   "java/res/drawable/brave_rewards_circle.xml",
   "java/res/drawable/tip_amount.xml",
   "java/res/drawable/brave_sync_toggle_on_btn_right.xml",
@@ -48,8 +53,10 @@ brave_java_resources = [
   "java/res/drawable/circular_progress.xml",
   "java/res/drawable/rounded_corners.xml",
   "java/res/drawable/bat_rewards_summary_gradient.xml",
+  "java/res/drawable/ic_chevron_right.xml",
   "java/res/drawable/rounded_holo.xml",
   "java/res/drawable/wallet_verify_button.xml",
+  "java/res/drawable/ic_help.xml",
   "java/res/drawable/plain_checkbox.xml",
   "java/res/drawable/rect_round_corners_12.xml",
   "java/res/drawable/progress_indeterminate.xml",
@@ -622,10 +629,14 @@ brave_java_resources = [
   "java/res/layout/location_status_incognito_badge.xml",
   "java/res/layout/fragment_troubleshooting_onboarding.xml",
   "java/res/layout/user_wallet_activity.xml",
+  "java/res/layout/brave_shields_option_layout.xml",
+  "java/res/layout/brave_shields_thank_you_layout.xml",
   "java/res/layout/new_tab_page_incognito.xml",
   "java/res/layout/fragment_super_referral_share.xml",
   "java/res/layout/activity_onboarding.xml",
   "java/res/layout/brave_stats_layout.xml",
+  "java/res/layout/brave_shields_secondary_layout.xml",
+  "java/res/layout/report_broken_site_layout.xml",
   "java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml",
   "java/res/layout/brave_set_default_browser_dialog.xml",
   "java/res/layout/brave_rewards_spinnner_item.xml",
@@ -651,7 +662,9 @@ brave_java_resources = [
   "java/res/layout/brave_toolbar.xml",
   "java/res/layout/web_notification_big_brave_ads.xml",
   "java/res/layout/brave_sync_done.xml",
+  "java/res/layout/brave_shields_main_layout.xml",
   "java/res/layout/fragment_brave_rewards_onboarding.xml",
+  "java/res/layout/brave_shields_toggle_layout.xml",
   "java/res/layout/new_tab_page_layout.xml",
   "java/res/layout/fragment_rate_dialog.xml",
   "java/res/layout/brave_ads_new_user_dialog_layout.xml",
@@ -673,7 +686,6 @@ brave_java_resources = [
   "java/res/layout/brave_sync_add_laptop.xml",
   "java/res/layout-land/brave_rewards_site_banner.xml",
   "java/res/layout-land/verify_wallet_activity.xml",
-  "java/res/menu/brave_shields_menu.xml",
   "java/res/menu/new_tab_menu.xml",
   "java/res/menu/exit_settings_menu.xml",
   "java/res/values/brave_ids.xml",

From ac7ee82922b41893434d605e9dbc77f88e1dd4f1 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Tue, 26 May 2020 11:00:43 -0400
Subject: [PATCH 160/161] [Android] Fixed build issues related to renaming

Caused by latest master pull to cr83
---
 .../chrome/browser/shields/BraveShieldsHandler.java       | 6 +++---
 android/java/res/layout/brave_shields_main_layout.xml     | 4 ++--
 .../java/res/layout/brave_shields_thank_you_layout.xml    | 4 ++--
 android/java/res/layout/report_broken_site_layout.xml     | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java
index c45f3dc31c2f..239cdbdf058a 100644
--- a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java
+++ b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java
@@ -351,7 +351,7 @@ private void initViews() {
     private void setUpMainLayout() {
         String favIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(mTabId);
         Tab currentActiveTab = BraveRewardsHelper.currentActiveTab();
-        String url = currentActiveTab.getUrl();
+        String url = currentActiveTab.getUrlString();
         final String favicon_url = (favIconURL.isEmpty()) ? url : favIconURL;
         mIconFetcher.retrieveLargeIcon(favicon_url, this);
 
@@ -466,7 +466,7 @@ public void onClick(View view) {
         });
         ImageView mCookiesIcon = mCookiesLayout.findViewById(R.id.toggle_favicon);
         mCookiesIcon.setImageResource(R.drawable.ic_chevron_right);
-        mCookiesIcon.setColorFilter(mContext.getResources().getColor(R.color.standard_mode_tint));
+        mCookiesIcon.setColorFilter(mContext.getResources().getColor(R.color.default_icon_color_tint_list));
         TextView mCookiesText = mCookiesLayout.findViewById(R.id.toggle_text);
         mCookiesText.setText(R.string.block_cross_site_cookies);
 
@@ -533,7 +533,7 @@ public void onClick(View view) {
         });
         ImageView mFingerPrintingIcon = mFingerPrintingLayout.findViewById(R.id.toggle_favicon);
         mFingerPrintingIcon.setImageResource(R.drawable.ic_chevron_right);
-        mFingerPrintingIcon.setColorFilter(mContext.getResources().getColor(R.color.standard_mode_tint));
+        mFingerPrintingIcon.setColorFilter(mContext.getResources().getColor(R.color.default_icon_color_tint_list));
         TextView mFingerPrintingText = mFingerPrintingLayout.findViewById(R.id.toggle_text);
         mFingerPrintingText.setText(R.string.block_cross_site_fingerprinting);
 
diff --git a/android/java/res/layout/brave_shields_main_layout.xml b/android/java/res/layout/brave_shields_main_layout.xml
index dde211748440..76547cfd7506 100644
--- a/android/java/res/layout/brave_shields_main_layout.xml
+++ b/android/java/res/layout/brave_shields_main_layout.xml
@@ -79,7 +79,7 @@
 				android:layout_height="wrap_content"
 				android:textSize="14sp"
 				android:gravity="center_horizontal"
-				android:textColor="@color/standard_mode_tint"
+				android:textColor="@color/default_icon_color_tint_list"
 				android:layout_marginTop="32dp"
 				android:layout_marginStart="24dp"
 				android:layout_marginEnd="24dp"
@@ -103,7 +103,7 @@
 	            android:textAllCaps="false"
 	            android:textSize="16sp"
 	            android:visibility="gone"
-	            android:textColor="@color/standard_mode_tint"/>
+	            android:textColor="@color/default_icon_color_tint_list"/>
 
 			<LinearLayout
 		      	android:id="@+id/site_block_layout"
diff --git a/android/java/res/layout/brave_shields_thank_you_layout.xml b/android/java/res/layout/brave_shields_thank_you_layout.xml
index b3ec7524cae3..63a3d547a7f4 100644
--- a/android/java/res/layout/brave_shields_thank_you_layout.xml
+++ b/android/java/res/layout/brave_shields_thank_you_layout.xml
@@ -33,7 +33,7 @@
             android:textSize="24sp"
             android:gravity="center_vertical"
             android:text="@string/thank_you"
-            android:textColor="@color/standard_mode_tint"/>
+            android:textColor="@color/default_icon_color_tint_list"/>
 
     </LinearLayout>
 
@@ -41,7 +41,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="16sp"
-        android:textColor="@color/standard_mode_tint"
+        android:textColor="@color/default_icon_color_tint_list"
         android:layout_marginBottom="14dp"
         android:text="@string/thank_you_text"/>
 
diff --git a/android/java/res/layout/report_broken_site_layout.xml b/android/java/res/layout/report_broken_site_layout.xml
index bd0d32976350..c75b6f0f78c0 100644
--- a/android/java/res/layout/report_broken_site_layout.xml
+++ b/android/java/res/layout/report_broken_site_layout.xml
@@ -20,13 +20,13 @@
         android:gravity="center_vertical"
         android:fontFamily="sans-serif"
         android:text="@string/report_broken_site_text"
-        android:textColor="@color/standard_mode_tint"/>
+        android:textColor="@color/default_icon_color_tint_list"/>
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="16sp"
-        android:textColor="@color/standard_mode_tint"
+        android:textColor="@color/default_icon_color_tint_list"
         android:layout_marginBottom="14dp"
         android:text="@string/report_broken_site_text_1"/>
 
@@ -42,7 +42,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="16sp"
-        android:textColor="@color/standard_mode_tint"
+        android:textColor="@color/default_icon_color_tint_list"
         android:text="@string/report_broken_site_text_2"/>
 
     <LinearLayout
@@ -66,7 +66,7 @@
             android:text="@android:string/cancel"
             android:textAllCaps="false"
             android:textSize="16sp"
-            android:textColor="@color/standard_mode_tint"/>
+            android:textColor="@color/default_icon_color_tint_list"/>
 
         <Button
             android:id="@+id/btn_submit"

From 3eac52f218f76979995a64f5bd536be932ef143f Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Tue, 26 May 2020 14:26:00 -0400
Subject: [PATCH 161/161] Patch components/strings instead of permissions.

---
 components/permissions/BUILD.gn               |  8 --------
 patches/components-permissions-BUILD.gn.patch | 12 ------------
 patches/components-strings-BUILD.gn.patch     | 12 ++++++++++--
 3 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 components/permissions/BUILD.gn
 delete mode 100644 patches/components-permissions-BUILD.gn.patch

diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn
deleted file mode 100644
index 44c94171e4b5..000000000000
--- a/components/permissions/BUILD.gn
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2020 The Brave Authors. All rights reserved.
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-source_set("permissions") {
-  deps = [ "//brave/components/resources:strings" ]
-}
diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch
deleted file mode 100644
index 60b5d71c098e..000000000000
--- a/patches/components-permissions-BUILD.gn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn
-index 2a4eb7e3a8c106687f80656051c6a0a9e70e0ce3..1e74754c75de0b7dd5e09f5bb27e8b4c98e5ab53 100644
---- a/components/permissions/BUILD.gn
-+++ b/components/permissions/BUILD.gn
-@@ -55,6 +55,7 @@ source_set("permissions") {
-     "//ui/base",
-     "//url",
-   ]
-+  deps += [ "//brave/components/permissions" ]
-   if (is_android) {
-     sources += [
-       "android/permission_dialog_delegate.cc",
diff --git a/patches/components-strings-BUILD.gn.patch b/patches/components-strings-BUILD.gn.patch
index 5ce243ad440e..edc5b820b0fa 100644
--- a/patches/components-strings-BUILD.gn.patch
+++ b/patches/components-strings-BUILD.gn.patch
@@ -1,8 +1,16 @@
 diff --git a/components/strings/BUILD.gn b/components/strings/BUILD.gn
-index 4f264ebc35e4b48b91c89ccd48413a83bb8442dd..9d8c20242d95524cbfc5f392c0520225582e4edd 100644
+index 4f264ebc35e4b48b91c89ccd48413a83bb8442dd..03f226b2d8ce617f9608be24ae7ae4347c3c15ea 100644
 --- a/components/strings/BUILD.gn
 +++ b/components/strings/BUILD.gn
-@@ -52,7 +52,7 @@ if (is_android) {
+@@ -40,6 +40,7 @@ grit("components_strings") {
+   if (is_android) {
+     outputs += android_components_strings_java_resources
+   }
++  deps = [ "//brave/components/resources:strings" ]
+ }
+ 
+ if (is_android) {
+@@ -52,7 +53,7 @@ if (is_android) {
  }
  
  grit("components_chromium_strings") {