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

Unified Diff: sync/sessions/session_state_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/sessions/ordered_commit_set_unittest.cc ('k') | sync/sessions/status_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/session_state_unittest.cc
diff --git a/sync/sessions/session_state_unittest.cc b/sync/sessions/session_state_unittest.cc
index 3d1b07c1eae74c5dfdd9f7bc9a3e5a1dcd34f446..b227ac7dd31d51380179ce3c3933b6db9fb9ff38 100644
--- a/sync/sessions/session_state_unittest.cc
+++ b/sync/sessions/session_state_unittest.cc
@@ -30,11 +30,11 @@ class SessionStateTest : public testing::Test {};
TEST_F(SessionStateTest, SyncSourceInfoToValue) {
sync_pb::GetUpdatesCallerInfo::GetUpdatesSource updates_source =
sync_pb::GetUpdatesCallerInfo::PERIODIC;
- syncable::ModelTypePayloadMap types;
- types[syncable::PREFERENCES] = "preferencespayload";
- types[syncable::EXTENSIONS] = "";
+ syncer::ModelTypePayloadMap types;
+ types[syncer::PREFERENCES] = "preferencespayload";
+ types[syncer::EXTENSIONS] = "";
scoped_ptr<DictionaryValue> expected_types_value(
- syncable::ModelTypePayloadMapToValue(types));
+ syncer::ModelTypePayloadMapToValue(types));
SyncSourceInfo source_info(updates_source, types);
@@ -57,16 +57,16 @@ TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
const bool kIsShareUsable = true;
- const syncable::ModelTypeSet initial_sync_ended(
- syncable::BOOKMARKS, syncable::PREFERENCES);
+ const syncer::ModelTypeSet initial_sync_ended(
+ syncer::BOOKMARKS, syncer::PREFERENCES);
scoped_ptr<ListValue> expected_initial_sync_ended_value(
- syncable::ModelTypeSetToValue(initial_sync_ended));
+ syncer::ModelTypeSetToValue(initial_sync_ended));
- syncable::ModelTypePayloadMap download_progress_markers;
- download_progress_markers[syncable::BOOKMARKS] = "test";
- download_progress_markers[syncable::APPS] = "apps";
+ syncer::ModelTypePayloadMap download_progress_markers;
+ download_progress_markers[syncer::BOOKMARKS] = "test";
+ download_progress_markers[syncer::APPS] = "apps";
scoped_ptr<DictionaryValue> expected_download_progress_markers_value(
- syncable::ModelTypePayloadMapToValue(download_progress_markers));
+ syncer::ModelTypePayloadMapToValue(download_progress_markers));
const bool kHasMoreToSync = false;
const bool kIsSilenced = true;
« no previous file with comments | « sync/sessions/ordered_commit_set_unittest.cc ('k') | sync/sessions/status_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698