diff options
| author | vabr <vabr@chromium.org> | 2015-12-15 05:07:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-15 13:08:12 +0000 |
| commit | 15d555b0c2cdaea6f66bc71300d166bf19ae8242 (patch) | |
| tree | c964a3b40392fbde74fba11132867c6f11dbd09a /ios/chrome/browser/sync/glue | |
| parent | 968329336ac2207611a7f9fb50883646f7023110 (diff) | |
| download | chromium_src-15d555b0c2cdaea6f66bc71300d166bf19ae8242.zip chromium_src-15d555b0c2cdaea6f66bc71300d166bf19ae8242.tar.gz chromium_src-15d555b0c2cdaea6f66bc71300d166bf19ae8242.tar.bz2 | |
Reland: Port iOS to use IOSChromeProfileSyncServiceFactory
This CL switches from using ProfileSyncServiceFactory to
IOSChromeProfileSyncServiceFactory in ios.
The CL is a relanding of https://codereview.chromium.org/1522993002/.
Patch set 1 here is patch set 1 from that CL, which got reverted in
https://codereview.chromium.org/1522363002/.
Patch set 2 here is the fix.
TBR=sdefresne@chromium.org
BUG=565305
Review URL: https://codereview.chromium.org/1525043003
Cr-Commit-Position: refs/heads/master@{#365235}
Diffstat (limited to 'ios/chrome/browser/sync/glue')
| -rw-r--r-- | ios/chrome/browser/sync/glue/sync_start_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ios/chrome/browser/sync/glue/sync_start_util.cc b/ios/chrome/browser/sync/glue/sync_start_util.cc index 22123a3..0ac61b9 100644 --- a/ios/chrome/browser/sync/glue/sync_start_util.cc +++ b/ios/chrome/browser/sync/glue/sync_start_util.cc @@ -7,11 +7,12 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/location.h" +#include "components/browser_sync/browser/profile_sync_service.h" #include "components/sync_driver/sync_service.h" #include "ios/chrome/browser/application_context.h" +#include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state_manager.h" -#include "ios/public/provider/chrome/browser/keyed_service_provider.h" #include "ios/web/public/web_thread.h" namespace ios { @@ -35,8 +36,7 @@ void StartSyncOnUIThread(const base::FilePath& browser_state_path, } sync_driver::SyncService* sync_service = - ios::GetKeyedServiceProvider()->GetSyncServiceForBrowserState( - browser_state); + IOSChromeProfileSyncServiceFactory::GetForBrowserState(browser_state); if (!sync_service) { DVLOG(2) << "No SyncService for browser state, can't start sync."; return; |