diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index b0697393..e4000b76 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -4,11 +4,12 @@ Subject: Allow building without enable_reporting License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- + android_webview/browser/aw_contents.cc | 2 +- .../browser/devtools/protocol/network_handler.cc | 2 ++ .../net/cross_origin_embedder_policy_reporter.cc | 4 +++- .../net/cross_origin_opener_policy_reporter.cc | 16 +++++++--------- content/browser/net/reporting_service_proxy.cc | 3 +++ - .../renderer_host/render_frame_host_impl.cc | 2 ++ + .../renderer_host/render_frame_host_impl.cc | 14 ++++++++++++++ .../web_package/signed_exchange_reporter.cc | 2 ++ ...content_switch_dependent_feature_overrides.cc | 1 + net/reporting/reporting_service.cc | 6 ++++++ @@ -19,8 +20,20 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../blink/renderer/core/frame/local_frame.h | 6 +++--- .../renderer/core/frame/reporting_context.cc | 9 +++++++++ .../renderer/core/frame/reporting_context.h | 7 +++++-- - 15 files changed, 50 insertions(+), 18 deletions(-) + 16 files changed, 63 insertions(+), 19 deletions(-) +diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc +--- a/android_webview/browser/aw_contents.cc ++++ b/android_webview/browser/aw_contents.cc +@@ -339,7 +339,7 @@ void AwContents::InitAutofillIfNecessary(bool autocomplete_enabled) { + autofill_provider + ? base::BindRepeating(&autofill::AndroidDriverInitHook, + AwAutofillClient::FromWebContents(web_contents), +- enable_download_manager, /*enable_browser_autofill_manager*/ false) ++ enable_download_manager) + : base::BindRepeating(&autofill::BrowserDriverInitHook, + AwAutofillClient::FromWebContents(web_contents), + base::android::GetDefaultLocaleString()); diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc --- a/content/browser/devtools/protocol/network_handler.cc +++ b/content/browser/devtools/protocol/network_handler.cc @@ -183,10 +196,22 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b // `about:blank` navigation, because the values set at construction time // should remain unmodified. if (!navigation_request->IsWaitingToCommit()) { -@@ -11555,6 +11556,7 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -11555,6 +11556,19 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( /*type=*/"crash", /*group=*/"default", last_committed_url_, GetReportingSource(), isolation_info_.network_isolation_key(), absl::nullopt /* user_agent */, std::move(body)); ++#else ++} ++ ++void RenderFrameHostImpl::OnSameDocumentCommitProcessed( ++ const base::UnguessableToken& navigation_token, ++ bool should_replace_current_entry, ++ blink::mojom::CommitResult result) { ++} ++ ++void RenderFrameHostImpl::MaybeGenerateCrashReport( ++ base::TerminationStatus status, ++ int exit_code) { +#endif } diff --git a/build/patches/Disable-AGSA-by-default.patch b/build/patches/Disable-AGSA-by-default.patch index ece327a7..086e2949 100644 --- a/build/patches/Disable-AGSA-by-default.patch +++ b/build/patches/Disable-AGSA-by-default.patch @@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -363,7 +363,6 @@ android_library("chrome_java") { +@@ -364,7 +364,6 @@ android_library("chrome_java") { "//chrome/browser/first_run/android:java", "//chrome/browser/flags:java", "//chrome/browser/fullscreen/android:java", @@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/history_clusters:java", "//chrome/browser/history_clusters:java_resources", "//chrome/browser/image_descriptions:java", -@@ -973,7 +972,6 @@ junit_binary("chrome_junit_tests") { +@@ -974,7 +973,6 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/flags:flags_junit_tests", "//chrome/browser/flags:java", "//chrome/browser/fullscreen/android:java", @@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/history_clusters:java", "//chrome/browser/image_descriptions:java", "//chrome/browser/image_editor/public:java", -@@ -1366,7 +1364,6 @@ android_library("chrome_test_java") { +@@ -1367,7 +1365,6 @@ android_library("chrome_test_java") { "//chrome/browser/first_run/android:java", "//chrome/browser/flags:java", "//chrome/browser/fullscreen/android:java", diff --git a/build/patches/Disable-safety-check.patch b/build/patches/Disable-safety-check.patch index ecf51023..d896494c 100644 --- a/build/patches/Disable-safety-check.patch +++ b/build/patches/Disable-safety-check.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -400,7 +400,6 @@ android_library("chrome_java") { +@@ -401,7 +401,6 @@ android_library("chrome_java") { "//chrome/browser/privacy_sandbox/android:java", "//chrome/browser/profiles/android:java", "//chrome/browser/safe_browsing/android:java", @@ -22,7 +22,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/search_engines/android:java", "//chrome/browser/segmentation_platform:factory_java", "//chrome/browser/selection/android:java", -@@ -1002,8 +1001,6 @@ junit_binary("chrome_junit_tests") { +@@ -1003,8 +1002,6 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/preferences:java", "//chrome/browser/preferences:preferences_junit_tests", "//chrome/browser/profiles/android:java", @@ -31,7 +31,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/search_engines/android:java", "//chrome/browser/share:java", "//chrome/browser/tab:java", -@@ -1407,8 +1404,6 @@ android_library("chrome_test_java") { +@@ -1408,8 +1405,6 @@ android_library("chrome_test_java") { "//chrome/browser/profiles/android:java", "//chrome/browser/safe_browsing/android:java", "//chrome/browser/safe_browsing/android:javatests", diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index 3f59ec44..e292351c 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -241,7 +241,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn } if (enable_vr) { -@@ -554,6 +558,7 @@ android_library("chrome_java") { +@@ -555,6 +559,7 @@ android_library("chrome_java") { "//components/ukm/android:java", "//components/url_formatter/android:url_formatter_java", "//components/user_prefs/android:java", diff --git a/build/patches/Remove-price-shopping-commerce-integrations.patch b/build/patches/Remove-price-shopping-commerce-integrations.patch index 54b9ab5b..67217bed 100644 --- a/build/patches/Remove-price-shopping-commerce-integrations.patch +++ b/build/patches/Remove-price-shopping-commerce-integrations.patch @@ -4,7 +4,7 @@ Subject: Remove price/shopping/commerce integrations License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/android/BUILD.gn | 20 --- + chrome/android/BUILD.gn | 21 +-- chrome/android/chrome_java_sources.gni | 4 - chrome/android/features/tab_ui/BUILD.gn | 5 - .../tab_management/LargeMessageCardView.java | 30 ---- @@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chrome/browser/ui/RootUiCoordinator.java | 14 -- chrome/android/java_sources.gni | 8 - chrome/browser/persisted_state_db/BUILD.gn | 1 - - 29 files changed, 17 insertions(+), 781 deletions(-) + 29 files changed, 18 insertions(+), 781 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -49,16 +49,17 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn import("//chrome/browser/password_manager/buildflags.gni") import("//chrome/browser/share/android/java_sources.gni") import("//chrome/chrome_paks.gni") -@@ -350,8 +346,6 @@ android_library("chrome_java") { +@@ -350,8 +346,7 @@ android_library("chrome_java") { "//chrome/browser/browser_controls/android:java", "//chrome/browser/commerce/android:java", "//chrome/browser/commerce/merchant_viewer/android:java", - "//chrome/browser/commerce/price_tracking/proto:proto_java", - "//chrome/browser/commerce/shopping_list/android:java", ++ "//chrome/browser/commerce/price_tracking/android:jni_headers", "//chrome/browser/consent_auditor/android:java", "//chrome/browser/contextmenu:java", "//chrome/browser/continuous_search:java", -@@ -728,15 +722,6 @@ android_library("chrome_java") { +@@ -728,15 +723,6 @@ android_library("chrome_java") { sources += share_java_sources deps += share_java_deps @@ -74,7 +75,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn if (enable_basic_printing) { deps += [ "//printing:printing_java" ] } -@@ -817,8 +802,6 @@ group("jni_headers") { +@@ -817,8 +803,6 @@ group("jni_headers") { "//chrome/browser/android/browserservices/metrics:jni_headers", "//chrome/browser/android/browserservices/verification:jni_headers", "//chrome/browser/commerce/merchant_viewer/android:jni_headers", @@ -83,7 +84,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/contextmenu:jni_headers", "//chrome/browser/download/android:jni_headers", "//chrome/browser/enterprise/util:jni_headers", -@@ -970,7 +953,6 @@ junit_binary("chrome_junit_tests") { +@@ -970,7 +954,6 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/browser_controls/android:java", "//chrome/browser/browser_controls/android:junit", "//chrome/browser/commerce/merchant_viewer/android:junit", @@ -91,7 +92,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/contextmenu:java", "//chrome/browser/continuous_search:junit", "//chrome/browser/continuous_search/internal:junit", -@@ -1654,8 +1636,6 @@ android_library("chrome_test_java") { +@@ -1654,8 +1637,6 @@ android_library("chrome_test_java") { deps += feed_test_deps diff --git a/build/patches/Remove-signin-and-sync-integrations.patch b/build/patches/Remove-signin-and-sync-integrations.patch index 5ed58c01..cd69b0a5 100644 --- a/build/patches/Remove-signin-and-sync-integrations.patch +++ b/build/patches/Remove-signin-and-sync-integrations.patch @@ -84,6 +84,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../DevicePickerBottomSheetContent.java | 39 +--- .../SendTabToSelfCoordinator.java | 104 +-------- .../account_consistency_mode_manager.cc | 7 +- + .../signin/identity_manager_factory.cc | 5 - .../identity_services_provider_android.cc | 9 - .../services/IdentityServicesProvider.java | 14 -- chrome/browser/sync/sync_service_factory.cc | 12 +- @@ -105,7 +106,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../signin/SystemAccountManagerDelegate.java | 25 +-- .../net/HttpNegotiateAuthenticator.java | 88 +------- .../chromoting/base/OAuthTokenFetcher.java | 2 - - 86 files changed, 82 insertions(+), 2080 deletions(-) + 87 files changed, 82 insertions(+), 2085 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -3736,6 +3737,24 @@ diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/ - NOTREACHED(); return AccountConsistencyMethod::kDisabled; } +diff --git a/chrome/browser/signin/identity_manager_factory.cc b/chrome/browser/signin/identity_manager_factory.cc +--- a/chrome/browser/signin/identity_manager_factory.cc ++++ b/chrome/browser/signin/identity_manager_factory.cc +@@ -67,14 +67,9 @@ IdentityManagerFactory::IdentityManagerFactory() + DependsOn(ProfileAccountManagerFactory::GetInstance()); + #endif + DependsOn(ChromeSigninClientFactory::GetInstance()); +- signin::SetIdentityManagerProvider( +- base::BindRepeating([](content::BrowserContext* context) { +- return GetForProfile(Profile::FromBrowserContext(context)); +- })); + } + + IdentityManagerFactory::~IdentityManagerFactory() { +- signin::SetIdentityManagerProvider({}); + } + + // static diff --git a/chrome/browser/signin/identity_services_provider_android.cc b/chrome/browser/signin/identity_services_provider_android.cc --- a/chrome/browser/signin/identity_services_provider_android.cc +++ b/chrome/browser/signin/identity_services_provider_android.cc