diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 23:41:32 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 23:41:32 +0000 |
| commit | a4a1476522880f416690e9357eedaa40b5ac8a99 (patch) | |
| tree | bc2a8cc0a4942e16094f9a07859508583b03e169 /sync/internal_api/js_sync_manager_observer_unittest.cc | |
| parent | dade34b60910f213ae8f8fdd13709ec17581ef9e (diff) | |
| download | chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.zip chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.gz chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.bz2 | |
[Sync] Move ModelType and related classes to 'syncer' namespace
Previously they were in 'syncer::syncable'.
Also remove aliases to those classes from 'syncable'.
BUG=128060
TEST=
TBR=pkasting@chromium.org,jhawkins@chromium.org,
Review URL: https://chromiumcodereview.appspot.com/10696087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/js_sync_manager_observer_unittest.cc')
| -rw-r--r-- | sync/internal_api/js_sync_manager_observer_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sync/internal_api/js_sync_manager_observer_unittest.cc b/sync/internal_api/js_sync_manager_observer_unittest.cc index f0b9e85..8861311 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_, |