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

Unified Diff: sync/engine/sync_scheduler_whitebox_unittest.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 6 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 | « sync/engine/sync_scheduler_unittest.cc ('k') | sync/engine/syncer_proto_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/sync_scheduler_whitebox_unittest.cc
diff --git a/sync/engine/sync_scheduler_whitebox_unittest.cc b/sync/engine/sync_scheduler_whitebox_unittest.cc
index 7fb53be79dbd5954bbf6a919502f1832b8857309..20e127705c8296ab9797a319fb06bf1e95ea445e 100644
--- a/sync/engine/sync_scheduler_whitebox_unittest.cc
+++ b/sync/engine/sync_scheduler_whitebox_unittest.cc
@@ -32,8 +32,8 @@ class SyncSchedulerWhiteboxTest : public testing::Test {
Syncer* syncer = new Syncer();
ModelSafeRoutingInfo routes;
- routes[syncable::BOOKMARKS] = GROUP_UI;
- routes[syncable::NIGORI] = GROUP_PASSIVE;
+ routes[syncer::BOOKMARKS] = GROUP_UI;
+ routes[syncer::NIGORI] = GROUP_PASSIVE;
workers_.push_back(make_scoped_refptr(new FakeModelWorker(GROUP_UI)));
workers_.push_back(make_scoped_refptr(new FakeModelWorker(GROUP_PASSIVE)));
@@ -142,15 +142,15 @@ TEST_F(SyncSchedulerWhiteboxTest, SaveNudge) {
TEST_F(SyncSchedulerWhiteboxTest, SaveNudgeWhileTypeThrottled) {
InitializeSyncerOnNormalMode();
- syncable::ModelTypeSet types;
- types.Put(syncable::BOOKMARKS);
+ syncer::ModelTypeSet types;
+ types.Put(syncer::BOOKMARKS);
// Mark bookmarks as throttled.
context()->throttled_data_type_tracker()->SetUnthrottleTime(
types, base::TimeTicks::Now() + base::TimeDelta::FromHours(2));
- syncable::ModelTypePayloadMap types_with_payload;
- types_with_payload[syncable::BOOKMARKS] = "";
+ syncer::ModelTypePayloadMap types_with_payload;
+ types_with_payload[syncer::BOOKMARKS] = "";
SyncSourceInfo info(GetUpdatesCallerInfo::LOCAL, types_with_payload);
SyncSession* s = scheduler_->CreateSyncSession(info);
« no previous file with comments | « sync/engine/sync_scheduler_unittest.cc ('k') | sync/engine/syncer_proto_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698