summaryrefslogtreecommitdiffstats
path: root/sync/api/fake_syncable_service.h
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-03 23:41:32 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-03 23:41:32 +0000
commita4a1476522880f416690e9357eedaa40b5ac8a99 (patch)
treebc2a8cc0a4942e16094f9a07859508583b03e169 /sync/api/fake_syncable_service.h
parentdade34b60910f213ae8f8fdd13709ec17581ef9e (diff)
downloadchromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.zip
chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.gz
chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.bz2
[Sync] Move ModelType and related classes to 'syncer' namespace
Previously they were in 'syncer::syncable'. Also remove aliases to those classes from 'syncable'. BUG=128060 TEST= TBR=pkasting@chromium.org,jhawkins@chromium.org, Review URL: https://chromiumcodereview.appspot.com/10696087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/api/fake_syncable_service.h')
-rw-r--r--sync/api/fake_syncable_service.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sync/api/fake_syncable_service.h b/sync/api/fake_syncable_service.h
index b89cf1f..22e1c8c 100644
--- a/sync/api/fake_syncable_service.h
+++ b/sync/api/fake_syncable_service.h
@@ -29,12 +29,12 @@ class FakeSyncableService : public SyncableService {
// SyncableService implementation.
virtual SyncError MergeDataAndStartSyncing(
- syncable::ModelType type,
+ syncer::ModelType type,
const SyncDataList& initial_sync_data,
scoped_ptr<SyncChangeProcessor> sync_processor,
scoped_ptr<SyncErrorFactory> sync_error_factory) OVERRIDE;
- virtual void StopSyncing(syncable::ModelType type) OVERRIDE;
- virtual SyncDataList GetAllSyncData(syncable::ModelType type) const OVERRIDE;
+ virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
+ virtual SyncDataList GetAllSyncData(syncer::ModelType type) const OVERRIDE;
virtual SyncError ProcessSyncChanges(
const tracked_objects::Location& from_here,
const SyncChangeList& change_list) OVERRIDE;
@@ -44,7 +44,7 @@ class FakeSyncableService : public SyncableService {
SyncError merge_data_and_start_syncing_error_;
SyncError process_sync_changes_error_;
bool syncing_;
- syncable::ModelType type_;
+ syncer::ModelType type_;
};
} // namespace syncer