From 90e29193cbb5728f327617701cb2026c86105f5c Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 26 Jun 2022 23:55:28 +0200 Subject: [PATCH] Remove more signin-related integrations --- build/patches/Disable-safety-check.patch | 2 +- .../Experimental-user-scripts-support.patch | 2 +- .../Remove-binary-blob-integrations.patch | 2 +- ...price-shopping-commerce-integrations.patch | 2 +- .../Remove-signin-and-sync-integrations.patch | 315 ++++++++++++++++-- 5 files changed, 300 insertions(+), 23 deletions(-) diff --git a/build/patches/Disable-safety-check.patch b/build/patches/Disable-safety-check.patch index 13ecbb0a..1e6957fd 100644 --- a/build/patches/Disable-safety-check.patch +++ b/build/patches/Disable-safety-check.patch @@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3283,7 +3283,6 @@ static_library("browser") { +@@ -3281,7 +3281,6 @@ static_library("browser") { "//chrome/browser/privacy_sandbox/android:jni_headers", "//chrome/browser/reading_list/android", "//chrome/browser/safe_browsing/android:safe_browsing_enums", diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index 3fa2239f..3e4cd118 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -327,7 +327,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3424,6 +3424,11 @@ static_library("browser") { +@@ -3422,6 +3422,11 @@ static_library("browser") { ] deps += [ "//chrome/android/modules/dev_ui/provider:native" ] } diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch index b3127696..bb8e9db9 100644 --- a/build/patches/Remove-binary-blob-integrations.patch +++ b/build/patches/Remove-binary-blob-integrations.patch @@ -942,7 +942,7 @@ diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -6786,8 +6786,6 @@ static_library("browser") { +@@ -6784,8 +6784,6 @@ static_library("browser") { "offline_pages/offliner_helper.h", "offline_pages/offliner_user_data.cc", "offline_pages/offliner_user_data.h", diff --git a/build/patches/Remove-price-shopping-commerce-integrations.patch b/build/patches/Remove-price-shopping-commerce-integrations.patch index 291137be..e99d4072 100644 --- a/build/patches/Remove-price-shopping-commerce-integrations.patch +++ b/build/patches/Remove-price-shopping-commerce-integrations.patch @@ -1749,7 +1749,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3248,9 +3248,6 @@ static_library("browser") { +@@ -3246,9 +3246,6 @@ static_library("browser") { "//chrome/browser/commerce/merchant_viewer:merchant_signal_db_content_proto", "//chrome/browser/commerce/merchant_viewer:merchant_viewer_data_manager", "//chrome/browser/commerce/merchant_viewer/android:jni_headers", diff --git a/build/patches/Remove-signin-and-sync-integrations.patch b/build/patches/Remove-signin-and-sync-integrations.patch index 10363df9..9861e96c 100644 --- a/build/patches/Remove-signin-and-sync-integrations.patch +++ b/build/patches/Remove-signin-and-sync-integrations.patch @@ -74,7 +74,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../SharedClipboardShareActivity.java | 3 - .../tabbed_mode/TabbedRootUiCoordinator.java | 19 -- .../browser/tasks/ReturnToChromeUtil.java | 9 +- - chrome/browser/BUILD.gn | 150 ------------- + chrome/browser/BUILD.gn | 152 ------------- + .../consent_auditor/consent_auditor_bridge.cc | 21 -- .../chrome_autocomplete_provider_client.cc | 21 +- .../chrome_autocomplete_provider_client.h | 1 - .../document_suggestions_service_factory.cc | 6 +- @@ -84,6 +85,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chrome_browsing_data_lifetime_manager.cc | 6 +- .../counters/browsing_data_counter_utils.cc | 6 - chrome/browser/chrome_browser_field_trials.cc | 6 +- + .../browser/chrome_content_browser_client.cc | 9 - .../endpoint_fetcher/endpoint_fetcher.cc | 2 +- .../profile_report_generator_delegate_base.cc | 11 - ...tory_ui_favicon_request_handler_factory.cc | 1 - @@ -92,15 +94,19 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/browser/feed/feed_service_factory.cc | 6 +- .../browser/firstrun/MobileFreProgress.java | 4 +- .../gcm/gcm_profile_service_factory.cc | 4 +- + .../history/web_history_service_factory.cc | 16 +- .../profile_invalidation_provider_factory.cc | 48 +--- .../router/discovery/access_code/BUILD.gn | 1 - .../metrics/chrome_metrics_service_client.cc | 6 - .../browser/password_manager/android/BUILD.gn | 6 - .../PasswordManagerHelper.java | 94 +------- ...swordSyncControllerDelegateBridgeImpl.java | 7 - + .../bulk_leak_check_service_factory.cc | 4 +- .../chrome_password_manager_client.cc | 120 +--------- .../chrome_password_manager_client.h | 25 --- ...ssword_manager_settings_service_factory.cc | 6 - + .../password_reuse_manager_factory.cc | 39 +--- + .../password_manager/password_store_utils.cc | 15 +- chrome/browser/privacy/BUILD.gn | 2 - .../res/layout/privacy_review_msbb_step.xml | 8 - chrome/browser/profiles/profile_impl.cc | 15 +- @@ -129,7 +135,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 - - 110 files changed, 90 insertions(+), 2616 deletions(-) + 116 files changed, 97 insertions(+), 2715 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -3477,7 +3483,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToC diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1611,58 +1611,6 @@ static_library("browser") { +@@ -349,8 +349,6 @@ static_library("browser") { + "component_updater/trust_token_key_commitments_component_installer.h", + "component_updater/url_param_classification_component_installer.cc", + "component_updater/url_param_classification_component_installer.h", +- "consent_auditor/consent_auditor_factory.cc", +- "consent_auditor/consent_auditor_factory.h", + "content_index/content_index_metrics.cc", + "content_index/content_index_metrics.h", + "content_index/content_index_provider_factory.cc", +@@ -1611,58 +1609,6 @@ static_library("browser") { "sharing/web_push/web_push_sender.h", "shell_integration.cc", "shell_integration.h", @@ -3536,7 +3551,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "site_isolation/about_flags.h", "site_isolation/prefs_observer.cc", "site_isolation/prefs_observer.h", -@@ -1734,40 +1682,6 @@ static_library("browser") { +@@ -1734,40 +1680,6 @@ static_library("browser") { "subresource_filter/subresource_filter_history_observer.h", "subresource_filter/subresource_filter_profile_context_factory.cc", "subresource_filter/subresource_filter_profile_context_factory.h", @@ -3577,7 +3592,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "tab_contents/navigation_metrics_recorder.cc", "tab_contents/navigation_metrics_recorder.h", "tab_contents/tab_util.cc", -@@ -1993,7 +1907,6 @@ static_library("browser") { +@@ -1993,7 +1905,6 @@ static_library("browser") { "//chrome/browser/share", "//chrome/browser/sharing:buildflags", "//chrome/browser/sharing/proto", @@ -3585,7 +3600,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//chrome/browser/storage_access_api:permissions", "//chrome/browser/thumbnail", "//chrome/browser/touch_to_fill", -@@ -2265,10 +2178,6 @@ static_library("browser") { +@@ -2265,10 +2176,6 @@ static_library("browser") { "//components/services/unzip/public/mojom", "//components/sessions", "//components/shared_highlighting/core/common", @@ -3596,7 +3611,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/site_engagement/content", "//components/site_engagement/core/mojom:mojo_bindings", "//components/site_isolation", -@@ -2923,16 +2832,6 @@ static_library("browser") { +@@ -2923,16 +2830,6 @@ static_library("browser") { "android/service_tab_launcher.h", "android/shortcut_helper.cc", "android/shortcut_helper.h", @@ -3613,7 +3628,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/startup_bridge.cc", "android/startup_bridge.h", "android/survey/http_client_type.cc", -@@ -3201,16 +3100,10 @@ static_library("browser") { +@@ -3201,16 +3098,10 @@ static_library("browser") { "password_check/android/password_check_bridge.h", "password_check/android/password_check_manager.cc", "password_check/android/password_check_manager.h", @@ -3630,7 +3645,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "password_manager/android/credential_android.cc", "password_manager/android/credential_android.h", "password_manager/android/credential_leak_controller_android.cc", -@@ -3314,27 +3207,12 @@ static_library("browser") { +@@ -3314,27 +3205,12 @@ static_library("browser") { "sharing/sms/sms_fetch_request_handler.cc", "sharing/sms/sms_fetch_request_handler.h", "shell_integration_android.cc", @@ -3658,7 +3673,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "tab/web_contents_state.cc", "tab/web_contents_state.h", "touch_to_fill/touch_to_fill_controller.cc", -@@ -3411,8 +3289,6 @@ static_library("browser") { +@@ -3411,8 +3287,6 @@ static_library("browser") { "//chrome/browser/safety_check/android", "//chrome/browser/share/android:jni_headers", "//chrome/browser/share/core/crow:crow_configuration", @@ -3667,7 +3682,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//chrome/browser/tab:jni_headers", "//chrome/browser/ui/android/layouts:android", "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings", -@@ -3493,8 +3369,6 @@ static_library("browser") { +@@ -3493,8 +3367,6 @@ static_library("browser") { "//components/safe_browsing/core/browser/password_protection:password_protection_metrics_util", "//components/security_state/content/android", "//components/send_tab_to_self", @@ -3676,7 +3691,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/subresource_filter/android", "//components/thin_webview/internal", "//components/translate/content/android", -@@ -4270,12 +4144,6 @@ static_library("browser") { +@@ -4270,12 +4142,6 @@ static_library("browser") { "sharing_hub/sharing_hub_service.h", "sharing_hub/sharing_hub_service_factory.cc", "sharing_hub/sharing_hub_service_factory.h", @@ -3689,7 +3704,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "speech/chrome_speech_recognition_service.cc", "speech/chrome_speech_recognition_service.h", "speech/extension_api/tts_extension_api_constants.cc", # Should be moved -@@ -5098,8 +4966,6 @@ static_library("browser") { +@@ -5098,8 +4964,6 @@ static_library("browser") { "profiles/gaia_info_update_service.h", "profiles/gaia_info_update_service_factory.cc", "profiles/gaia_info_update_service_factory.h", @@ -3698,7 +3713,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn ] if (!is_android && !is_chromeos_lacros) { -@@ -5353,8 +5219,6 @@ static_library("browser") { +@@ -5353,8 +5217,6 @@ static_library("browser") { "notifications/notification_platform_bridge_lacros.cc", "notifications/notification_platform_bridge_lacros.h", "platform_util_lacros.cc", @@ -3707,7 +3722,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "speech/tts_client_factory_lacros.cc", "speech/tts_client_factory_lacros.h", "speech/tts_client_lacros.cc", -@@ -6243,12 +6107,6 @@ static_library("browser") { +@@ -6243,12 +6105,6 @@ static_library("browser") { "profiles/profile_statistics_common.h", "profiles/profile_statistics_factory.cc", "profiles/profile_statistics_factory.h", @@ -3720,7 +3735,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "upgrade_detector/get_installed_version.cc", "upgrade_detector/get_installed_version.h", "upgrade_detector/installed_version_monitor.h", -@@ -7783,10 +7641,6 @@ static_library("test_support") { +@@ -7783,10 +7639,6 @@ static_library("test_support") { "resource_coordinator/tab_load_tracker_test_support.h", "share/fake_share_history.cc", "share/fake_share_history.h", @@ -3731,7 +3746,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "ssl/ssl_browsertest_util.cc", "ssl/ssl_browsertest_util.h", "ssl/ssl_client_auth_requestor_mock.cc", -@@ -7832,7 +7686,6 @@ static_library("test_support") { +@@ -7832,7 +7684,6 @@ static_library("test_support") { "//components/security_interstitials/content:security_interstitial_page", "//components/services/unzip/content", "//components/sessions:test_support", @@ -3739,7 +3754,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/subresource_filter/core/browser:test_support", "//components/subresource_filter/core/common:test_support", "//components/sync_preferences:test_support", -@@ -8074,8 +7927,6 @@ if (!is_android) { +@@ -8074,8 +7925,6 @@ if (!is_android) { visibility = [ "//chrome/test:test_support_ui" ] sources = [ @@ -3748,7 +3763,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "ui/webui/test_data_source.cc", "ui/webui/test_data_source.h", "ui/webui/web_ui_test_handler.cc", -@@ -8091,7 +7942,6 @@ if (!is_android) { +@@ -8091,7 +7940,6 @@ if (!is_android) { "//chrome/test/data:web_ui_test_bindings", "//components/metrics:test_support", "//components/password_manager/core/browser:test_support", @@ -3756,6 +3771,44 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/sync/driver:test_support", "//components/translate/content/common", "//content/test:test_support", +diff --git a/chrome/browser/android/consent_auditor/consent_auditor_bridge.cc b/chrome/browser/android/consent_auditor/consent_auditor_bridge.cc +--- a/chrome/browser/android/consent_auditor/consent_auditor_bridge.cc ++++ b/chrome/browser/android/consent_auditor/consent_auditor_bridge.cc +@@ -11,10 +11,8 @@ + #include "base/android/jni_array.h" + #include "base/android/jni_string.h" + #include "chrome/browser/consent_auditor/android/jni_headers/ConsentAuditorBridge_jni.h" +-#include "chrome/browser/consent_auditor/consent_auditor_factory.h" + #include "chrome/browser/profiles/profile_android.h" + #include "components/consent_auditor/consent_auditor.h" +-#include "components/signin/public/identity_manager/account_info.h" + + using base::android::JavaParamRef; + +@@ -26,23 +24,4 @@ static void JNI_ConsentAuditorBridge_RecordConsent( + jint j_feature, + const JavaParamRef& j_consent_description, + jint j_consent_confirmation) { +- // TODO(markusheintz): Update the ConsentAuditorBridgeInterface. +- DCHECK_EQ(static_cast(j_feature), +- consent_auditor::Feature::CHROME_SYNC); +- +- std::vector consent_description; +- base::android::JavaIntArrayToIntVector(env, j_consent_description, +- &consent_description); +- +- sync_pb::UserConsentTypes::SyncConsent sync_consent; +- sync_consent.set_status(sync_pb::UserConsentTypes::ConsentStatus:: +- UserConsentTypes_ConsentStatus_GIVEN); +- sync_consent.set_confirmation_grd_id(j_consent_confirmation); +- for (int id : consent_description) { +- sync_consent.add_description_grd_ids(id); +- } +- ConsentAuditorFactory::GetForProfile( +- ProfileAndroid::FromProfileAndroid(j_profile)) +- ->RecordSyncConsent(ConvertFromJavaCoreAccountId(env, j_account_id), +- sync_consent); + } diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc @@ -4005,6 +4058,32 @@ diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chro } void ChromeBrowserFieldTrials::InstantiateDynamicTrials() { +diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc +--- a/chrome/browser/chrome_content_browser_client.cc ++++ b/chrome/browser/chrome_content_browser_client.cc +@@ -4814,11 +4814,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( + std::make_unique(profile); + #endif + +- auto signin_throttle = +- signin::URLLoaderThrottle::MaybeCreate(std::move(delegate), wc_getter); +- if (signin_throttle) +- result.push_back(std::move(signin_throttle)); +- + return result; + } + +@@ -5154,10 +5149,6 @@ bool ChromeContentBrowserClient::WillCreateURLLoaderFactory( + } + #endif + +- use_proxy |= signin::ProxyingURLLoaderFactory::MaybeProxyRequest( +- frame, type == URLLoaderFactoryType::kNavigation, request_initiator, +- factory_receiver); +- + auto* prefetch_proxy_service = PrefetchProxyServiceFactory::GetForProfile( + Profile::FromBrowserContext(browser_context)); + // |frame| is null when |type| is service worker. diff --git a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc --- a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc +++ b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc @@ -4170,6 +4249,56 @@ diff --git a/chrome/browser/gcm/gcm_profile_service_factory.cc b/chrome/browser/ std::make_unique(), content::GetUIThreadTaskRunner({}), content::GetIOThreadTaskRunner({}), blocking_task_runner); #endif +diff --git a/chrome/browser/history/web_history_service_factory.cc b/chrome/browser/history/web_history_service_factory.cc +--- a/chrome/browser/history/web_history_service_factory.cc ++++ b/chrome/browser/history/web_history_service_factory.cc +@@ -4,11 +4,9 @@ + + #include "chrome/browser/history/web_history_service_factory.h" + +-#include "chrome/browser/signin/identity_manager_factory.h" + #include "chrome/browser/sync/sync_service_factory.h" + #include "components/history/core/browser/web_history_service.h" + #include "components/keyed_service/content/browser_context_dependency_manager.h" +-#include "components/sync/driver/sync_service.h" + #include "content/public/browser/browser_context.h" + #include "content/public/browser/storage_partition.h" + +@@ -16,9 +14,7 @@ namespace { + // Returns true if the user is signed in and full history sync is enabled, + // and false otherwise. + bool IsHistorySyncEnabled(Profile* profile) { +- syncer::SyncService* sync = SyncServiceFactory::GetForProfile(profile); +- return sync && sync->IsSyncFeatureActive() && !sync->IsLocalSyncEnabled() && +- sync->GetActiveDataTypes().Has(syncer::HISTORY_DELETE_DIRECTIVES); ++ return false; + } + + } // namespace +@@ -40,23 +36,13 @@ history::WebHistoryService* WebHistoryServiceFactory::GetForProfile( + + KeyedService* WebHistoryServiceFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { +- Profile* profile = static_cast(context); +- // Ensure that the service is not instantiated or used if the user is not +- // signed into sync, or if web history is not enabled. +- if (!IsHistorySyncEnabled(profile)) + return nullptr; +- +- return new history::WebHistoryService( +- IdentityManagerFactory::GetForProfile(profile), +- profile->GetDefaultStoragePartition() +- ->GetURLLoaderFactoryForBrowserProcess()); + } + + WebHistoryServiceFactory::WebHistoryServiceFactory() + : BrowserContextKeyedServiceFactory( + "WebHistoryServiceFactory", + BrowserContextDependencyManager::GetInstance()) { +- DependsOn(IdentityManagerFactory::GetInstance()); + } + + WebHistoryServiceFactory::~WebHistoryServiceFactory() { diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc --- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc +++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc @@ -4531,6 +4660,34 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom } /** +diff --git a/chrome/browser/password_manager/bulk_leak_check_service_factory.cc b/chrome/browser/password_manager/bulk_leak_check_service_factory.cc +--- a/chrome/browser/password_manager/bulk_leak_check_service_factory.cc ++++ b/chrome/browser/password_manager/bulk_leak_check_service_factory.cc +@@ -6,7 +6,6 @@ + + #include "base/no_destructor.h" + #include "chrome/browser/profiles/profile.h" +-#include "chrome/browser/signin/identity_manager_factory.h" + #include "components/keyed_service/content/browser_context_dependency_manager.h" + #include "components/password_manager/core/browser/bulk_leak_check_service.h" + #include "content/public/browser/storage_partition.h" +@@ -15,7 +14,6 @@ BulkLeakCheckServiceFactory::BulkLeakCheckServiceFactory() + : BrowserContextKeyedServiceFactory( + "PasswordBulkLeakCheck", + BrowserContextDependencyManager::GetInstance()) { +- DependsOn(IdentityManagerFactory::GetInstance()); + } + + BulkLeakCheckServiceFactory::~BulkLeakCheckServiceFactory() = default; +@@ -37,7 +35,7 @@ KeyedService* BulkLeakCheckServiceFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { + Profile* profile = Profile::FromBrowserContext(context); + return new password_manager::BulkLeakCheckService( +- IdentityManagerFactory::GetForProfile(profile), ++ nullptr, + profile->GetDefaultStoragePartition() + ->GetURLLoaderFactoryForBrowserProcess()); + } diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc @@ -4954,6 +5111,126 @@ diff --git a/chrome/browser/password_manager/password_manager_settings_service_f // Reset the migration pref in case the client is no longer in the enabled // group. profile->GetPrefs()->SetBoolean( +diff --git a/chrome/browser/password_manager/password_reuse_manager_factory.cc b/chrome/browser/password_manager/password_reuse_manager_factory.cc +--- a/chrome/browser/password_manager/password_reuse_manager_factory.cc ++++ b/chrome/browser/password_manager/password_reuse_manager_factory.cc +@@ -11,7 +11,6 @@ + #include "chrome/browser/password_manager/password_store_factory.h" + #include "chrome/browser/profiles/incognito_helpers.h" + #include "chrome/browser/profiles/profile.h" +-#include "chrome/browser/signin/identity_manager_factory.h" + #include "components/keyed_service/content/browser_context_dependency_manager.h" + #include "components/password_manager/core/browser/password_reuse_manager_impl.h" + #include "components/password_manager/core/browser/password_store_interface.h" +@@ -23,22 +22,8 @@ + + namespace { + +-std::string GetSyncUsername(Profile* profile) { +- auto* identity_manager = +- IdentityManagerFactory::GetForProfileIfExists(profile); +- return identity_manager +- ? identity_manager +- ->GetPrimaryAccountInfo(signin::ConsentLevel::kSync) +- .email +- : std::string(); +-} +- + bool IsSignedIn(Profile* profile) { +- auto* identity_manager = +- IdentityManagerFactory::GetForProfileIfExists(profile); +- return identity_manager +- ? !identity_manager->GetAccountsWithRefreshTokens().empty() +- : false; ++ return false; + } + + } // namespace +@@ -47,7 +32,6 @@ PasswordReuseManagerFactory::PasswordReuseManagerFactory() + : BrowserContextKeyedServiceFactory( + "PasswordReuseManager", + BrowserContextDependencyManager::GetInstance()) { +- DependsOn(IdentityManagerFactory::GetInstance()); + DependsOn(PasswordStoreFactory::GetInstance()); + DependsOn(AccountPasswordStoreFactory::GetInstance()); + } +@@ -74,34 +58,17 @@ KeyedService* PasswordReuseManagerFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { + DCHECK(base::FeatureList::IsEnabled( + password_manager::features::kPasswordReuseDetectionEnabled)); +- +- Profile* profile = Profile::FromBrowserContext(context); +- +- password_manager::PasswordReuseManager* reuse_manager = +- new password_manager::PasswordReuseManagerImpl(); +- reuse_manager->Init(profile->GetPrefs(), +- PasswordStoreFactory::GetForProfile( +- profile, ServiceAccessType::EXPLICIT_ACCESS) +- .get(), +- AccountPasswordStoreFactory::GetForProfile( +- profile, ServiceAccessType::EXPLICIT_ACCESS) +- .get()); +- +- // Prepare password hash data for reuse detection. +- reuse_manager->PreparePasswordHashData(GetSyncUsername(profile), +- IsSignedIn(profile)); +- + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) + std::unique_ptr notifier = + std::make_unique( +- IdentityManagerFactory::GetForProfile(profile)); ++ nullptr); + reuse_manager->SetPasswordStoreSigninNotifier(std::move(notifier)); + #endif + +- return reuse_manager; ++ return nullptr; + } + + content::BrowserContext* PasswordReuseManagerFactory::GetBrowserContextToUse( +diff --git a/chrome/browser/password_manager/password_store_utils.cc b/chrome/browser/password_manager/password_store_utils.cc +--- a/chrome/browser/password_manager/password_store_utils.cc ++++ b/chrome/browser/password_manager/password_store_utils.cc +@@ -7,13 +7,10 @@ + #include "base/bind.h" + #include "base/memory/raw_ptr.h" + #include "chrome/browser/password_manager/account_password_store_factory.h" +-#include "chrome/browser/password_manager/password_reuse_manager_factory.h" + #include "chrome/browser/password_manager/password_store_factory.h" + #include "chrome/browser/profiles/profile.h" + #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h" + #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" +-#include "chrome/browser/signin/identity_manager_factory.h" +-#include "chrome/browser/sync/sync_service_factory.h" + #include "components/password_manager/core/browser/password_form.h" + #include "components/password_manager/core/browser/password_store_interface.h" + #include "components/password_manager/core/browser/store_metrics_reporter.h" +@@ -65,20 +62,12 @@ class StoreMetricReporterHelper : public base::SupportsUserData::Data { + AccountPasswordStoreFactory::GetForProfile( + profile_, ServiceAccessType::EXPLICIT_ACCESS) + .get(); +- syncer::SyncService* sync_service = +- SyncServiceFactory::HasSyncService(profile_) +- ? SyncServiceFactory::GetForProfile(profile_) +- : nullptr; +- signin::IdentityManager* identity_manager = +- IdentityManagerFactory::GetForProfile(profile_->GetOriginalProfile()); +- password_manager::PasswordReuseManager* password_reuse_manager = +- PasswordReuseManagerFactory::GetForProfile(profile_); + PrefService* pref_service = profile_->GetPrefs(); + + metrics_reporter_ = + std::make_unique( +- profile_store, account_store, sync_service, identity_manager, +- pref_service, password_reuse_manager, ++ profile_store, account_store, nullptr, nullptr, ++ pref_service, nullptr, + IsUnderAdvancedProtection(profile_), + base::BindOnce( + &StoreMetricReporterHelper::RemoveInstanceFromProfileUserData, diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn --- a/chrome/browser/privacy/BUILD.gn +++ b/chrome/browser/privacy/BUILD.gn