[Sync] Remove the last datatype-specific deps from sync_driver.

chrome/browser/sync/chrome_sync_client.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/chrome_sync_client.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 164 matching lines @@
     : profile_(profile),
       sync_sessions_client_(new SyncSessionsClientImpl(profile)),
       browsing_data_remover_observer_(NULL),
       weak_ptr_factory_(this) {}
 
 ChromeSyncClient::~ChromeSyncClient() {
 }
 
 void ChromeSyncClient::Initialize(sync_driver::SyncService* sync_service) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  web_data_service_ = WebDataServiceFactory::GetAutofillWebDataForProfile(
+      profile_, ServiceAccessType::EXPLICIT_ACCESS);
+  // TODO(crbug.com/558320) Is EXPLICIT_ACCESS appropriate here?
+  password_store_ = PasswordStoreFactory::GetForProfile(
+      profile_, ServiceAccessType::EXPLICIT_ACCESS);
+
   // Component factory may already be set in tests.
   if (!GetSyncApiComponentFactory()) {
     const GURL sync_service_url = GetSyncServiceURL(
         *base::CommandLine::ForCurrentProcess(), chrome::GetChannel());
     ProfileOAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
     net::URLRequestContextGetter* url_request_context_getter =
         profile_->GetRequestContext();
 
     component_factory_.reset(new ProfileSyncComponentsFactoryImpl(
         this, chrome::GetChannel(), chrome::GetVersionString(),
         ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET,
         *base::CommandLine::ForCurrentProcess(),
         prefs::kSavingBrowserHistoryDisabled, sync_service_url,
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::UI),
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::DB),
-        token_service, url_request_context_getter));
+        token_service, url_request_context_getter, web_data_service_,
+        password_store_));
   }
   sync_service_ = sync_service;
-  web_data_service_ = GetWebDataService();
-  password_store_ = GetPasswordStore();
 }
 
 sync_driver::SyncService* ChromeSyncClient::GetSyncService() {
   // TODO(zea): bring back this DCHECK after Typed URLs are converted to
   // SyncableService.
   // DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return sync_service_;
 }
 
 PrefService* ChromeSyncClient::GetPrefService() {
@@ skipping 16 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return HistoryServiceFactory::GetForProfile(
       profile_, ServiceAccessType::EXPLICIT_ACCESS);
 }
 
 autofill::PersonalDataManager* ChromeSyncClient::GetPersonalDataManager() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return autofill::PersonalDataManagerFactory::GetForProfile(profile_);
 }
 
-scoped_refptr<password_manager::PasswordStore>
-ChromeSyncClient::GetPasswordStore() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  return PasswordStoreFactory::GetForProfile(
-      profile_, ServiceAccessType::EXPLICIT_ACCESS);
-}
-
 sync_driver::ClearBrowsingDataCallback
 ChromeSyncClient::GetClearBrowsingDataCallback() {
   return base::Bind(&ChromeSyncClient::ClearBrowsingData,
                     base::Unretained(this));
 }
 
 base::Closure ChromeSyncClient::GetPasswordStateChangedCallback() {
   return base::Bind(
       &PasswordStoreFactory::OnPasswordsSyncedStatePotentiallyChanged,
       base::Unretained(profile_));
 }
 
 sync_driver::SyncApiComponentFactory::RegisterDataTypesMethod
 ChromeSyncClient::GetRegisterPlatformTypesCallback() {
   return base::Bind(
 #if BUILDFLAG(ANDROID_JAVA_UI)
       &ChromeSyncClient::RegisterAndroidDataTypes,
 #else
       &ChromeSyncClient::RegisterDesktopDataTypes,
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)
       weak_ptr_factory_.GetWeakPtr());
 }
 
-scoped_refptr<autofill::AutofillWebDataService>
-ChromeSyncClient::GetWebDataService() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  return WebDataServiceFactory::GetAutofillWebDataForProfile(
-      profile_, ServiceAccessType::EXPLICIT_ACCESS);
-}
-
 BookmarkUndoService* ChromeSyncClient::GetBookmarkUndoServiceIfExists() {
   return BookmarkUndoServiceFactory::GetForProfileIfExists(profile_);
 }
 
 invalidation::InvalidationService* ChromeSyncClient::GetInvalidationService() {
   invalidation::ProfileInvalidationProvider* provider =
       invalidation::ProfileInvalidationProviderFactory::GetForProfile(profile_);
   if (provider)
     return provider->GetInvalidationService();
   return nullptr;
@@ skipping 156 matching lines @@
     case syncer::GROUP_HISTORY: {
       history::HistoryService* history_service = GetHistoryService();
       if (!history_service)
         return nullptr;
       return new HistoryModelWorker(
           history_service->AsWeakPtr(),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
           observer);
     }
     case syncer::GROUP_PASSWORD: {
-      scoped_refptr<password_manager::PasswordStore> password_store =
-          GetPasswordStore();
-      if (!password_store.get())
+      if (!password_store_.get())
         return nullptr;
-      return new PasswordModelWorker(password_store, observer);
+      return new PasswordModelWorker(password_store_, observer);
     }
     default:
       return nullptr;
   }
 }
 
 sync_driver::SyncApiComponentFactory*
 ChromeSyncClient::GetSyncApiComponentFactory() {
   return component_factory_.get();
 }
@@ skipping 139 matching lines @@
   sync_service->RegisterDataTypeController(
       new SupervisedUserSyncDataTypeController(syncer::SUPERVISED_USER_SETTINGS,
                                                error_callback, this, profile_));
   sync_service->RegisterDataTypeController(
       new SupervisedUserSyncDataTypeController(
           syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_));
 #endif
 }
 
 }  // namespace browser_sync