From ceed0b4915622f6c99af8a4df16afb6e7df690dc Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Wed, 24 Jul 2019 17:50:41 -0400 Subject: [PATCH 01/10] Update patches from Chromium 76.0.3809.62 to Chromium 77.0.3860.5 --- patches/build-config-BUILDCONFIG.gn.patch | 2 +- patches/build-config-android-config.gni.patch | 2 +- patches/chrome-BUILD.gn.patch | 30 ++++++------ patches/chrome-VERSION.patch | 8 ++-- patches/chrome-android-BUILD.gn.patch | 16 +++---- ...me-browser-ChromeTabbedActivity.java.patch | 4 +- ...arch_engines-TemplateUrlService.java.patch | 30 ------------ patches/chrome-android-java_sources.gni.patch | 4 +- patches/chrome-app-BUILD.gn.patch | 6 +-- patches/chrome-app-chrome_dll.rc.patch | 2 +- patches/chrome-browser-BUILD.gn.patch | 4 +- patches/chrome-browser-about_flags.cc.patch | 4 +- ...e-autocomplete_classifier_factory.cc.patch | 2 +- ...hrome-browser-browser_process_impl.h.patch | 4 +- ...wser-chrome_content_browser_client.h.patch | 6 +-- ..._settings-cookie_settings_factory.cc.patch | 8 ++-- ...ngs-tab_specific_content_settings.cc.patch | 6 +-- ...wser-devtools-devtools_ui_bindings.h.patch | 2 +- ...-chrome_extensions_browser_client.cc.patch | 4 +- ...rowser-extensions-component_loader.h.patch | 8 ++-- ...tensions-extension_install_prompt.cc.patch | 4 +- ...xtensions-extension_install_prompt.h.patch | 2 +- ...r-extensions-extension_management.cc.patch | 4 +- ...rotocol-external_protocol_handler.cc.patch | 4 +- ...-external_process_importer_client.cc.patch | 4 +- ...ter-external_process_importer_host.h.patch | 2 +- ...me-browser-importer-importer_list.cc.patch | 2 +- patches/chrome-browser-io_thread.cc.patch | 12 ----- ...rowser-net-chrome_network_delegate.h.patch | 12 ++--- ...chrome_url_request_context_getter.cc.patch | 29 ----------- ...-browser-net-net_error_tab_helper.cc.patch | 4 +- ...otification_platform_bridge_linux.cc.patch | 4 +- ...er-permissions-permission_manager.cc.patch | 10 ++-- ...ser-permissions-permission_request.h.patch | 2 +- ...r-permissions-permission_uma_util.cc.patch | 2 +- ...gins-chrome_plugin_service_filter.cc.patch | 4 +- ...-plugins-plugins_resource_service.cc.patch | 2 +- ...hrome-browser-prefs-browser_prefs.cc.patch | 4 +- .../chrome-browser-profiles-profile.cc.patch | 4 +- ...ome-browser-profiles-profile_impl.cc.patch | 4 +- ...-browser-profiles-profile_io_data.cc.patch | 13 +---- ...-browser-profiles-profile_manager.cc.patch | 10 ++-- ...e-browser-profiles-profile_manager.h.patch | 10 ++-- ...ext_menu-render_view_context_menu.cc.patch | 4 +- ...text_menu-render_view_context_menu.h.patch | 4 +- ...r-resources-bookmarks-bookmarks.html.patch | 4 +- ...ser-resources-bookmarks-toolbar.html.patch | 2 +- ...r-resources-downloads-downloads.html.patch | 4 +- ...ser-resources-downloads-manager.html.patch | 8 ++-- ...ser-resources-downloads-toolbar.html.patch | 2 +- ...rowser-resources-extensions-BUILD.gn.patch | 2 +- ...resources-extensions-extensions.html.patch | 4 +- ...-resources-extensions-item_list.html.patch | 4 +- ...er-resources-extensions-sidebar.html.patch | 6 +-- ...er-resources-extensions-toolbar.html.patch | 8 ++-- ...e-browser-resources-history-app.html.patch | 6 +-- ...owser-resources-history-history.html.patch | 4 +- ...-resources-history-history_item.html.patch | 2 +- ...sources-history-history_toolbar.html.patch | 2 +- ...s-local_discovery-local_discovery.js.patch | 6 +-- ...-browser-resources-settings-BUILD.gn.patch | 2 +- ...-settings-about_page-about_page.html.patch | 4 +- ...es-settings-about_page-about_page.js.patch | 4 +- ...ance_page-appearance_fonts_page.html.patch | 4 +- ...appearance_page-appearance_page.html.patch | 6 +-- ...autofill_page-passwords_section.html.patch | 4 +- ...-people_page-import_data_dialog.html.patch | 2 +- ...ettings-people_page-people_page.html.patch | 12 ++--- ...ngs-printing_page-printing_page.html.patch | 6 +-- ...cy_page-personalization_options.html.patch | 2 +- ...tings-privacy_page-privacy_page.html.patch | 2 +- ...-browser-resources-settings-route.js.patch | 6 +-- ...ser-resources-settings-settings.html.patch | 8 ++-- ...ettings-settings_ui-settings_ui.html.patch | 6 +-- ...ings-site_settings-site_details.html.patch | 4 +- ...ettings_page-site_settings_page.html.patch | 8 ++-- ..._settings_page-site_settings_page.js.patch | 4 +- ...browsing-client_side_model_loader.cc.patch | 2 +- ...-account_consistency_mode_manager.cc.patch | 2 +- ...er-spellcheck_hunspell_dictionary.cc.patch | 4 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 +-- ...-save_card_bubble_controller_impl.cc.patch | 4 +- ...-ui-bookmarks-bookmark_tab_helper.cc.patch | 2 +- ...rome-browser-ui-browser_navigator.cc.patch | 4 +- ...rowser-ui-cocoa-main_menu_builder.mm.patch | 2 +- ...ings-content_setting_bubble_model.cc.patch | 6 +-- ...-extension_action_view_controller.cc.patch | 8 ++-- ...s-extension_action_view_controller.h.patch | 2 +- ...ions-icon_with_badge_image_source.cc.patch | 2 +- ...rome-browser-ui-libgtkui-gtk_util.cc.patch | 4 +- ...me-browser-ui-page_info-page_info.cc.patch | 8 ++-- ...browser-ui-page_info-page_info_ui.cc.patch | 6 +-- ...r-ui-startup-startup_tab_provider.cc.patch | 4 +- .../chrome-browser-ui-tab_helpers.cc.patch | 4 +- ...chrome_location_bar_model_delegate.h.patch | 10 ++-- ...r-ui-toolbar-toolbar_actions_model.h.patch | 4 +- ...rowser-ui-views-accelerator_table.cc.patch | 2 +- ...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 | 2 +- ...ion_bubble-permission_prompt_impl.cc.patch | 2 +- ...ws-profiles-avatar_toolbar_button.cc.patch | 4 +- ...ews-profiles-avatar_toolbar_button.h.patch | 8 ++-- ...ews-profiles-profile_chooser_view.cc.patch | 6 +-- ...iews-profiles-profile_chooser_view.h.patch | 8 ++-- ...me-browser-ui-views-tabs-tab_icon.cc.patch | 4 +- ...ser-ui-views-tabs-tab_style_views.cc.patch | 4 +- ...-toolbar-browser_actions_container.h.patch | 4 +- ...s-toolbar-browser_app_menu_button.cc.patch | 10 ++-- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 4 +- ...wser-ui-views-toolbar-toolbar_view.h.patch | 10 ++-- ...r-ui-webui-bookmarks-bookmarks_ui.cc.patch | 4 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...rome-browser-ui-webui-devtools_ui.cc.patch | 2 +- ...r-ui-webui-downloads-downloads_ui.cc.patch | 4 +- ...ui-webui-extensions-extensions_ui.cc.patch | 4 +- ...hrome-browser-ui-webui-history_ui.cc.patch | 4 +- ...edia_router_webui_message_handler.cc.patch | 35 -------------- ...ttings_localized_strings_provider.cc.patch | 4 +- ...ome-browser-ui-webui-theme_source.cc.patch | 2 +- ...de_detector-upgrade_detector_impl.cc.patch | 6 +-- ...ade_detector-upgrade_detector_impl.h.patch | 2 +- ...s-components-web_app_shortcut_mac.mm.patch | 4 +- patches/chrome-common-BUILD.gn.patch | 4 +- patches/chrome-installer-linux-BUILD.gn.patch | 14 +++--- ...me-installer-mac-signing-pipeline.py.patch | 4 +- ...ome-installer-mac-signing-signing.py.patch | 36 ++++++-------- ...me-installer-mini_installer-BUILD.gn.patch | 4 +- ...e-installer-setup-installer_state.cc.patch | 4 +- ...aller-util-google_update_settings.cc.patch | 4 +- patches/chrome-renderer-BUILD.gn.patch | 2 +- ...er-chrome_content_renderer_client.cc.patch | 4 +- ...rer-chrome_content_renderer_client.h.patch | 4 +- patches/chrome-test-BUILD.gn.patch | 6 +-- patches/chrome-utility-BUILD.gn.patch | 2 +- ...utility-importer-firefox_importer.cc.patch | 4 +- ...ntent_settings-core-browser-BUILD.gn.patch | 2 +- ...ore-browser-content_settings_pref.cc.patch | 4 +- ...ser-content_settings_pref_provider.h.patch | 4 +- ...browser-content_settings_registry.cc.patch | 4 +- ...tings-core-browser-cookie_settings.h.patch | 8 ++-- ...-crash-content-app-breakpad_linux.cc.patch | 10 ++-- ...owser-distiller_page_web_contents.cc.patch | 4 +- ...nternal-common-download_item_impl.cc.patch | 6 +-- ...onents-gcm_driver-gcm_client_impl.cc.patch | 10 ++-- ...lidation-impl-fcm_network_handler.cc.patch | 4 +- .../components-omnibox-browser-BUILD.gn.patch | 4 +- ...ox-browser-autocomplete_controller.h.patch | 4 +- ...ore-browser-password_form_filling.cc.patch | 4 +- ...wsing-db-v4_protocol_manager_util.cc.patch | 2 +- ...arch_engines-TemplateUrlService.java.patch | 30 ++++++++++++ ...ch_engines-prepopulated_engines.json.patch | 2 +- .../components-version_info-BUILD.gn.patch | 2 +- .../content-browser-browser_main_loop.h.patch | 4 +- ...hild_process_security_policy_impl.cc.patch | 4 +- ...e_host-navigation_controller_impl.cc.patch | 4 +- ...ser-frame_host-navigation_request.cc.patch | 6 +-- ...ssions-permission_controller_impl.cc.patch | 8 ++-- ...rmissions-permission_service_impl.cc.patch | 10 ++-- ...nt-browser-storage_partition_impl.cc.patch | 6 +-- .../content-child-child_thread_impl.cc.patch | 4 +- patches/content-common-BUILD.gn.patch | 4 +- ...-public-browser-browser_main_parts.h.patch | 4 +- ...lic-browser-content_browser_client.h.patch | 4 +- ...ent-public-browser-permission_type.h.patch | 8 ++-- ...nt-public-browser-url_data_source.cc.patch | 8 ++-- ...ntent-renderer-render_thread_impl.cc.patch | 4 +- ...ons-browser-api-socket-tcp_socket.cc.patch | 4 +- ...r-api-web_request-web_request_api.cc.patch | 4 +- ...er-extension_event_histogram_value.h.patch | 8 ++-- ...ns-browser-updater-update_service.cc.patch | 2 +- ...mmon-permissions-permissions_data.cc.patch | 4 +- patches/extensions-renderer-BUILD.gn.patch | 6 +-- .../extensions-renderer-dispatcher.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 | 4 +- ...-chromium_bindings_configuration.gni.patch | 6 +-- patches/net-BUILD.gn.patch | 4 +- patches/net-cookies-canonical_cookie.cc.patch | 2 +- ...solution-proxy_resolution_service.cc.patch | 4 +- .../net-socket-socks5_client_socket.cc.patch | 8 ++-- ...e_manager-sandbox-win-sandbox_win.cc.patch | 4 +- patches/testing-iossim-iossim.mm.patch | 13 ----- ...c-mojom-permissions-permission.mojom.patch | 10 ++-- ...e-html-canvas-html_canvas_element.cc.patch | 6 +-- ...enderer-core-svg-svg_path_element.cc.patch | 2 +- ...core-svg-svg_text_content_element.cc.patch | 2 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 4 +- ...anvas2d-base_rendering_context_2d.cc.patch | 10 ++-- ...canvas2d-base_rendering_context_2d.h.patch | 2 +- ...vas2d-canvas_rendering_context_2d.cc.patch | 10 ++-- ...as2d-canvas_rendering_context_2d.idl.patch | 2 +- ...eerconnection-rtc_peer_connection.cc.patch | 20 ++++---- ...erer-modules-webaudio-audio_buffer.h.patch | 2 +- ...er-modules-webaudio-audio_buffer.idl.patch | 4 +- ...bgl-webgl2_rendering_context_base.cc.patch | 8 ++-- ...ebgl-webgl_rendering_context_base.cc.patch | 48 +++++++++---------- patches/tools-gritsettings-resource_ids.patch | 4 +- ...ls-metrics-histograms-histograms.xml.patch | 4 +- patches/ui-base-BUILD.gn.patch | 4 +- patches/ui-native_theme-native_theme.h.patch | 6 +-- .../ui-native_theme-native_theme_win.h.patch | 6 +-- ...ar-cr_toolbar_selection_overlay.html.patch | 8 ++-- ...elements-paper_button_style_css.html.patch | 12 ----- ...es-cr_elements-shared_style_css.html.patch | 2 +- ...ces-cr_elements-shared_vars_css.html.patch | 2 +- ...ui-webui-resources-css-md_colors.css.patch | 2 +- 210 files changed, 556 insertions(+), 674 deletions(-) delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-search_engines-TemplateUrlService.java.patch delete mode 100644 patches/chrome-browser-io_thread.cc.patch delete mode 100644 patches/chrome-browser-net-chrome_url_request_context_getter.cc.patch delete mode 100644 patches/chrome-browser-ui-webui-media_router-media_router_webui_message_handler.cc.patch create mode 100644 patches/components-search_engines-android-java-src-org-chromium-components-search_engines-TemplateUrlService.java.patch delete mode 100644 patches/testing-iossim-iossim.mm.patch delete mode 100644 patches/ui-webui-resources-cr_elements-paper_button_style_css.html.patch diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index 3dc90e750b6..abdda3f3564 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 7063da0f26c5691f01214c2dc014128d7c8c5e09..3e18855c2a74036033999cd060a7f577925d0ee4 100644 +index db7ab0255b482d4e1fd20a31cfec86a24546602a..1cc44592d0d854f17cf3d2f5a5e0c2ed76b2d025 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 c2f7ac19d1c..5c4bffb9cc2 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 58838421c8a3cb995d3b41c59fac24523c57dafa..fb3715e80a24f7de149e7d7301e209a148c30d0f 100644 +index bed796ebe45e47af39bb3f27383cf23bc028adb3..7c0707454b7e3c435d793c1e300755f3d8bcb9c2 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -3,6 +3,7 @@ diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index aad7ab2c68a..60bf95aee8a 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 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b8c4a1956 100644 +index e5b48fd4d4e431e9a54b73856214e9e48d248940..0f069fd5acb8db72ec89bd8e36dec6b8475acd69 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -189,6 +189,10 @@ if (!is_android && !is_mac) { +@@ -190,6 +190,10 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -13,7 +13,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b deps += [ ":chrome_dll", -@@ -288,6 +292,7 @@ if (!is_android && !is_mac) { +@@ -297,6 +301,7 @@ if (!is_android && !is_mac) { "//headless:headless_shell_lib", "//services/service_manager/embedder", ] @@ -21,7 +21,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b public_deps = [ ":xdg_mime", # Needs to be public for installer to consume files. -@@ -434,6 +439,7 @@ if (is_win) { +@@ -431,6 +436,7 @@ if (is_win) { "//third_party/wtl", "//ui/views", ] @@ -29,7 +29,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b ldflags = [ "/DELAYLOAD:advapi32.dll", -@@ -568,6 +574,7 @@ if (is_win) { +@@ -566,6 +572,7 @@ if (is_win) { "//headless:headless_shell_child_lib", "//services/service_manager/embedder", ] @@ -37,7 +37,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b ldflags = [ "/DELAYLOAD:comctl32.dll", -@@ -680,6 +687,11 @@ if (is_win) { +@@ -677,6 +684,11 @@ if (is_win) { ] } @@ -49,7 +49,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b mac_app_bundle("chrome_app") { output_name = chrome_product_full_name -@@ -713,6 +725,7 @@ if (is_win) { +@@ -710,6 +722,7 @@ if (is_win) { rebase_path("app/app.exports", root_build_dir) ] } } @@ -57,7 +57,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b compiled_action("chrome_app_strings") { tool = "//chrome/tools/build/mac:infoplist_strings_tool" -@@ -742,7 +755,7 @@ if (is_win) { +@@ -739,7 +752,7 @@ if (is_win) { args = [ "-b", @@ -66,7 +66,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b "-v", rebase_path(chrome_version_file, root_build_dir), "-g", -@@ -823,7 +836,7 @@ if (is_win) { +@@ -820,7 +833,7 @@ if (is_win) { # framework itself, that would cause a cyclical dependency. Instead, # this dependency directly copies the file into the framework's # resources directory. @@ -75,7 +75,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b } } -@@ -1222,6 +1235,7 @@ if (is_win) { +@@ -1247,6 +1260,7 @@ if (is_win) { "//services/service_manager/embedder", "//third_party/cld_3/src/src:cld_3", ] @@ -83,7 +83,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b if (is_component_build) { libs = [ "Carbon.framework" ] -@@ -1286,6 +1300,10 @@ if (is_win) { +@@ -1311,6 +1325,10 @@ if (is_win) { if (is_chrome_branded) { deps += [ ":default_apps" ] } @@ -94,7 +94,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ] -@@ -1446,6 +1464,7 @@ if (is_win) { +@@ -1475,6 +1493,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -102,7 +102,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b "//chrome/browser", "//chrome/common", "//components/gwp_asan/buildflags", -@@ -1519,13 +1538,14 @@ group("child_dependencies") { +@@ -1547,13 +1566,14 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -118,7 +118,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b ] output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1598,6 +1618,7 @@ group("resources") { +@@ -1626,6 +1646,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", @@ -126,7 +126,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b ] } -@@ -1849,6 +1870,7 @@ if (is_android) { +@@ -1878,6 +1899,7 @@ if (is_android) { "//content/public/common:service_names", "//services/service_manager/embedder", ] diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 306c6ca5375..199ec6d00c2 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index e05d1f3aaf621bae4c2448a8dd9ee80a90b2321b..6f14cd915f02f2a05d0d78ad5fba93f7ae33267d 100644 +index e1504dfcaec5bc2d6a88b841353006903306bdaa..8d780cde76410d7e9a2f73e5fb3585c307110cd5 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ - MAJOR=76 + MAJOR=77 MINOR=0 --BUILD=3809 --PATCH=62 +-BUILD=3860 +-PATCH=5 +BUILD=70 +PATCH=4 diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 14f1ab03d5c..0d2102218db 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,13 +1,13 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 17311184c47823594b49ad07d41bd870efa7af17..611376d4d7c3bac30ecfbab8a786dc2fffd52fce 100644 +index 01d5593c76ee0982714456a49929caeecc0a9771..ab47048b6c28c51e6d79148dc65712e9042fedfd 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -42,7 +42,7 @@ if (dfmify_devtools) { - import("//chrome/android/features/devtools/devtools_module_tmpl.gni") - } +@@ -31,7 +31,7 @@ import("java_sources.gni") + import("static_initializers.gni") + import("trichrome.gni") --manifest_package = "org.chromium.chrome" -+declare_args() { manifest_package = "org.chromium.chrome" } - test_manifest_package = "org.chromium.chrome.tests" +-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 = default_chrome_public_jinja_variables + + chrome_public_jinja_variables = 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 919d232c5fe..139aae27375 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 6bdd439f89a68e8b53bf077547ad04bc35414674..366524b92af5979ed4be1bac159cae6da8896a09 100644 +index a168b085348c218c2951964beb37e0a25d754836..ad5cf672b9548a4f9921c4bc3521a0c8111e998d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -182,7 +182,7 @@ import java.util.Locale; +@@ -174,7 +174,7 @@ import java.util.Locale; * are accessible via a chrome specific tab switching UI. */ public class ChromeTabbedActivity diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-search_engines-TemplateUrlService.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-search_engines-TemplateUrlService.java.patch deleted file mode 100644 index 6ea203beac6..00000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-search_engines-TemplateUrlService.java.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java -index 55c72cd215f525a17853cd63f79ecb8b537d4102..3bec2e2c5aedcbf631aadc058c2167c1641a626d 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java -@@ -11,6 +11,7 @@ import org.chromium.base.ThreadUtils; - import org.chromium.base.VisibleForTesting; - import org.chromium.base.annotations.CalledByNative; - import org.chromium.base.task.PostTask; -+import org.chromium.chrome.browser.search_engines.BraveTemplateUrlService; - import org.chromium.content_public.browser.UiThreadTaskTraits; - - import java.util.ArrayList; -@@ -49,7 +50,7 @@ public class TemplateUrlService { - public static TemplateUrlService getInstance() { - ThreadUtils.assertOnUiThread(); - if (sService == null) { -- sService = new TemplateUrlService(); -+ sService = new BraveTemplateUrlService(); - } - return sService; - } -@@ -59,7 +60,7 @@ public class TemplateUrlService { - private final ObserverList mObservers = - new ObserverList(); - -- private TemplateUrlService() { -+ protected TemplateUrlService() { - // Note that this technically leaks the native object, however, TemlateUrlService - // is a singleton that lives forever and there's no clean shutdown of Chrome on Android - mNativeTemplateUrlServiceAndroid = nativeInit(); diff --git a/patches/chrome-android-java_sources.gni.patch b/patches/chrome-android-java_sources.gni.patch index 73b0b720e16..3c717850b9c 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 8aedf50897e9b40ca6b9617bb1a8ac766a6da16a..3ec678a94edda05c74640dcdbf63792a12ecc3dc 100644 +index ba374328abaf898aa5dd233f12673efb558c99ae..546ee1b26bbc68ca2c2d94aa42b93c836debac4f 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni -@@ -15,6 +15,7 @@ import("//components/offline_pages/buildflags/features.gni") +@@ -17,6 +17,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 8475bb01e1f..f22bad22d85 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 590c4edcededad77172ae30e85b388b91d305b8e..ff494f3afd3dfaed475c89313116a45f64ffb565 100644 +index 5815a614f2947660d05cb2ace3d05f916de2081a..8a99c821c0949a77c712fe541f50467f06e5030a 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn @@ -186,6 +186,8 @@ grit("generated_resources") { @@ -20,10 +20,10 @@ index 590c4edcededad77172ae30e85b388b91d305b8e..ff494f3afd3dfaed475c89313116a45f defines = chrome_grit_defines output_dir = "$root_gen_dir/chrome" outputs = [ -@@ -348,6 +350,7 @@ static_library("test_support") { +@@ -347,6 +349,7 @@ static_library("test_support") { + "//components/gwp_asan/buildflags", "//components/nacl/common:buildflags", "//components/startup_metric_utils/browser:lib", - "//components/tracing", + "//components/unified_consent", "//content/public/app:both", "//content/public/common", diff --git a/patches/chrome-app-chrome_dll.rc.patch b/patches/chrome-app-chrome_dll.rc.patch index 02b7b7e2370..2581bf123ad 100644 --- a/patches/chrome-app-chrome_dll.rc.patch +++ b/patches/chrome-app-chrome_dll.rc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc -index d994493407e6dc5c640dd16ce488818800c09d14..90846e8502e2cda2fd3a3bad4749f9977c501b12 100644 +index 80a15b55d54f55ca13d6d79b3fd75d28ae0d647f..a0aa8fa83a4e93f7689a0ece2e6dbf9d10a4c175 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -164,6 +164,16 @@ END diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index a375f48fc99..383b9b811f8 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 4f9844f6f8546efe591e679c41c7cd3b43c371a8..89006c99c02315f0c439dbf244d5ae3ce5cb7a0b 100644 +index da0ae26e7a725211367c78df2c6704d35f9a0e40..e9418f2de9062f179758ac32cab3d794cf192ffe 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2142,6 +2142,7 @@ jumbo_split_static_library("browser") { +@@ -2177,6 +2177,7 @@ jumbo_split_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 f40702e27e6..6ea3907f3e9 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 61bb2977bb7c9711465a6928b45f6a69be7f4080..c8f888c1423d2e53fc94bffc9db0ab51c86e0a4d 100644 +index 1672b7b09f38d06ea064b8dc21ea932b70775b01..636492d8f27d4435ac845bd8e02bc1555bccccec 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -254,14 +254,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -263,14 +263,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, diff --git a/patches/chrome-browser-autocomplete-autocomplete_classifier_factory.cc.patch b/patches/chrome-browser-autocomplete-autocomplete_classifier_factory.cc.patch index d7b0aaaf610..efb80285f29 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 e3159144a0b7892e5580bfa910f2db97a81179a9..8ee42d9f6f7ac50c78a03e59aa2ba34e35dae725 100644 +index 7f4dd5ffd15a0ea17fb77d712897a86370da4266..52d8469ae70f38e7a3c714f4761d4172915af138 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 a550a06d7d8..b58cc897751 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 95a7bd8e8b581c6addec8b33880b2c03040f713a..b7037dd80a29bbd64a8ed66d4d01e585df589eed 100644 +index 8029837119bde2f4767659c25148f5761b6796a8..b51c2c65a2285326cea0c9b58fd23293808ba4c5 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -206,6 +206,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -196,6 +196,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 fe7f0778bd9..3e6544d1453 100644 --- a/patches/chrome-browser-chrome_content_browser_client.h.patch +++ b/patches/chrome-browser-chrome_content_browser_client.h.patch @@ -1,9 +1,9 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h -index 499af0b670a1060f81c2b1dda8812865aac29670..b9d5d5f72fcd3a319472cb226ec83ca4b62f0180 100644 +index 975b61fc2e7738ac7ab1e1d6319ea3e1367468f0..40fbce0f527c05354a7fd1c9af2891a145452c22 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -637,6 +637,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { - content::BrowserContext* browser_context); +@@ -646,6 +646,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { + virtual const ui::NativeTheme* GetWebTheme() const; // For testing. private: + friend class BraveContentBrowserClient; diff --git a/patches/chrome-browser-content_settings-cookie_settings_factory.cc.patch b/patches/chrome-browser-content_settings-cookie_settings_factory.cc.patch index c7b6e61e173..35cfb3a16de 100644 --- a/patches/chrome-browser-content_settings-cookie_settings_factory.cc.patch +++ b/patches/chrome-browser-content_settings-cookie_settings_factory.cc.patch @@ -1,17 +1,17 @@ diff --git a/chrome/browser/content_settings/cookie_settings_factory.cc b/chrome/browser/content_settings/cookie_settings_factory.cc -index 2bdf232aa502d4e94febb5ee9d62132c699b946b..32de4d66f4787c5684b53b8e814e40dee3712f8a 100644 +index 147835d8d7ec46e05df8e0f9b7285b5119461f60..2c577417f9327a35f7f869049169e5f7d2153b22 100644 --- a/chrome/browser/content_settings/cookie_settings_factory.cc +++ b/chrome/browser/content_settings/cookie_settings_factory.cc @@ -6,6 +6,7 @@ #include "base/logging.h" - #include "base/metrics/histogram_macros.h" + #include "base/metrics/histogram_functions.h" +#include "brave/components/content_settings/core/browser/brave_cookie_settings.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" -@@ -68,7 +69,7 @@ CookieSettingsFactory::BuildServiceInstanceFor( - UMA_HISTOGRAM_BOOLEAN( +@@ -71,7 +72,7 @@ CookieSettingsFactory::BuildServiceInstanceFor( + base::UmaHistogramBoolean( "Privacy.DoNotTrackSetting", profile->GetPrefs()->GetBoolean(prefs::kEnableDoNotTrack)); - return new content_settings::CookieSettings( 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 9e5c3471484..b6dee9a46cf 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,8 +1,8 @@ diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc -index f521d5f7842bcd128772a9c8b57b464ffee312f5..1a9a1b0ebb01a0db607dd88e426166e176146c75 100644 +index 34fde937fea30840585b21c0623443f7dcb6c46a..50de09977491c7961ce3fc643f175d1e1e24a7f4 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc -@@ -283,6 +283,7 @@ bool TabSpecificContentSettings::IsContentBlocked( +@@ -253,6 +253,7 @@ bool TabSpecificContentSettings::IsContentBlocked( content_type == CONTENT_SETTINGS_TYPE_ADS || content_type == CONTENT_SETTINGS_TYPE_SOUND || content_type == CONTENT_SETTINGS_TYPE_CLIPBOARD_READ || @@ -10,7 +10,7 @@ index f521d5f7842bcd128772a9c8b57b464ffee312f5..1a9a1b0ebb01a0db607dd88e426166e1 content_type == CONTENT_SETTINGS_TYPE_SENSORS) { const auto& it = content_settings_status_.find(content_type); if (it != content_settings_status_.end()) -@@ -306,6 +307,7 @@ bool TabSpecificContentSettings::IsContentAllowed( +@@ -276,6 +277,7 @@ bool TabSpecificContentSettings::IsContentAllowed( content_type != CONTENT_SETTINGS_TYPE_PPAPI_BROKER && content_type != CONTENT_SETTINGS_TYPE_MIDI_SYSEX && content_type != CONTENT_SETTINGS_TYPE_CLIPBOARD_READ && diff --git a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch index 8faa4ced575..e2a2330a855 100644 --- a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch +++ b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h -index f832069419217412657c1279712f821e6c036132..50fb5a5f2a6a3f0c910341115839f0d64737ec4d 100644 +index cc7e57e6c2e06dded26fce90dc22953c9785aae5..c535e148ea824e45506d37932e33ecc026e08d26 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, diff --git a/patches/chrome-browser-extensions-chrome_extensions_browser_client.cc.patch b/patches/chrome-browser-extensions-chrome_extensions_browser_client.cc.patch index 88d0c483ce1..f66e57e82f0 100644 --- a/patches/chrome-browser-extensions-chrome_extensions_browser_client.cc.patch +++ b/patches/chrome-browser-extensions-chrome_extensions_browser_client.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc -index 87a8ac4f1635d0f11067da7644987a2cff16aa06..4fc1deebd4ad047fa9f00efbd2d5490041b5d32e 100644 +index 37972b557b457ffd69215caf8d2616432fe7a3da..9be4fa73fe51417bc5e8ed88517089a6d6f6592c 100644 --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc @@ -9,6 +9,8 @@ @@ -11,7 +11,7 @@ index 87a8ac4f1635d0f11067da7644987a2cff16aa06..4fc1deebd4ad047fa9f00efbd2d54900 #include "build/build_config.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/browser_process.h" -@@ -91,11 +93,12 @@ bool ExtensionsDisabled(const base::CommandLine& command_line) { +@@ -92,11 +94,12 @@ bool ExtensionsDisabled(const base::CommandLine& command_line) { ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() { AddAPIProvider(std::make_unique()); AddAPIProvider(std::make_unique()); diff --git a/patches/chrome-browser-extensions-component_loader.h.patch b/patches/chrome-browser-extensions-component_loader.h.patch index 735baec7f9f..a78db28885c 100644 --- a/patches/chrome-browser-extensions-component_loader.h.patch +++ b/patches/chrome-browser-extensions-component_loader.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h -index 3f8b640092721536276e478549d8ad5940fe4964..5d7f0ba46efdf2871f333f0010e8e51ad20e6163 100644 +index 77b0a1e8952ece2cd9bb7ea511d7b90b8f8c9abf..d2585bfa2279b5c6e31110e548a0174a9981e892 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h -@@ -84,7 +84,7 @@ class ComponentLoader { +@@ -81,7 +81,7 @@ class ComponentLoader { // the loader will skip loading component extensions that weren't supposed to // be loaded unless we are in signed user session (ChromeOS). For all other // platforms this |skip_session_components| is expected to be unset. @@ -11,7 +11,7 @@ index 3f8b640092721536276e478549d8ad5940fe4964..5d7f0ba46efdf2871f333f0010e8e51a // Similar to above but adds the default component extensions for kiosk mode. void AddDefaultComponentExtensionsForKioskMode(bool skip_session_components); -@@ -119,6 +119,7 @@ class ComponentLoader { +@@ -120,6 +120,7 @@ class ComponentLoader { } private: @@ -19,7 +19,7 @@ index 3f8b640092721536276e478549d8ad5940fe4964..5d7f0ba46efdf2871f333f0010e8e51a FRIEND_TEST_ALL_PREFIXES(ComponentLoaderTest, ParseManifest); // Information about a registered component extension. -@@ -164,6 +165,7 @@ class ComponentLoader { +@@ -165,6 +166,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 1a3b9f05ac8..0d9f00fcce0 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 f1ed057b1277648c9aa2cb208f92236062f9ecd6..848481f4fef9f03f19ee744d5c77fffca79bee4e 100644 +index c84fc509e52a7abd829c3dc5c4f6b821e5c32fa9..386fdf4f001177d9a779a632568fe821cbfe94db 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -13,6 +13,7 @@ @@ -10,7 +10,7 @@ index f1ed057b1277648c9aa2cb208f92236062f9ecd6..848481f4fef9f03f19ee744d5c77fffc #include "chrome/browser/extensions/extension_install_prompt_show_params.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/permissions_updater.h" -@@ -512,7 +513,7 @@ void ExtensionInstallPrompt::ShowDialog( +@@ -509,7 +510,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_install_prompt.h.patch b/patches/chrome-browser-extensions-extension_install_prompt.h.patch index 314461cc7ca..754aebcb217 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 44c0b01772fd3e2a1c1670eb077553e972e05e60..ddbf41e0c2a85293fe03249b9810932e02aa2c2b 100644 +index dcea843a6d7190d4e9e30d6ecce28028f18fd783..6f30d828db13b9f38f184499089d420cdbea4d4b 100644 --- a/chrome/browser/extensions/extension_install_prompt.h +++ b/chrome/browser/extensions/extension_install_prompt.h @@ -87,7 +87,7 @@ class ExtensionInstallPrompt { diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 4a7bd83501d..05ab72e7987 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 ab6c99a40a84961a61eea241a9dd346f8174eb48..dcdf09c4a5748032716fbc70bad7d12a15c7c566 100644 +index 0c051349bd1a862372dc975923e7fe5cc2129233..8bc5c167f712986694063d26c0dbd5cb5f7386e6 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc @@ -16,6 +16,7 @@ @@ -10,7 +10,7 @@ index ab6c99a40a84961a61eea241a9dd346f8174eb48..dcdf09c4a5748032716fbc70bad7d12a #include "chrome/browser/extensions/extension_management_constants.h" #include "chrome/browser/extensions/extension_management_internal.h" #include "chrome/browser/extensions/external_policy_loader.h" -@@ -626,7 +627,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( +@@ -625,7 +626,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); 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 5b53f95cd84..02616f6c5c8 100644 --- a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch +++ b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc -index a3f16ad264fd2238a1b33685bfdea4d60a091a17..1848f745ea5413beab4fe2a5504ecd572cc2874c 100644 +index 2fa76ce8dd1b1fe2d678c116aa22d3e14f7e7038..45b199048a10f6127a375d7874d3aabd5224924b 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc -@@ -186,7 +186,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( +@@ -224,7 +224,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( // Always allow the hard-coded allowed schemes. for (size_t i = 0; i < base::size(kAllowedSchemes); ++i) { if (kAllowedSchemes[i] == scheme) diff --git a/patches/chrome-browser-importer-external_process_importer_client.cc.patch b/patches/chrome-browser-importer-external_process_importer_client.cc.patch index ce5f8940561..2bedb5eaee0 100644 --- a/patches/chrome-browser-importer-external_process_importer_client.cc.patch +++ b/patches/chrome-browser-importer-external_process_importer_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/importer/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc -index 7320911bb2c1e848eafe487f9b376df2177521e8..6e7278eb8fd6fc9fd2ad339192e4eb7cf7ba3964 100644 +index d6f6de319f3662dbd1d0b4bf469c8325aea127a9..dd7e12127a6339e1eff0da8307464eb0c256d615 100644 --- a/chrome/browser/importer/external_process_importer_client.cc +++ b/chrome/browser/importer/external_process_importer_client.cc -@@ -69,6 +69,12 @@ void ExternalProcessImporterClient::Start() { +@@ -67,6 +67,12 @@ void ExternalProcessImporterClient::Start() { localized_strings.try_emplace( IDS_BOOKMARK_BAR_FOLDER_NAME, l10n_util::GetStringUTF8(IDS_BOOKMARK_BAR_FOLDER_NAME)); diff --git a/patches/chrome-browser-importer-external_process_importer_host.h.patch b/patches/chrome-browser-importer-external_process_importer_host.h.patch index 970610fed25..ef79ef5a5e4 100644 --- a/patches/chrome-browser-importer-external_process_importer_host.h.patch +++ b/patches/chrome-browser-importer-external_process_importer_host.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/importer/external_process_importer_host.h b/chrome/browser/importer/external_process_importer_host.h -index 08c6f28746cc5f345114a942834db18f5c7a1d41..9b4ba999a26fb5600fce29eed80ad6f974e0a265 100644 +index f8bd5d50910b2a068b964a8377233bf5a25fe618..1af30b9cfc4aa7924864603ee0b10e995fb77ea7 100644 --- a/chrome/browser/importer/external_process_importer_host.h +++ b/chrome/browser/importer/external_process_importer_host.h @@ -72,10 +72,13 @@ class ExternalProcessImporterHost diff --git a/patches/chrome-browser-importer-importer_list.cc.patch b/patches/chrome-browser-importer-importer_list.cc.patch index db235f94664..8ccbcc00e61 100644 --- a/patches/chrome-browser-importer-importer_list.cc.patch +++ b/patches/chrome-browser-importer-importer_list.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc -index 71659dd4133d71a90276f364ca685e78533b8979..f33c4354a6e5f7d69ca347e737e272494d1b036e 100644 +index 57c0506feeb1318ed0ed77b47ffce4babfe0b8e1..bc7c6e04098780d12c9c55d676f587ea5b7e8937 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc @@ -29,6 +29,9 @@ diff --git a/patches/chrome-browser-io_thread.cc.patch b/patches/chrome-browser-io_thread.cc.patch deleted file mode 100644 index 26696070a93..00000000000 --- a/patches/chrome-browser-io_thread.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc -index 25cb1333363e32f3afe13239b40159dd3444e834..b6e8725370c9bc040b9f4b1ca3e5b61a7351144a 100644 ---- a/chrome/browser/io_thread.cc -+++ b/chrome/browser/io_thread.cc -@@ -237,6 +237,7 @@ net::URLRequestContextGetter* IOThread::system_url_request_context_getter() { - system_url_request_context_getter_ = - base::MakeRefCounted(this); - } else { -+ if (base::FeatureList::IsEnabled(network::features::kNetworkService)) - NOTREACHED(); - } - return system_url_request_context_getter_.get(); diff --git a/patches/chrome-browser-net-chrome_network_delegate.h.patch b/patches/chrome-browser-net-chrome_network_delegate.h.patch index ac229748afa..276e7aace49 100644 --- a/patches/chrome-browser-net-chrome_network_delegate.h.patch +++ b/patches/chrome-browser-net-chrome_network_delegate.h.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h -index 5286e342dec6199c2336622dc0f67eb11427300a..f29a144ad4e1311c3ebc38cfe1297c9113985bfe 100644 +index 12c8c497b87ba62f15e0737286467b9a492ae376..05f86e333337f795af8bc62af7c792ea0144c79b 100644 --- a/chrome/browser/net/chrome_network_delegate.h +++ b/chrome/browser/net/chrome_network_delegate.h -@@ -97,6 +97,7 @@ class ChromeNetworkDelegate : public net::NetworkDelegateImpl { +@@ -27,6 +27,7 @@ class ChromeNetworkDelegate { + // with false brings back the original (production) behaviors. static void EnableAccessToAllFilesForTesting(bool enabled); - private: + friend class BraveNetworkDelegateBase; - // NetworkDelegate implementation. - int OnBeforeURLRequest(net::URLRequest* request, - net::CompletionOnceCallback callback, + DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate); + }; + diff --git a/patches/chrome-browser-net-chrome_url_request_context_getter.cc.patch b/patches/chrome-browser-net-chrome_url_request_context_getter.cc.patch deleted file mode 100644 index 6c6f0502836..00000000000 --- a/patches/chrome-browser-net-chrome_url_request_context_getter.cc.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/chrome/browser/net/chrome_url_request_context_getter.cc b/chrome/browser/net/chrome_url_request_context_getter.cc -index a931ece03ee26647686419328b9884c2726468db..90d78c0576a8f8df12649ed6dd1a34c48caa4104 100644 ---- a/chrome/browser/net/chrome_url_request_context_getter.cc -+++ b/chrome/browser/net/chrome_url_request_context_getter.cc -@@ -5,7 +5,7 @@ - #include "chrome/browser/net/chrome_url_request_context_getter.h" - - #include -- -+#include "brave/components/brave_shields/browser/adblock_interceptor.h" - #include "base/bind.h" - #include "base/compiler_specific.h" - #include "base/macros.h" -@@ -50,6 +50,7 @@ class FactoryForMain : public ChromeURLRequestContextFactory { - : profile_io_data_(profile_io_data), - request_interceptors_(std::move(request_interceptors)) { - std::swap(protocol_handlers_, *protocol_handlers); -+ request_interceptors_.emplace_back(new brave_shields::AdBlockInterceptor); - } - - net::URLRequestContext* Create() override { -@@ -84,6 +85,7 @@ class FactoryForIsolatedApp : public ChromeURLRequestContextFactory { - network_context_request_(std::move(network_context_request)), - network_context_params_(std::move(network_context_params)) { - std::swap(protocol_handlers_, *protocol_handlers); -+ request_interceptors_.emplace_back(new brave_shields::AdBlockInterceptor); - } - - net::URLRequestContext* Create() override { diff --git a/patches/chrome-browser-net-net_error_tab_helper.cc.patch b/patches/chrome-browser-net-net_error_tab_helper.cc.patch index 71b8de4f9c5..a595064ee59 100644 --- a/patches/chrome-browser-net-net_error_tab_helper.cc.patch +++ b/patches/chrome-browser-net-net_error_tab_helper.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc -index d39876436dd64faa0bae445c3e0ad1c666dbae17..88eb4e98bdb5a040e26c72f7c5eed9de8ef8bcc8 100644 +index f2dd356b43f396991446ab3a59067e8a44048014..c74fea87daf5b42be11275ee259ae01dfbb773b7 100644 --- a/chrome/browser/net/net_error_tab_helper.cc +++ b/chrome/browser/net/net_error_tab_helper.cc -@@ -234,6 +234,9 @@ void NetErrorTabHelper::InitializePref(WebContents* contents) { +@@ -233,6 +233,9 @@ void NetErrorTabHelper::InitializePref(WebContents* contents) { } bool NetErrorTabHelper::ProbesAllowed() const { diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch b/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch index 229365dace4..1a6c48cf89f 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_linux.cc b/chrome/browser/notifications/notification_platform_bridge_linux.cc -index aa6d15f6ebbdcc6e70374a46ca9c11d4c1bff854..5c2bdec672a402edbc3602887fdad9e3cc0056a8 100644 +index 04a4ac46f01173b3a8bdb4ebab1eeea03cfd6c1b..a2a0e8a90a2a564611ffc6e8f8240a63cf597fe6 100644 --- a/chrome/browser/notifications/notification_platform_bridge_linux.cc +++ b/chrome/browser/notifications/notification_platform_bridge_linux.cc -@@ -632,6 +632,7 @@ class NotificationPlatformBridgeLinuxImpl +@@ -648,6 +648,7 @@ class NotificationPlatformBridgeLinuxImpl actions.push_back("Activate"); // Always add a settings button for web notifications. if (notification_type != NotificationHandler::Type::EXTENSION && diff --git a/patches/chrome-browser-permissions-permission_manager.cc.patch b/patches/chrome-browser-permissions-permission_manager.cc.patch index 20dddb1432a..4d4e07cb450 100644 --- a/patches/chrome-browser-permissions-permission_manager.cc.patch +++ b/patches/chrome-browser-permissions-permission_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc -index 3f612a3cf55ce07de9aa5aa29e94e2338377f90a..6f329e24de35557510651069a903853f34fbce42 100644 +index 9f535334da7e3ca1939e98a055ec93662a38b552..81f81e6d2b3dc359d262440dbd20cf995ba88c46 100644 --- a/chrome/browser/permissions/permission_manager.cc +++ b/chrome/browser/permissions/permission_manager.cc -@@ -88,7 +88,7 @@ PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) { +@@ -89,7 +89,7 @@ PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) { } // Helper method to convert PermissionType to ContentSettingType. @@ -11,9 +11,9 @@ index 3f612a3cf55ce07de9aa5aa29e94e2338377f90a..6f329e24de35557510651069a903853f switch (permission) { case PermissionType::MIDI: return CONTENT_SETTINGS_TYPE_MIDI; -@@ -132,6 +132,7 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) { - case PermissionType::PERIODIC_BACKGROUND_SYNC: - return CONTENT_SETTINGS_TYPE_PERIODIC_BACKGROUND_SYNC; +@@ -137,6 +137,7 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) { + case PermissionType::WAKE_LOCK_SYSTEM: + return CONTENT_SETTINGS_TYPE_WAKE_LOCK_SYSTEM; case PermissionType::NUM: + default: // This will hit the NOTREACHED below. diff --git a/patches/chrome-browser-permissions-permission_request.h.patch b/patches/chrome-browser-permissions-permission_request.h.patch index 62b46e3b140..81c655ef7f0 100644 --- a/patches/chrome-browser-permissions-permission_request.h.patch +++ b/patches/chrome-browser-permissions-permission_request.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/permissions/permission_request.h b/chrome/browser/permissions/permission_request.h -index 6daa247ce558241db33a1d1ae0187f14631cc842..dcbfa42bd87013619a7a54a2597487e479338ce3 100644 +index 6daa247ce558241db33a1d1ae0187f14631cc842..1bd4ae483d9803262a61fc7e6196848aa814ec54 100644 --- a/chrome/browser/permissions/permission_request.h +++ b/chrome/browser/permissions/permission_request.h @@ -45,6 +45,7 @@ enum class PermissionRequestType { diff --git a/patches/chrome-browser-permissions-permission_uma_util.cc.patch b/patches/chrome-browser-permissions-permission_uma_util.cc.patch index 625c907ed17..18bebf0040b 100644 --- a/patches/chrome-browser-permissions-permission_uma_util.cc.patch +++ b/patches/chrome-browser-permissions-permission_uma_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/permissions/permission_uma_util.cc b/chrome/browser/permissions/permission_uma_util.cc -index 97ae8e1ee0339d5714d3baef177a1e27ce219583..431c5256251904e83ed7c7a7245a39b4eef4f1db 100644 +index 50768c0a91bb5f29760e398ed9c6486a06334b49..18c8118777376ddd24e88ad38576be092e214ba0 100644 --- a/chrome/browser/permissions/permission_uma_util.cc +++ b/chrome/browser/permissions/permission_uma_util.cc @@ -65,7 +65,7 @@ namespace { diff --git a/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch b/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch index ca20e66cb67..02357bf63c9 100644 --- a/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch +++ b/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc -index 5c2a2d0adf1ca353d4ab8dd23475c9d6e6df3b55..dc8f62521ba5c78fcee7e79d028ee8ddc8964e7f 100644 +index 55801ac0fee766a5f46314137d4745ff8a1d7f24..9acdabbe23d440d7468cbc9ef3b1e589f74db12c 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.cc +++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc -@@ -52,7 +52,7 @@ class ProfileContentSettingObserver : public content_settings::Observer { +@@ -51,7 +51,7 @@ class ProfileContentSettingObserver : public content_settings::Observer { PluginService::GetInstance()->PurgePluginListCache(profile_, false); const GURL primary(primary_pattern.ToString()); diff --git a/patches/chrome-browser-plugins-plugins_resource_service.cc.patch b/patches/chrome-browser-plugins-plugins_resource_service.cc.patch index 407468e5925..3447f9bbea8 100644 --- a/patches/chrome-browser-plugins-plugins_resource_service.cc.patch +++ b/patches/chrome-browser-plugins-plugins_resource_service.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc -index d7c3801df3e8766b2124b4c73ec3a46631aa5d3b..d6d391d47a4b4540f4177034da6ee475100c78b0 100644 +index 85003dd6cb04d27820e182c75fd76169b269a7e1..f3facf8c650cda32fa59bca6735c897f1aede5ca 100644 --- a/chrome/browser/plugins/plugins_resource_service.cc +++ b/chrome/browser/plugins/plugins_resource_service.cc @@ -55,7 +55,7 @@ const int kStartResourceFetchDelayMs = 60 * 1000; diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 976faa7adf7..91f2984288e 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 50312cdb0324e3dad18c77c96e5e609bfb259541..ed0ab71e9e08494abb5016bcb4e1fce6f852ea24 100644 +index 5f8892f1797129b37691967ea55a219612ab10f2..1daed1517db2832f05491303c625a6cdd95590b8 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -658,6 +658,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -679,6 +679,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index 42edd12f399..92b1243ba5d 100644 --- a/patches/chrome-browser-profiles-profile.cc.patch +++ b/patches/chrome-browser-profiles-profile.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index 71d736c9eaf3503e532d72c410f4d4dadff372cd..f278991246e40b894418cd05f9a5fb6fb192c5a5 100644 +index 28d3c597acc9e58bab439badb1d1dc9baa139048..4e4a3742f9133dcba49a2ec68a1181a345c5f63b 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -140,7 +140,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; @@ -11,7 +11,7 @@ index 71d736c9eaf3503e532d72c410f4d4dadff372cd..f278991246e40b894418cd05f9a5fb6f user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); #if defined(OS_ANDROID) registry->RegisterStringPref( -@@ -244,7 +244,7 @@ bool Profile::IsGuestSession() const { +@@ -257,7 +257,7 @@ bool Profile::IsGuestSession() const { chromeos::switches::kGuestSession); return is_guest_session; #else diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index e04ed4a31c7..3f908f8e0c2 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index 71619ca3d5271b0f813110dce0e5570b6eebdda7..a9c1f8ec99aafa581c7fc8261e470261323c6492 100644 +index 37b90f5d5676f3e332f397d56363d40a635d5a66..8c460ceaf4527ee5c05057c5e4b020ff6667ac20 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -34,6 +34,7 @@ @@ -10,7 +10,7 @@ index 71619ca3d5271b0f813110dce0e5570b6eebdda7..a9c1f8ec99aafa581c7fc8261e470261 #include "build/build_config.h" #include "chrome/browser/background/background_contents_service_factory.h" #include "chrome/browser/background_fetch/background_fetch_delegate_factory.h" -@@ -508,6 +509,9 @@ ProfileImpl::ProfileImpl( +@@ -507,6 +508,9 @@ ProfileImpl::ProfileImpl( LoadPrefsForNormalStartup(async_prefs); #endif diff --git a/patches/chrome-browser-profiles-profile_io_data.cc.patch b/patches/chrome-browser-profiles-profile_io_data.cc.patch index 87495c2e791..c687baa0c88 100644 --- a/patches/chrome-browser-profiles-profile_io_data.cc.patch +++ b/patches/chrome-browser-profiles-profile_io_data.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc -index a77de6f1abed2133190908db2fe3e417b05bc4f0..e67fcb11518b4d644425fe4275dd7aebb39e68a4 100644 +index 285f9e09a9020e8647fe363f7d3b0c867b1d26ea..55d7b1a32589936789a8ef7206e179ae756e2c2e 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -24,6 +24,7 @@ @@ -10,7 +10,7 @@ index a77de6f1abed2133190908db2fe3e417b05bc4f0..e67fcb11518b4d644425fe4275dd7aeb #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" -@@ -639,6 +640,9 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { +@@ -417,6 +418,9 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { extensions::kExtensionScheme, #endif content::kChromeUIScheme, @@ -20,12 +20,3 @@ index a77de6f1abed2133190908db2fe3e417b05bc4f0..e67fcb11518b4d644425fe4275dd7aeb url::kDataScheme, #if defined(OS_CHROMEOS) content::kExternalFileScheme, -@@ -925,7 +929,7 @@ void ProfileIOData::Init( - std::make_unique(); - - std::unique_ptr chrome_network_delegate( -- new ChromeNetworkDelegate( -+ new BraveProfileNetworkDelegate( - #if BUILDFLAG(ENABLE_EXTENSIONS) - io_thread_globals->extension_event_router_forwarder.get())); - #else diff --git a/patches/chrome-browser-profiles-profile_manager.cc.patch b/patches/chrome-browser-profiles-profile_manager.cc.patch index 00d573f9369..c60c9299509 100644 --- a/patches/chrome-browser-profiles-profile_manager.cc.patch +++ b/patches/chrome-browser-profiles-profile_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc -index 4cce9ca9fbf1ded2c4b8334f8ff9be0d43e97803..7b39473be45be8530eb91c1389c96aa65625a7d1 100644 +index 8d1ed7b997cb17c90d3152090d37634bc34997bd..eb801040064374f92586fbce09700be659defc60 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1503,9 +1503,11 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( +@@ -1418,9 +1418,11 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( const base::FilePath last_used_profile_path = GetLastUsedProfileDir(user_data_dir_); const base::FilePath guest_profile_path = GetGuestProfilePath(); @@ -14,7 +14,7 @@ index 4cce9ca9fbf1ded2c4b8334f8ff9be0d43e97803..7b39473be45be8530eb91c1389c96aa6 last_used_profile != nullptr && !last_used_profile->IsLegacySupervised()) { FinishDeletingProfile(profile_dir, last_used_profile_path); -@@ -1518,6 +1520,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( +@@ -1433,6 +1435,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( base::FilePath cur_path = profile->GetPath(); if (cur_path != profile_dir && cur_path != guest_profile_path && @@ -22,7 +22,7 @@ index 4cce9ca9fbf1ded2c4b8334f8ff9be0d43e97803..7b39473be45be8530eb91c1389c96aa6 !profile->IsLegacySupervised() && !IsProfileDirectoryMarkedForDeletion(cur_path)) { OnNewActiveProfileLoaded(profile_dir, cur_path, std::move(callback), -@@ -1537,6 +1540,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( +@@ -1452,6 +1455,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( // legacy-supervised. if (cur_path != profile_dir && cur_path != guest_profile_path && @@ -30,7 +30,7 @@ index 4cce9ca9fbf1ded2c4b8334f8ff9be0d43e97803..7b39473be45be8530eb91c1389c96aa6 !entry->IsLegacySupervised() && !IsProfileDirectoryMarkedForDeletion(cur_path)) { fallback_profile_path = cur_path; -@@ -1894,6 +1898,7 @@ void ProfileManager::ScheduleForcedEphemeralProfileForDeletion( +@@ -1867,6 +1871,7 @@ void ProfileManager::ScheduleForcedEphemeralProfileForDeletion( base::FilePath entry_path = entry->GetPath(); if (entry_path == profile_dir || entry_path == GetGuestProfilePath() || diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch index a2f14a3ab8c..fa4a11cd6c5 100644 --- a/patches/chrome-browser-profiles-profile_manager.h.patch +++ b/patches/chrome-browser-profiles-profile_manager.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h -index 257e27caed9f6ef1dc984d5cdbae82c3d0daa427..ab13240fbb230326ecd102fa8f60aa5eb17bc4ff 100644 +index 985c64458bdf2c547a5b9286b448aaa2513b2109..a677df807effba3589b6a067ffc940432b064839 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h -@@ -139,7 +139,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -141,7 +141,7 @@ class ProfileManager : public content::NotificationObserver, // Get the name of the last used profile, or if that's undefined, the default // profile. @@ -11,7 +11,7 @@ index 257e27caed9f6ef1dc984d5cdbae82c3d0daa427..ab13240fbb230326ecd102fa8f60aa5e // 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 -@@ -220,7 +220,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -222,7 +222,7 @@ class ProfileManager : public content::NotificationObserver, // Initializes user prefs of |profile|. This includes profile name and // avatar values. @@ -20,12 +20,12 @@ index 257e27caed9f6ef1dc984d5cdbae82c3d0daa427..ab13240fbb230326ecd102fa8f60aa5e // Register and add testing profile to the ProfileManager. Use ONLY in tests. // This allows the creation of Profiles outside of the standard creation path -@@ -346,7 +346,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -349,7 +349,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); - // For ChromeOS, determines if profile should be otr. + // Determines if profile should be OTR. bool ShouldGoOffTheRecord(Profile* profile); diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 2abc88ae0b7..08550316bb1 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 630436fb7b4ed95909bdc7c80da85b8ff524cd81..e4837ee01f811e74f0cca2353dea3826eff85f4a 100644 +index 99539e2b50fe22275d8b106a1e7319eda8d88beb..9125bee587d5a05bd93ad80c9d141680597a0afc 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1163,6 +1163,7 @@ void RenderViewContextMenu::AppendLinkItems() { +@@ -1169,6 +1169,7 @@ void RenderViewContextMenu::AppendLinkItems() { : IDS_CONTENT_CONTEXT_OPENLINKOFFTHERECORD); AppendOpenInBookmarkAppLinkItems(); 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 6c5577cb244..c6b9f6e9a73 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 824741727052dfd87f8f65df8bbb5adf4a9f1e2e..ea5b8370d907d7d991ae67d4f66f33d5ec4ef7c2 100644 +index 49728ebc43f14f2674dd700114f80dcbc3a2b174..7270522b3e6dd3c71a77f0cd37506a0bee8be424 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -114,6 +114,8 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { +@@ -115,6 +115,8 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { // hold escape to exit exclusive access mode. bool IsPressAndHoldEscRequiredToExitFullscreen() const; diff --git a/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch b/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch index 39ff82df906..8b0bff57b51 100644 --- a/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch +++ b/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/bookmarks/bookmarks.html b/chrome/browser/resources/bookmarks/bookmarks.html -index b91e6202e695f7347963e1c0dbee0cea46622c62..47978779a4b4cf27b7715276fc068a6163d926df 100644 +index 077405e88cd2b5da78714c900d9d4e392981192e..0698a3fcee0f240fe9dc870292f2e4af7f4cd9d1 100644 --- a/chrome/browser/resources/bookmarks/bookmarks.html +++ b/chrome/browser/resources/bookmarks/bookmarks.html -@@ -28,6 +28,7 @@ +@@ -27,6 +27,7 @@ height: var(--md-toolbar-height); } diff --git a/patches/chrome-browser-resources-bookmarks-toolbar.html.patch b/patches/chrome-browser-resources-bookmarks-toolbar.html.patch index 520934e3907..c2a8715fe24 100644 --- a/patches/chrome-browser-resources-bookmarks-toolbar.html.patch +++ b/patches/chrome-browser-resources-bookmarks-toolbar.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/toolbar.html b/chrome/browser/resources/bookmarks/toolbar.html -index 989db07d3c1f7a2ca97044590b04b02ebd86cb1a..cc5bb8387bd51505e7ea39fb4372a7a17b7d5594 100644 +index d008a5ae9a74c9c97d61dd3ec9540baa226d75b2..c430495b1a9501c3730a3a499663b202968c88f1 100644 --- a/chrome/browser/resources/bookmarks/toolbar.html +++ b/chrome/browser/resources/bookmarks/toolbar.html @@ -1,7 +1,7 @@ diff --git a/patches/chrome-browser-resources-downloads-downloads.html.patch b/patches/chrome-browser-resources-downloads-downloads.html.patch index bcbcf36b97d..ab14a6e1ede 100644 --- a/patches/chrome-browser-resources-downloads-downloads.html.patch +++ b/patches/chrome-browser-resources-downloads-downloads.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/downloads/downloads.html b/chrome/browser/resources/downloads/downloads.html -index 05a625d0f349264f13bd98fff32984db56aadd2c..1ad650ef5011f79ebf6591ade055338a51a791d1 100644 +index ad88272334d24e2f60327ae30ab1d412a42a6351..43b6993c81b82d814f900d9d06baf6082ba0dd98 100644 --- a/chrome/browser/resources/downloads/downloads.html +++ b/chrome/browser/resources/downloads/downloads.html -@@ -8,6 +8,7 @@ +@@ -7,6 +7,7 @@ $i18n{title} diff --git a/patches/chrome-browser-resources-downloads-manager.html.patch b/patches/chrome-browser-resources-downloads-manager.html.patch index 1a648da2119..f337da16a1d 100644 --- a/patches/chrome-browser-resources-downloads-manager.html.patch +++ b/patches/chrome-browser-resources-downloads-manager.html.patch @@ -1,13 +1,13 @@ diff --git a/chrome/browser/resources/downloads/manager.html b/chrome/browser/resources/downloads/manager.html -index 015710be621743fbc082460a4203b67d8d76372c..8cae2e6f282e558e087a3b60f0a9a84fe9bc1ba8 100644 +index 3415eceeeb53203260a6b9c1d20e96f38dd2c55e..f05a3eabcb4e3f3ba88678880de9eb101f505d70 100644 --- a/chrome/browser/resources/downloads/manager.html +++ b/chrome/browser/resources/downloads/manager.html -@@ -20,7 +20,7 @@ +@@ -22,7 +22,7 @@