Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Unified Diff: ios/chrome/browser/sync/ios_chrome_sync_client.mm

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/sync/ios_chrome_sync_client.h ('k') | ios/chrome/browser/sync/sync_observer_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/sync/ios_chrome_sync_client.mm
diff --git a/ios/chrome/browser/sync/ios_chrome_sync_client.mm b/ios/chrome/browser/sync/ios_chrome_sync_client.mm
index 4eb8851f4327d2cafc13136d64dd07199866c187..66d249ad4a64e1767829afcba65bc74505373b12 100644
--- a/ios/chrome/browser/sync/ios_chrome_sync_client.mm
+++ b/ios/chrome/browser/sync/ios_chrome_sync_client.mm
@@ -150,7 +150,7 @@ void IOSChromeSyncClient::Initialize() {
// Component factory may already be set in tests.
if (!GetSyncApiComponentFactory()) {
- const GURL sync_service_url = GetSyncServiceURL(
+ const GURL sync_service_url = syncer::GetSyncServiceURL(
*base::CommandLine::ForCurrentProcess(), ::GetChannel());
ProfileOAuth2TokenService* token_service =
OAuth2TokenServiceFactory::GetForBrowserState(browser_state_);
@@ -170,7 +170,7 @@ void IOSChromeSyncClient::Initialize() {
}
}
-sync_driver::SyncService* IOSChromeSyncClient::GetSyncService() {
+syncer::SyncService* IOSChromeSyncClient::GetSyncService() {
DCHECK_CURRENTLY_ON(web::WebThread::UI);
return IOSChromeProfileSyncServiceFactory::GetForBrowserState(browser_state_);
}
@@ -209,10 +209,10 @@ base::Closure IOSChromeSyncClient::GetPasswordStateChangedCallback() {
base::Unretained(browser_state_));
}
-sync_driver::SyncApiComponentFactory::RegisterDataTypesMethod
+syncer::SyncApiComponentFactory::RegisterDataTypesMethod
IOSChromeSyncClient::GetRegisterPlatformTypesCallback() {
// The iOS port does not have any platform-specific datatypes.
- return sync_driver::SyncApiComponentFactory::RegisterDataTypesMethod();
+ return syncer::SyncApiComponentFactory::RegisterDataTypesMethod();
}
BookmarkUndoService* IOSChromeSyncClient::GetBookmarkUndoServiceIfExists() {
@@ -327,7 +327,7 @@ IOSChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
}
}
-base::WeakPtr<syncer_v2::ModelTypeService>
+base::WeakPtr<syncer::ModelTypeService>
IOSChromeSyncClient::GetModelTypeServiceForType(syncer::ModelType type) {
switch (type) {
case syncer::DEVICE_INFO:
@@ -337,7 +337,7 @@ IOSChromeSyncClient::GetModelTypeServiceForType(syncer::ModelType type) {
->AsWeakPtr();
default:
NOTREACHED();
- return base::WeakPtr<syncer_v2::ModelTypeService>();
+ return base::WeakPtr<syncer::ModelTypeService>();
}
}
@@ -348,15 +348,15 @@ IOSChromeSyncClient::CreateModelWorkerForGroup(
DCHECK_CURRENTLY_ON(web::WebThread::UI);
switch (group) {
case syncer::GROUP_DB:
- return new browser_sync::BrowserThreadModelWorker(
+ return new syncer::BrowserThreadModelWorker(
web::WebThread::GetTaskRunnerForThread(web::WebThread::DB),
syncer::GROUP_DB, observer);
case syncer::GROUP_FILE:
- return new browser_sync::BrowserThreadModelWorker(
+ return new syncer::BrowserThreadModelWorker(
web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE),
syncer::GROUP_FILE, observer);
case syncer::GROUP_UI:
- return new browser_sync::UIModelWorker(
+ return new syncer::UIModelWorker(
web::WebThread::GetTaskRunnerForThread(web::WebThread::UI), observer);
case syncer::GROUP_PASSIVE:
return new syncer::PassiveModelWorker(observer);
@@ -378,19 +378,19 @@ IOSChromeSyncClient::CreateModelWorkerForGroup(
}
}
-sync_driver::SyncApiComponentFactory*
+syncer::SyncApiComponentFactory*
IOSChromeSyncClient::GetSyncApiComponentFactory() {
return component_factory_.get();
}
void IOSChromeSyncClient::SetSyncApiComponentFactoryForTesting(
- std::unique_ptr<sync_driver::SyncApiComponentFactory> component_factory) {
+ std::unique_ptr<syncer::SyncApiComponentFactory> component_factory) {
component_factory_ = std::move(component_factory);
}
// static
void IOSChromeSyncClient::GetDeviceInfoTrackers(
- std::vector<const sync_driver::DeviceInfoTracker*>* trackers) {
+ std::vector<const syncer::DeviceInfoTracker*>* trackers) {
DCHECK(trackers);
std::vector<ios::ChromeBrowserState*> browser_state_list =
GetApplicationContext()
@@ -400,7 +400,7 @@ void IOSChromeSyncClient::GetDeviceInfoTrackers(
browser_sync::ProfileSyncService* profile_sync_service =
IOSChromeProfileSyncServiceFactory::GetForBrowserState(browser_state);
if (profile_sync_service != nullptr) {
- const sync_driver::DeviceInfoTracker* tracker =
+ const syncer::DeviceInfoTracker* tracker =
profile_sync_service->GetDeviceInfoTracker();
if (tracker != nullptr) {
trackers->push_back(tracker);
« no previous file with comments | « ios/chrome/browser/sync/ios_chrome_sync_client.h ('k') | ios/chrome/browser/sync/sync_observer_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698