summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-10 01:00:54 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-10 01:00:54 +0000
commit71229fa8616c36c326dab127564922b14e443fa9 (patch)
tree957775bd807925f58c05ae54be374489a10b6900 /chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
parent6736d2d93e021d9889d7d534f4e8865cf81cb882 (diff)
downloadchromium_src-71229fa8616c36c326dab127564922b14e443fa9.zip
chromium_src-71229fa8616c36c326dab127564922b14e443fa9.tar.gz
chromium_src-71229fa8616c36c326dab127564922b14e443fa9.tar.bz2
[Sync] Replace all instances of ModelTypeSet with ModelEnumSet
Also change some functions to return ModelEnumSets directly instead of taking a pointer value. BUG=79970 TEST= Review URL: http://codereview.chromium.org/8851006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/js/js_sync_manager_observer_unittest.cc')
-rw-r--r--chrome/browser/sync/js/js_sync_manager_observer_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc b/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
index 8d0981b..b12af66 100644
--- a/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
+++ b/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
@@ -200,12 +200,12 @@ 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;
+ syncable::ModelEnumSet encrypted_types;
for (int i = syncable::FIRST_REAL_MODEL_TYPE;
i < syncable::MODEL_TYPE_COUNT; ++i) {
syncable::ModelType type = syncable::ModelTypeFromInt(i);
- encrypted_types.insert(type);
+ encrypted_types.Put(type);
encrypted_type_values->Append(Value::CreateStringValue(
syncable::ModelTypeToString(type)));
}