| Index: components/sync/engine_impl/syncer_unittest.cc
|
| diff --git a/components/sync/engine_impl/syncer_unittest.cc b/components/sync/engine_impl/syncer_unittest.cc
|
| index 05638f5f72d84eeec120c392003a0c829308a8cc..84050be46f5ffac87b9f9f34132f0db5c42a1b1b 100644
|
| --- a/components/sync/engine_impl/syncer_unittest.cc
|
| +++ b/components/sync/engine_impl/syncer_unittest.cc
|
| @@ -77,24 +77,24 @@ using std::vector;
|
|
|
| namespace syncer {
|
|
|
| -using syncable::BaseTransaction;
|
| -using syncable::CountEntriesWithName;
|
| -using syncable::Directory;
|
| -using syncable::Entry;
|
| -using syncable::GetFirstEntryWithName;
|
| -using syncable::GetOnlyEntryWithName;
|
| -using syncable::Id;
|
| -using syncable::kEncryptedString;
|
| -using syncable::MutableEntry;
|
| -using syncable::WriteTransaction;
|
| -
|
| -using syncable::CREATE;
|
| -using syncable::GET_BY_HANDLE;
|
| -using syncable::GET_BY_ID;
|
| -using syncable::GET_BY_CLIENT_TAG;
|
| -using syncable::GET_BY_SERVER_TAG;
|
| -using syncable::GET_TYPE_ROOT;
|
| -using syncable::UNITTEST;
|
| +using syncer::syncable::BaseTransaction;
|
| +using syncer::syncable::CountEntriesWithName;
|
| +using syncer::syncable::Directory;
|
| +using syncer::syncable::Entry;
|
| +using syncer::syncable::GetFirstEntryWithName;
|
| +using syncer::syncable::GetOnlyEntryWithName;
|
| +using syncer::syncable::Id;
|
| +using syncer::syncable::kEncryptedString;
|
| +using syncer::syncable::MutableEntry;
|
| +using syncer::syncable::WriteTransaction;
|
| +
|
| +using syncer::syncable::CREATE;
|
| +using syncer::syncable::GET_BY_HANDLE;
|
| +using syncer::syncable::GET_BY_ID;
|
| +using syncer::syncable::GET_BY_CLIENT_TAG;
|
| +using syncer::syncable::GET_BY_SERVER_TAG;
|
| +using syncer::syncable::GET_TYPE_ROOT;
|
| +using syncer::syncable::UNITTEST;
|
|
|
| namespace {
|
|
|
| @@ -109,11 +109,11 @@ class TypeDebugInfoCache : public TypeDebugInfoObserver {
|
| StatusCounters GetLatestStatusCounters(ModelType type) const;
|
|
|
| // TypeDebugInfoObserver implementation.
|
| - void OnCommitCountersUpdated(syncer::ModelType type,
|
| + void OnCommitCountersUpdated(ModelType type,
|
| const CommitCounters& counters) override;
|
| - void OnUpdateCountersUpdated(syncer::ModelType type,
|
| + void OnUpdateCountersUpdated(ModelType type,
|
| const UpdateCounters& counters) override;
|
| - void OnStatusCountersUpdated(syncer::ModelType type,
|
| + void OnStatusCountersUpdated(ModelType type,
|
| const StatusCounters& counters) override;
|
|
|
| private:
|
| @@ -160,19 +160,19 @@ StatusCounters TypeDebugInfoCache::GetLatestStatusCounters(
|
| }
|
|
|
| void TypeDebugInfoCache::OnCommitCountersUpdated(
|
| - syncer::ModelType type,
|
| + ModelType type,
|
| const CommitCounters& counters) {
|
| commit_counters_map_[type] = counters;
|
| }
|
|
|
| void TypeDebugInfoCache::OnUpdateCountersUpdated(
|
| - syncer::ModelType type,
|
| + ModelType type,
|
| const UpdateCounters& counters) {
|
| update_counters_map_[type] = counters;
|
| }
|
|
|
| void TypeDebugInfoCache::OnStatusCountersUpdated(
|
| - syncer::ModelType type,
|
| + ModelType type,
|
| const StatusCounters& counters) {
|
| status_counters_map_[type] = counters;
|
| }
|
|
|