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

ios/chrome/browser/sync/ios_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 "ios/chrome/browser/sync/ios_chrome_sync_client.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "components/autofill/core/browser/webdata/autocomplete_syncable_service.h"
 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_service.h"
@@ skipping 116 matching lines @@
 IOSChromeSyncClient::IOSChromeSyncClient(ios::ChromeBrowserState* browser_state)
     : browser_state_(browser_state),
       sync_sessions_client_(new SyncSessionsClientImpl(browser_state)),
       dummy_extensions_activity_(new syncer::ExtensionsActivity()),
       weak_ptr_factory_(this) {}
 
 IOSChromeSyncClient::~IOSChromeSyncClient() {}
 
 void IOSChromeSyncClient::Initialize(sync_driver::SyncService* sync_service) {
   DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI);
+
+  web_data_service_ =
+      ios::WebDataServiceFactory::GetAutofillWebDataForBrowserState(
+          browser_state_, ServiceAccessType::EXPLICIT_ACCESS);
+  // TODO(crbug.com/558320) Is EXPLICIT_ACCESS appropriate here?
+  password_store_ = IOSChromePasswordStoreFactory::GetForBrowserState(
+      browser_state_, ServiceAccessType::EXPLICIT_ACCESS);
+
   // Component factory may already be set in tests.
   if (!GetSyncApiComponentFactory()) {
     const GURL sync_service_url = GetSyncServiceURL(
         *base::CommandLine::ForCurrentProcess(), ::GetChannel());
     ProfileOAuth2TokenService* token_service =
         OAuth2TokenServiceFactory::GetForBrowserState(browser_state_);
 
     net::URLRequestContextGetter* url_request_context_getter =
         browser_state_->GetRequestContext();
 
     component_factory_.reset(new ProfileSyncComponentsFactoryImpl(
         this, ::GetChannel(), ::GetVersionString(),
         ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET,
         *base::CommandLine::ForCurrentProcess(),
         prefs::kSavingBrowserHistoryDisabled, sync_service_url,
         web::WebThread::GetTaskRunnerForThread(web::WebThread::UI),
         web::WebThread::GetTaskRunnerForThread(web::WebThread::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* IOSChromeSyncClient::GetSyncService() {
   // TODO(crbug.com/558298): bring back this DCHECK after Typed URLs are
   // converted to SyncableService.
   // DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI);
   return sync_service_;
 }
 
 PrefService* IOSChromeSyncClient::GetPrefService() {
@@ skipping 16 matching lines @@
   DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI);
   return ios::HistoryServiceFactory::GetForBrowserState(
       browser_state_, ServiceAccessType::EXPLICIT_ACCESS);
 }
 
 autofill::PersonalDataManager* IOSChromeSyncClient::GetPersonalDataManager() {
   DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI);
   return PersonalDataManagerFactory::GetForBrowserState(browser_state_);
 }
 
-scoped_refptr<password_manager::PasswordStore>
-IOSChromeSyncClient::GetPasswordStore() {
-  DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI);
-  // TODO(crbug.com/558320) Is EXPLICIT_ACCESS appropriate here?
-  return IOSChromePasswordStoreFactory::GetForBrowserState(
-      browser_state_, ServiceAccessType::EXPLICIT_ACCESS);
-}
-
 sync_driver::ClearBrowsingDataCallback
 IOSChromeSyncClient::GetClearBrowsingDataCallback() {
   return base::Bind(&IOSChromeSyncClient::ClearBrowsingData,
                     base::Unretained(this));
 }
 
 base::Closure IOSChromeSyncClient::GetPasswordStateChangedCallback() {
   return base::Bind(
       &IOSChromePasswordStoreFactory::OnPasswordsSyncedStatePotentiallyChanged,
       base::Unretained(browser_state_));
 }
 
 sync_driver::SyncApiComponentFactory::RegisterDataTypesMethod
 IOSChromeSyncClient::GetRegisterPlatformTypesCallback() {
   // The iOS port does not have any platform-specific datatypes.
   return sync_driver::SyncApiComponentFactory::RegisterDataTypesMethod();
 }
 
-scoped_refptr<autofill::AutofillWebDataService>
-IOSChromeSyncClient::GetWebDataService() {
-  DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::UI);
-  return ios::WebDataServiceFactory::GetAutofillWebDataForBrowserState(
-      browser_state_, ServiceAccessType::EXPLICIT_ACCESS);
-}
-
 BookmarkUndoService* IOSChromeSyncClient::GetBookmarkUndoServiceIfExists() {
   return ios::BookmarkUndoServiceFactory::GetForBrowserStateIfExists(
       browser_state_);
 }
 
 invalidation::InvalidationService*
 IOSChromeSyncClient::GetInvalidationService() {
   invalidation::ProfileInvalidationProvider* provider =
       IOSChromeProfileInvalidationProviderFactory::GetForBrowserState(
           browser_state_);
@@ skipping 121 matching lines @@
       return new syncer::PassiveModelWorker(observer);
     case syncer::GROUP_HISTORY: {
       history::HistoryService* history_service = GetHistoryService();
       if (!history_service)
         return nullptr;
       return new browser_sync::HistoryModelWorker(
           history_service->AsWeakPtr(),
           web::WebThread::GetTaskRunnerForThread(web::WebThread::UI), observer);
     }
     case syncer::GROUP_PASSWORD: {
-      scoped_refptr<password_manager::PasswordStore> password_store =
-          GetPasswordStore();
-      if (!password_store)
+      if (!password_store_)
         return nullptr;
-      return new browser_sync::PasswordModelWorker(password_store, observer);
+      return new browser_sync::PasswordModelWorker(password_store_, observer);
     }
     default:
       return nullptr;
   }
 }
 
 sync_driver::SyncApiComponentFactory*
 IOSChromeSyncClient::GetSyncApiComponentFactory() {
   return component_factory_.get();
 }
 
 void IOSChromeSyncClient::ClearBrowsingData(base::Time start, base::Time end) {
   // This method should never be called on iOS.
   NOTREACHED();
 }
 
 void IOSChromeSyncClient::SetSyncApiComponentFactoryForTesting(
     scoped_ptr<sync_driver::SyncApiComponentFactory> component_factory) {
   component_factory_ = component_factory.Pass();
 }