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

Unified Diff: components/sync/driver/fake_sync_client.cc

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 | « components/sync/driver/fake_sync_client.h ('k') | components/sync/driver/fake_sync_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/driver/fake_sync_client.cc
diff --git a/components/sync/driver/fake_sync_client.cc b/components/sync/driver/fake_sync_client.cc
index be159126e80108895387e6a56812146973d8b133..a3df56734fcc28234fe8edddde69488831c7ddf2 100644
--- a/components/sync/driver/fake_sync_client.cc
+++ b/components/sync/driver/fake_sync_client.cc
@@ -10,13 +10,13 @@
#include "components/sync/driver/fake_sync_service.h"
#include "components/sync/driver/sync_prefs.h"
-namespace sync_driver {
+namespace syncer {
namespace {
void DummyRegisterPlatformTypesCallback(SyncService* sync_service,
- syncer::ModelTypeSet,
- syncer::ModelTypeSet) {}
+ ModelTypeSet,
+ ModelTypeSet) {}
} // namespace
@@ -25,15 +25,15 @@ FakeSyncClient::FakeSyncClient()
factory_(nullptr),
sync_service_(base::MakeUnique<FakeSyncService>()) {
// Register sync preferences and set them to "Sync everything" state.
- sync_driver::SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
- sync_driver::SyncPrefs sync_prefs(GetPrefService());
+ SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
+ SyncPrefs sync_prefs(GetPrefService());
sync_prefs.SetFirstSetupComplete();
sync_prefs.SetKeepEverythingSynced(true);
}
FakeSyncClient::FakeSyncClient(SyncApiComponentFactory* factory)
: factory_(factory), sync_service_(base::MakeUnique<FakeSyncService>()) {
- sync_driver::SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
+ SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
}
FakeSyncClient::~FakeSyncClient() {}
@@ -64,7 +64,7 @@ base::Closure FakeSyncClient::GetPasswordStateChangedCallback() {
return base::Bind(&base::DoNothing);
}
-sync_driver::SyncApiComponentFactory::RegisterDataTypesMethod
+SyncApiComponentFactory::RegisterDataTypesMethod
FakeSyncClient::GetRegisterPlatformTypesCallback() {
return base::Bind(&DummyRegisterPlatformTypesCallback);
}
@@ -81,39 +81,36 @@ invalidation::InvalidationService* FakeSyncClient::GetInvalidationService() {
return nullptr;
}
-scoped_refptr<syncer::ExtensionsActivity>
-FakeSyncClient::GetExtensionsActivity() {
- return scoped_refptr<syncer::ExtensionsActivity>();
+scoped_refptr<ExtensionsActivity> FakeSyncClient::GetExtensionsActivity() {
+ return scoped_refptr<ExtensionsActivity>();
}
sync_sessions::SyncSessionsClient* FakeSyncClient::GetSyncSessionsClient() {
return nullptr;
}
-base::WeakPtr<syncer::SyncableService>
-FakeSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
- return base::WeakPtr<syncer::SyncableService>();
+base::WeakPtr<SyncableService> FakeSyncClient::GetSyncableServiceForType(
+ ModelType type) {
+ return base::WeakPtr<SyncableService>();
}
-base::WeakPtr<syncer_v2::ModelTypeService>
-FakeSyncClient::GetModelTypeServiceForType(syncer::ModelType type) {
+base::WeakPtr<ModelTypeService> FakeSyncClient::GetModelTypeServiceForType(
+ ModelType type) {
return model_type_service_->AsWeakPtr();
}
-scoped_refptr<syncer::ModelSafeWorker>
-FakeSyncClient::CreateModelWorkerForGroup(
- syncer::ModelSafeGroup group,
- syncer::WorkerLoopDestructionObserver* observer) {
- return scoped_refptr<syncer::ModelSafeWorker>();
+scoped_refptr<ModelSafeWorker> FakeSyncClient::CreateModelWorkerForGroup(
+ ModelSafeGroup group,
+ WorkerLoopDestructionObserver* observer) {
+ return scoped_refptr<ModelSafeWorker>();
}
SyncApiComponentFactory* FakeSyncClient::GetSyncApiComponentFactory() {
return factory_;
}
-void FakeSyncClient::SetModelTypeService(
- syncer_v2::ModelTypeService* model_type_service) {
+void FakeSyncClient::SetModelTypeService(ModelTypeService* model_type_service) {
model_type_service_ = model_type_service;
}
-} // namespace sync_driver
+} // namespace syncer
« no previous file with comments | « components/sync/driver/fake_sync_client.h ('k') | components/sync/driver/fake_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698