diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch index 48ed358c..9efb365b 100644 --- a/build/patches/Add-lifetime-options-for-permissions.patch +++ b/build/patches/Add-lifetime-options-for-permissions.patch @@ -186,7 +186,7 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/c diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -378,10 +378,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -363,10 +363,7 @@ void ChromeBrowserMainExtraPartsProfiles:: InstantServiceFactory::GetInstance(); #endif LanguageModelManagerFactory::GetInstance(); diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index 3e4cd118..e8478961 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -435,7 +435,7 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -241,6 +241,8 @@ +@@ -233,6 +233,8 @@ #include "chrome/browser/ui/cocoa/screentime/screentime_features.h" #endif @@ -444,7 +444,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc namespace chrome { void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) { -@@ -574,6 +576,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -557,6 +559,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif WebDataServiceFactory::GetInstance(); webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); diff --git a/build/patches/Remove-signin-and-sync-integrations.patch b/build/patches/Remove-signin-and-sync-integrations.patch index 9861e96c..782a075b 100644 --- a/build/patches/Remove-signin-and-sync-integrations.patch +++ b/build/patches/Remove-signin-and-sync-integrations.patch @@ -82,7 +82,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../autofill/personal_data_manager_factory.cc | 4 +- .../common_dependencies_chrome.cc | 13 -- .../common_dependencies_chrome.h | 3 - + .../bookmarks/bookmark_model_factory.cc | 5 +- .../chrome_browsing_data_lifetime_manager.cc | 6 +- + .../counters/browsing_data_counter_factory.cc | 8 +- .../counters/browsing_data_counter_utils.cc | 6 - chrome/browser/chrome_browser_field_trials.cc | 6 +- .../browser/chrome_content_browser_client.cc | 9 - @@ -105,10 +107,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../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_reuse_manager_factory.cc | 46 +--- .../password_manager/password_store_utils.cc | 15 +- chrome/browser/privacy/BUILD.gn | 2 - + .../privacy_metrics_service_factory.cc | 13 -- .../res/layout/privacy_review_msbb_step.xml | 8 - + .../privacy_sandbox_service_factory.cc | 8 +- + .../privacy_sandbox_settings_delegate.cc | 18 +- + ...hrome_browser_main_extra_parts_profiles.cc | 17 -- chrome/browser/profiles/profile_impl.cc | 15 +- .../verdict_cache_manager_factory.cc | 5 +- .../DevicePickerBottomSheetContent.java | 46 ---- @@ -135,7 +141,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 - - 116 files changed, 97 insertions(+), 2715 deletions(-) + 122 files changed, 103 insertions(+), 2785 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -3985,6 +3991,42 @@ diff --git a/chrome/browser/autofill_assistant/common_dependencies_chrome.h b/ch version_info::Channel GetChannel() const override; }; +diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc +--- a/chrome/browser/bookmarks/bookmark_model_factory.cc ++++ b/chrome/browser/bookmarks/bookmark_model_factory.cc +@@ -12,7 +12,6 @@ + #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" + #include "chrome/browser/profiles/incognito_helpers.h" + #include "chrome/browser/profiles/profile.h" +-#include "chrome/browser/sync/bookmark_sync_service_factory.h" + #include "chrome/browser/ui/webui/bookmarks/bookmarks_ui.h" + #include "chrome/browser/undo/bookmark_undo_service_factory.h" + #include "chrome/common/chrome_switches.h" +@@ -20,7 +19,6 @@ + #include "components/bookmarks/browser/bookmark_utils.h" + #include "components/keyed_service/content/browser_context_dependency_manager.h" + #include "components/prefs/pref_service.h" +-#include "components/sync_bookmarks/bookmark_sync_service.h" + #include "components/undo/bookmark_undo_service.h" + #include "content/public/browser/browser_task_traits.h" + #include "content/public/browser/browser_thread.h" +@@ -35,7 +33,7 @@ std::unique_ptr BuildBookmarkModel( + auto bookmark_model = + std::make_unique(std::make_unique( + profile, ManagedBookmarkServiceFactory::GetForProfile(profile), +- BookmarkSyncServiceFactory::GetForProfile(profile))); ++ nullptr)); + bookmark_model->Load(profile->GetPrefs(), profile->GetPath()); + BookmarkUndoServiceFactory::GetForProfile(profile)->Start( + bookmark_model.get()); +@@ -75,7 +73,6 @@ BookmarkModelFactory::BookmarkModelFactory() + BrowserContextDependencyManager::GetInstance()) { + DependsOn(BookmarkUndoServiceFactory::GetInstance()); + DependsOn(ManagedBookmarkServiceFactory::GetInstance()); +- DependsOn(BookmarkSyncServiceFactory::GetInstance()); + } + + BookmarkModelFactory::~BookmarkModelFactory() { diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc @@ -4008,6 +4050,52 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager. auto deletion_end_time = end_time_for_testing_.value_or( base::Time::Now() - base::Hours(removal_settings.time_to_live_in_hours)); +diff --git a/chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc b/chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc +--- a/chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc ++++ b/chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc +@@ -21,7 +21,6 @@ + #include "chrome/browser/password_manager/account_password_store_factory.h" + #include "chrome/browser/password_manager/password_store_factory.h" + #include "chrome/browser/profiles/profile.h" +-#include "chrome/browser/sync/sync_service_factory.h" + #include "chrome/browser/web_data_service_factory.h" + #include "chrome/browser/webauthn/chrome_authenticator_request_delegate.h" + #include "components/browsing_data/core/counters/autofill_counter.h" +@@ -31,7 +30,6 @@ + #include "components/browsing_data/core/pref_names.h" + #include "components/history/core/browser/web_history_service.h" + #include "components/password_manager/core/browser/password_store_interface.h" +-#include "components/sync/driver/sync_service.h" + #include "extensions/buildflags/buildflags.h" + + #if BUILDFLAG(ENABLE_EXTENSIONS) +@@ -68,7 +66,7 @@ BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile, + profile, ServiceAccessType::EXPLICIT_ACCESS), + base::BindRepeating(&GetUpdatedWebHistoryService, + base::Unretained(profile)), +- SyncServiceFactory::GetForProfile(profile)); ++ nullptr); + } + if (pref_name == browsing_data::prefs::kDeleteBrowsingHistoryBasic) { + // The history option on the basic tab doesn't use a counter. +@@ -105,7 +103,7 @@ BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile, + ServiceAccessType::EXPLICIT_ACCESS), + AccountPasswordStoreFactory::GetForProfile( + profile, ServiceAccessType::EXPLICIT_ACCESS), +- SyncServiceFactory::GetForProfile(profile), ++ nullptr, + std::move(credential_store)); + } + +@@ -113,7 +111,7 @@ BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile, + return std::make_unique( + WebDataServiceFactory::GetAutofillWebDataForProfile( + profile, ServiceAccessType::EXPLICIT_ACCESS), +- SyncServiceFactory::GetForProfile(profile)); ++ nullptr); + } + + if (pref_name == browsing_data::prefs::kDeleteDownloadHistory) { diff --git a/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc b/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc --- a/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc +++ b/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc @@ -5114,7 +5202,7 @@ diff --git a/chrome/browser/password_manager/password_manager_settings_service_f 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 @@ +@@ -11,43 +11,18 @@ #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" @@ -5122,10 +5210,14 @@ diff --git a/chrome/browser/password_manager/password_reuse_manager_factory.cc b #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 { + #include "components/password_manager/core/browser/password_store_signin_notifier_impl.h" + #include "components/password_manager/core/common/password_manager_features.h" +-#include "components/signin/public/identity_manager/identity_manager.h" + #include "content/public/browser/browser_context.h" + #include "content/public/browser/storage_partition.h" +-namespace { +- -std::string GetSyncUsername(Profile* profile) { - auto* identity_manager = - IdentityManagerFactory::GetForProfileIfExists(profile); @@ -5136,17 +5228,17 @@ diff --git a/chrome/browser/password_manager/password_reuse_manager_factory.cc b - : std::string(); -} - - bool IsSignedIn(Profile* profile) { +-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() +-} +- +-} // namespace +- + PasswordReuseManagerFactory::PasswordReuseManagerFactory() : BrowserContextKeyedServiceFactory( "PasswordReuseManager", BrowserContextDependencyManager::GetInstance()) { @@ -5154,7 +5246,7 @@ diff --git a/chrome/browser/password_manager/password_reuse_manager_factory.cc b DependsOn(PasswordStoreFactory::GetInstance()); DependsOn(AccountPasswordStoreFactory::GetInstance()); } -@@ -74,34 +58,17 @@ KeyedService* PasswordReuseManagerFactory::BuildServiceInstanceFor( +@@ -74,34 +49,17 @@ KeyedService* PasswordReuseManagerFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { DCHECK(base::FeatureList::IsEnabled( password_manager::features::kPasswordReuseDetectionEnabled)); @@ -5243,6 +5335,39 @@ diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn ] sources = [ "java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java", +diff --git a/chrome/browser/privacy/privacy_metrics_service_factory.cc b/chrome/browser/privacy/privacy_metrics_service_factory.cc +--- a/chrome/browser/privacy/privacy_metrics_service_factory.cc ++++ b/chrome/browser/privacy/privacy_metrics_service_factory.cc +@@ -8,8 +8,6 @@ + #include "chrome/browser/content_settings/host_content_settings_map_factory.h" + #include "chrome/browser/privacy/privacy_metrics_service.h" + #include "chrome/browser/profiles/profile.h" +-#include "chrome/browser/signin/identity_manager_factory.h" +-#include "chrome/browser/sync/sync_service_factory.h" + #include "components/keyed_service/content/browser_context_dependency_manager.h" + #include "components/keyed_service/core/keyed_service.h" + +@@ -28,20 +26,9 @@ PrivacyMetricsServiceFactory::PrivacyMetricsServiceFactory() + "PrivacyMetricsService", + BrowserContextDependencyManager::GetInstance()) { + DependsOn(HostContentSettingsMapFactory::GetInstance()); +- DependsOn(SyncServiceFactory::GetInstance()); +- DependsOn(IdentityManagerFactory::GetInstance()); + } + + KeyedService* PrivacyMetricsServiceFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { +- // No metrics recorded for OTR profiles. +- if (context->IsOffTheRecord()) + return nullptr; +- +- Profile* profile = Profile::FromBrowserContext(context); +- return new PrivacyMetricsService( +- profile->GetPrefs(), +- HostContentSettingsMapFactory::GetForProfile(profile), +- SyncServiceFactory::GetForProfile(profile), +- IdentityManagerFactory::GetForProfile(profile)); + } diff --git a/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml b/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml --- a/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml +++ b/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml @@ -5261,6 +5386,143 @@ diff --git a/chrome/browser/privacy_review/android/java/res/layout/privacy_revie GetPrefs(), + profile->GetProfilePolicyConnector()->policy_service(), +- SyncServiceFactory::GetForProfile(profile), +- IdentityManagerFactory::GetForProfile(profile), ++ nullptr, ++ nullptr, + profile->GetDefaultStoragePartition()->GetInterestGroupManager(), + profile_metrics::GetBrowserProfileType(profile), + (!profile->IsGuestSession() || profile->IsOffTheRecord()) +diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc +--- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc ++++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc +@@ -10,27 +10,11 @@ + #include "components/prefs/pref_service.h" + #include "components/privacy_sandbox/privacy_sandbox_features.h" + #include "components/privacy_sandbox/privacy_sandbox_prefs.h" +-#include "components/signin/public/identity_manager/identity_manager.h" +-#include "components/signin/public/identity_manager/tribool.h" + + namespace { + + bool PrivacySandboxRestrictedByAcccountCapability(Profile* profile) { +- auto* identity_manager = IdentityManagerFactory::GetForProfile(profile); +- +- if (!identity_manager) +- return false; +- +- const auto core_account_info = +- identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin); +- const AccountInfo account_info = +- identity_manager->FindExtendedAccountInfo(core_account_info); +- auto capability = +- account_info.capabilities.can_run_chrome_privacy_sandbox_trials(); +- +- // The Privacy Sandbox is not considered restricted unless the capability +- // has a definitive false signal. +- return capability == signin::Tribool::kFalse; ++ return false; + } + + } // namespace +diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ++++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +@@ -87,16 +87,8 @@ + #include "chrome/browser/sessions/tab_restore_service_factory.h" + #include "chrome/browser/sharing/sharing_service_factory.h" + #include "chrome/browser/sharing_hub/sharing_hub_service_factory.h" +-#include "chrome/browser/signin/about_signin_internals_factory.h" +-#include "chrome/browser/signin/account_consistency_mode_manager_factory.h" +-#include "chrome/browser/signin/account_investigator_factory.h" +-#include "chrome/browser/signin/account_reconcilor_factory.h" +-#include "chrome/browser/signin/chrome_signin_client_factory.h" +-#include "chrome/browser/signin/identity_manager_factory.h" +-#include "chrome/browser/signin/signin_profile_attributes_updater_factory.h" + #include "chrome/browser/ssl/sct_reporting_service_factory.h" + #include "chrome/browser/sync/model_type_store_service_factory.h" +-#include "chrome/browser/sync/sync_service_factory.h" + #include "chrome/browser/sync/user_event_service_factory.h" + #include "chrome/browser/themes/theme_service_factory.h" + #include "chrome/browser/translate/translate_ranker_factory.h" +@@ -280,12 +272,8 @@ void ChromeBrowserMainExtraPartsProfiles:: + ash::EnsureBrowserContextKeyedServiceFactoriesBuilt(); + #endif + +- AboutSigninInternalsFactory::GetInstance(); + AboutThisSiteServiceFactory::GetInstance(); + AccessContextAuditServiceFactory::GetInstance(); +- AccountConsistencyModeManagerFactory::GetInstance(); +- AccountInvestigatorFactory::GetInstance(); +- AccountReconcilorFactory::GetInstance(); + #if !BUILDFLAG(IS_ANDROID) + AccuracyServiceFactory::GetInstance(); + #endif +@@ -310,7 +298,6 @@ void ChromeBrowserMainExtraPartsProfiles:: + BookmarkUndoServiceFactory::GetInstance(); + if (breadcrumbs::IsEnabled()) + BreadcrumbManagerKeyedServiceFactory::GetInstance(); +- browser_sync::UserEventServiceFactory::GetInstance(); + BrowsingDataHistoryObserverService::Factory::GetInstance(); + browsing_topics::BrowsingTopicsServiceFactory::GetInstance(); + #if BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -333,7 +320,6 @@ void ChromeBrowserMainExtraPartsProfiles:: + ChromeBrowsingDataLifetimeManagerFactory::GetInstance(); + #endif + ChromeBrowsingDataRemoverDelegateFactory::GetInstance(); +- ChromeSigninClientFactory::GetInstance(); + ClientHintsFactory::GetInstance(); + ConsentAuditorFactory::GetInstance(); + CookieSettingsFactory::GetInstance(); +@@ -370,7 +356,6 @@ void ChromeBrowserMainExtraPartsProfiles:: + HistoryUiFaviconRequestHandlerFactory::GetInstance(); + HostContentSettingsMapFactory::GetInstance(); + HttpsEngagementServiceFactory::GetInstance(); +- IdentityManagerFactory::EnsureFactoryAndDependeeFactoriesBuilt(); + InMemoryURLIndexFactory::GetInstance(); + #if !BUILDFLAG(IS_ANDROID) + InstantServiceFactory::GetInstance(); +@@ -475,7 +460,6 @@ void ChromeBrowserMainExtraPartsProfiles:: + ProfileAccountManagerFactory::GetInstance(); + #endif + ProfileNetworkContextServiceFactory::GetInstance(); +- SyncServiceFactory::GetInstance(); + #if !BUILDFLAG(IS_ANDROID) + ProfileThemeUpdateServiceFactory::GetInstance(); + #endif +@@ -521,7 +505,6 @@ void ChromeBrowserMainExtraPartsProfiles:: + #endif + commerce::ShoppingServiceFactory::GetInstance(); + ShortcutsBackendFactory::GetInstance(); +- SigninProfileAttributesUpdaterFactory::GetInstance(); + if (site_engagement::SiteEngagementService::IsEnabled()) + site_engagement::SiteEngagementServiceFactory::GetInstance(); + #if BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc