[Sync] Convert syncable/ directory to ModelEnumSet

chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/message_loop.h"
 #include "chrome/browser/sync/notifier/chrome_invalidation_client.h"
 #include "chrome/browser/sync/notifier/state_writer.h"
 #include "chrome/browser/sync/syncable/model_type.h"
@@ skipping 124 matching lines @@
 
 namespace {
 
 syncable::ModelTypePayloadMap MakeMap(syncable::ModelType model_type,
                                       const std::string& payload) {
   syncable::ModelTypePayloadMap type_payloads;
   type_payloads[model_type] = payload;
   return type_payloads;
 }
 
-syncable::ModelTypePayloadMap MakeMapFromSet(syncable::ModelTypeSet types,
+syncable::ModelTypePayloadMap MakeMapFromSet(syncable::ModelEnumSet types,
                                              const std::string& payload) {
-  syncable::ModelTypePayloadMap type_payloads;
-  for (syncable::ModelTypeSet::const_iterator it = types.begin();
-       it != types.end(); ++it) {
-    type_payloads[*it] = payload;
-  }
-  return type_payloads;
+  return syncable::ModelTypePayloadMapFromEnumSet(types, payload);
 }
 
 }  // namespace
 
 TEST_F(ChromeInvalidationClientTest, InvalidateBadObjectId) {
-  syncable::ModelTypeSet types;
-  types.insert(syncable::BOOKMARKS);
-  types.insert(syncable::APPS);
+  syncable::ModelEnumSet types(syncable::BOOKMARKS, syncable::APPS);
   client_.RegisterTypes(types);
   EXPECT_CALL(mock_listener_, OnInvalidate(MakeMapFromSet(types, "")));
   FireInvalidate("bad", 1, NULL);
   message_loop_.RunAllPending();
 }
 
 TEST_F(ChromeInvalidationClientTest, InvalidateNoPayload) {
   EXPECT_CALL(mock_listener_,
               OnInvalidate(MakeMap(syncable::BOOKMARKS, "")));
   EXPECT_CALL(mock_invalidation_version_tracker_,
@@ skipping 32 matching lines @@
       .Times(2);
 
   // Should trigger twice.
   FireInvalidateUnknownVersion("EXTENSION");
   FireInvalidateUnknownVersion("EXTENSION");
 }
 
 TEST_F(ChromeInvalidationClientTest, InvalidateVersionMultipleTypes) {
   using ::testing::Mock;
 
-  syncable::ModelTypeSet types;
-  types.insert(syncable::BOOKMARKS);
-  types.insert(syncable::APPS);
+  syncable::ModelEnumSet types(syncable::BOOKMARKS, syncable::APPS);
   client_.RegisterTypes(types);
 
   EXPECT_CALL(mock_listener_,
               OnInvalidate(MakeMap(syncable::APPS, "")));
   EXPECT_CALL(mock_listener_,
               OnInvalidate(MakeMap(syncable::EXTENSIONS, "")));
 
   EXPECT_CALL(mock_invalidation_version_tracker_,
               SetMaxVersion(syncable::APPS, 3));
   EXPECT_CALL(mock_invalidation_version_tracker_,
@@ skipping 34 matching lines @@
   EXPECT_CALL(mock_invalidation_version_tracker_,
               SetMaxVersion(syncable::APPS, 4));
 
   // Should trigger all three.
   FireInvalidate("PREFERENCE", 5, NULL);
   FireInvalidate("EXTENSION", 3, NULL);
   FireInvalidate("APP", 4, NULL);
 }
 
 TEST_F(ChromeInvalidationClientTest, InvalidateAll) {
-  syncable::ModelTypeSet types;
-  types.insert(syncable::PREFERENCES);
-  types.insert(syncable::EXTENSIONS);
+  syncable::ModelEnumSet types(syncable::PREFERENCES, syncable::EXTENSIONS);
   client_.RegisterTypes(types);
   EXPECT_CALL(mock_listener_, OnInvalidate(MakeMapFromSet(types, "")));
   FireInvalidateAll();
 }
 
 TEST_F(ChromeInvalidationClientTest, RegisterTypes) {
-  syncable::ModelTypeSet types;
-  types.insert(syncable::PREFERENCES);
-  types.insert(syncable::EXTENSIONS);
+  syncable::ModelEnumSet types(syncable::PREFERENCES, syncable::EXTENSIONS);
   client_.RegisterTypes(types);
   // Registered types should be preserved across Stop/Start.
   TearDown();
   SetUp();
   EXPECT_CALL(mock_listener_, OnInvalidate(MakeMapFromSet(types, "")));
   FireInvalidateAll();
 }
 
 // TODO(akalin): Flesh out unit tests.
 
 }  // namespace sync_notifier