diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-09-23 09:20:35 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-12-21 17:50:03 +0000 |
| commit | 481d91afcf30a6491cdf27868025b2d2c242ef69 (patch) | |
| tree | 2efe9f3b3e0e893df31db5890157e4e894a0892f | |
| parent | df46b0483d4679342952035b7e75cbbc5d4cd696 (diff) | |
| download | qtwebengine-chromium-481d91afcf30a6491cdf27868025b2d2c242ef69.tar.gz | |
Fix initalization for FCM
We should not use account fetcher as it initalizes more
stuff and expects image fetcher for GAIA accounts.
Change-Id: I39cb08b118ea6cadc2d369049cf852515ebd7a0d
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/434519
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | chromium/components/signin/public/identity_manager/identity_manager.cc | 7 | ||||
| -rw-r--r-- | chromium/components/signin/public/identity_manager/identity_manager_builder.cc | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/chromium/components/signin/public/identity_manager/identity_manager.cc b/chromium/components/signin/public/identity_manager/identity_manager.cc index 9de8ca32099..fc0ee975217 100644 --- a/chromium/components/signin/public/identity_manager/identity_manager.cc +++ b/chromium/components/signin/public/identity_manager/identity_manager.cc @@ -128,7 +128,10 @@ IdentityManager::IdentityManager(IdentityManager::InitParameters&& parameters) std::move(parameters.device_accounts_synchronizer)), diagnostics_provider_(std::move(parameters.diagnostics_provider)), account_consistency_(parameters.account_consistency) { + +#if !defined(TOOLKIT_QT) DCHECK(account_fetcher_service_); +#endif DCHECK(diagnostics_provider_); primary_account_manager_observation_.Observe(primary_account_manager_.get()); @@ -414,8 +417,12 @@ void IdentityManager::RemoveDiagnosticsObserver(DiagnosticsObserver* observer) { } void IdentityManager::OnNetworkInitialized() { +#if !defined(TOOLKIT_QT) gaia_cookie_manager_service_->InitCookieListener(); account_fetcher_service_->OnNetworkInitialized(); +#else + DCHECK(false); // we should never call network initialized +#endif } #if BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/chromium/components/signin/public/identity_manager/identity_manager_builder.cc b/chromium/components/signin/public/identity_manager/identity_manager_builder.cc index 330c7c3e7ff..458cc2b9be3 100644 --- a/chromium/components/signin/public/identity_manager/identity_manager_builder.cc +++ b/chromium/components/signin/public/identity_manager/identity_manager_builder.cc @@ -169,10 +169,12 @@ IdentityManager::InitParameters BuildIdentityManagerInitParameters( token_service.get(), params->signin_client); #endif // BULIDFLAG(IS_ANDROID) +#if !defined(TOOLKIT_QT) init_params.account_fetcher_service = BuildAccountFetcherService( params->signin_client, token_service.get(), account_tracker_service.get(), std::move(params->image_decoder), std::move(account_capabilities_fetcher_factory)); +#endif #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) init_params.device_accounts_synchronizer = |