diff options
author | stanisc <stanisc@chromium.org> | 2015-08-05 00:21:48 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-05 07:25:25 +0000 |
commit | a23b61eff1d3a2908a2e272c0d8ce89417168676 (patch) | |
tree | afdaf29280e664143e9f8b3dbcf178351f53f213 /components/sync_driver/non_blocking_data_type_controller_unittest.cc | |
parent | bd82a94bbc1738c60459dec25f4d9aa73f7baeab (diff) | |
download | chromium_src-a23b61eff1d3a2908a2e272c0d8ce89417168676.zip chromium_src-a23b61eff1d3a2908a2e272c0d8ce89417168676.tar.gz chromium_src-a23b61eff1d3a2908a2e272c0d8ce89417168676.tar.bz2 |
Sync: move v2 classes in chrome/internal_api to syncer_v2 namespace.
This changes namespace of some of internal API Bismarck classes from
syncer to syncer_v2 to make it easier to distinguish the new code from the
current Sync implementation. The change includes a bit of dependency
cleanup. This is a fairly trivial change, but a good way to see most of
Bismarck classes and how they are integrated in the rest of the code.
There are two more separate issues to make a similar namespace change
in sync/engine and components/sync_driver directories.
sync/engine
BUG=516414
Review URL: https://codereview.chromium.org/1266113004
Cr-Commit-Position: refs/heads/master@{#341862}
Diffstat (limited to 'components/sync_driver/non_blocking_data_type_controller_unittest.cc')
-rw-r--r-- | components/sync_driver/non_blocking_data_type_controller_unittest.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/components/sync_driver/non_blocking_data_type_controller_unittest.cc b/components/sync_driver/non_blocking_data_type_controller_unittest.cc index d5a4473..9f8ea44 100644 --- a/components/sync_driver/non_blocking_data_type_controller_unittest.cc +++ b/components/sync_driver/non_blocking_data_type_controller_unittest.cc @@ -19,8 +19,6 @@ namespace sync_driver { -class ModelTypeSyncWorker; - namespace { // A useless instance of ModelTypeSyncWorker. @@ -29,7 +27,7 @@ class NullModelTypeSyncWorker : public syncer::ModelTypeSyncWorker { NullModelTypeSyncWorker(); ~NullModelTypeSyncWorker() override; - void EnqueueForCommit(const syncer::CommitRequestDataList& list) override; + void EnqueueForCommit(const syncer_v2::CommitRequestDataList& list) override; }; NullModelTypeSyncWorker::NullModelTypeSyncWorker() { @@ -39,7 +37,7 @@ NullModelTypeSyncWorker::~NullModelTypeSyncWorker() { } void NullModelTypeSyncWorker::EnqueueForCommit( - const syncer::CommitRequestDataList& list) { + const syncer_v2::CommitRequestDataList& list) { NOTREACHED() << "Not implemented."; } @@ -70,7 +68,7 @@ class MockSyncContext { }; // A proxy to the MockSyncContext that implements SyncContextProxy. -class MockSyncContextProxy : public syncer::SyncContextProxy { +class MockSyncContextProxy : public syncer_v2::SyncContextProxy { public: MockSyncContextProxy( MockSyncContext* sync_context, @@ -83,8 +81,8 @@ class MockSyncContextProxy : public syncer::SyncContextProxy { void ConnectTypeToSync( syncer::ModelType type, - const syncer::DataTypeState& data_type_state, - const syncer::UpdateResponseDataList& saved_pending_updates, + const syncer_v2::DataTypeState& data_type_state, + const syncer_v2::UpdateResponseDataList& saved_pending_updates, const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_proxy) override { // Normally we'd use ThreadTaskRunnerHandle::Get() as the TaskRunner @@ -106,7 +104,7 @@ class MockSyncContextProxy : public syncer::SyncContextProxy { type)); } - scoped_ptr<SyncContextProxy> Clone() const override { + scoped_ptr<syncer_v2::SyncContextProxy> Clone() const override { return scoped_ptr<SyncContextProxy>(new MockSyncContextProxy( mock_sync_context_, model_task_runner_, sync_task_runner_)); } |