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

Unified Diff: sync/internal_api/js_sync_manager_observer_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/internal_api/js_sync_manager_observer.cc ('k') | sync/internal_api/public/base/model_type.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/js_sync_manager_observer_unittest.cc
diff --git a/sync/internal_api/js_sync_manager_observer_unittest.cc b/sync/internal_api/js_sync_manager_observer_unittest.cc
index f0b9e85b88f9ac96d7584af75a1a7f4383801835..8861311675ca94c57e03a14cad84faeeb4b6795c 100644
--- a/sync/internal_api/js_sync_manager_observer_unittest.cc
+++ b/sync/internal_api/js_sync_manager_observer_unittest.cc
@@ -64,10 +64,10 @@ TEST_F(JsSyncManagerObserverTest, NoArgNotifiations) {
}
TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) {
- syncable::ModelTypePayloadMap download_progress_markers;
+ syncer::ModelTypePayloadMap download_progress_markers;
sessions::SyncSessionSnapshot snapshot(sessions::ModelNeutralState(),
false,
- syncable::ModelTypeSet(),
+ syncer::ModelTypeSet(),
download_progress_markers,
false,
true,
@@ -186,14 +186,14 @@ TEST_F(JsSyncManagerObserverTest, OnEncryptedTypesChanged) {
const bool encrypt_everything = false;
expected_details.Set("encryptedTypes", encrypted_type_values);
expected_details.SetBoolean("encryptEverything", encrypt_everything);
- syncable::ModelTypeSet encrypted_types;
+ syncer::ModelTypeSet encrypted_types;
- for (int i = syncable::FIRST_REAL_MODEL_TYPE;
- i < syncable::MODEL_TYPE_COUNT; ++i) {
- syncable::ModelType type = syncable::ModelTypeFromInt(i);
+ for (int i = syncer::FIRST_REAL_MODEL_TYPE;
+ i < syncer::MODEL_TYPE_COUNT; ++i) {
+ syncer::ModelType type = syncer::ModelTypeFromInt(i);
encrypted_types.Put(type);
encrypted_type_values->Append(Value::CreateStringValue(
- syncable::ModelTypeToString(type)));
+ syncer::ModelTypeToString(type)));
}
EXPECT_CALL(mock_js_event_handler_,
« no previous file with comments | « sync/internal_api/js_sync_manager_observer.cc ('k') | sync/internal_api/public/base/model_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698