[Sync] Convert syncable/ directory to ModelEnumSet

chrome/browser/sync/internal_api/syncapi_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.
 
 // Unit tests for the SyncApi. Note that a lot of the underlying
 // functionality is provided by the Syncable layer, which has its own
 // unit tests. We'll test SyncApi specific things in this harness.
 
 #include <cstddef>
 #include <map>
@@ skipping 629 matching lines @@
 
 class SyncNotifierMock : public sync_notifier::SyncNotifier {
  public:
   MOCK_METHOD1(AddObserver, void(sync_notifier::SyncNotifierObserver*));
   MOCK_METHOD1(RemoveObserver, void(sync_notifier::SyncNotifierObserver*));
   MOCK_METHOD1(SetUniqueId, void(const std::string&));
   MOCK_METHOD1(SetState, void(const std::string&));
   MOCK_METHOD2(UpdateCredentials,
                void(const std::string&, const std::string&));
   MOCK_METHOD1(UpdateEnabledTypes,
-               void(const syncable::ModelTypeSet&));
-  MOCK_METHOD1(SendNotification, void(const syncable::ModelTypeSet&));
+               void(syncable::ModelEnumSet));
+  MOCK_METHOD1(SendNotification, void(syncable::ModelEnumSet));
 };
 
 class SyncManagerTest : public testing::Test,
                         public ModelSafeWorkerRegistrar,
                         public SyncManager::ChangeDelegate {
  protected:
   SyncManagerTest()
       : ui_thread_(BrowserThread::UI, &ui_loop_),
         sync_notifier_mock_(NULL),
         sync_manager_("Test sync manager"),
@@ skipping 132 matching lines @@
     EXPECT_EQ(NULL, sync_notifier_observer_);
     sync_notifier_observer_ = sync_notifier_observer;
   }
 
   void SyncNotifierRemoveObserver(
       sync_notifier::SyncNotifierObserver* sync_notifier_observer) {
     EXPECT_EQ(sync_notifier_observer_, sync_notifier_observer);
     sync_notifier_observer_ = NULL;
   }
 
-  void SyncNotifierUpdateEnabledTypes(
-      const syncable::ModelTypeSet& types) {
+  void SyncNotifierUpdateEnabledTypes(syncable::ModelEnumSet types) {
     ModelSafeRoutingInfo routes;
     GetModelSafeRoutingInfo(&routes);
-    syncable::ModelTypeSet expected_types;
-    for (ModelSafeRoutingInfo::const_iterator it = routes.begin();
-         it != routes.end(); ++it) {
-      expected_types.insert(it->first);
-    }
-    EXPECT_EQ(expected_types, types);
+    const syncable::ModelEnumSet expected_types =
+        GetRoutingInfoTypes(routes);
+    EXPECT_TRUE(types.Equals(expected_types));
     ++update_enabled_types_call_count_;
   }
 
   void PumpLoop() {
     ui_loop_.RunAllPending();
   }
 
   void SendJsMessage(const std::string& name, const JsArgList& args,
                      const WeakHandle<JsReplyHandler>& reply_handler) {
     js_backend_.Call(FROM_HERE, &JsBackend::ProcessJsMessage,
@@ skipping 27 matching lines @@
 };
 
 TEST_F(SyncManagerTest, UpdateEnabledTypes) {
   EXPECT_EQ(1, update_enabled_types_call_count_);
   // Triggers SyncNotifierUpdateEnabledTypes.
   sync_manager_.UpdateEnabledTypes();
   EXPECT_EQ(2, update_enabled_types_call_count_);
 }
 
 TEST_F(SyncManagerTest, DoNotSyncTabsInNigoriNode) {
-  syncable::ModelTypeSet encrypted_types;
-  encrypted_types.insert(syncable::TYPED_URLS);
+  syncable::ModelEnumSet encrypted_types(syncable::TYPED_URLS);
   sync_manager_.MaybeSetSyncTabsInNigoriNode(encrypted_types);
 
   ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
   ReadNode node(&trans);
   ASSERT_TRUE(node.InitByIdLookup(GetIdForDataType(syncable::NIGORI)));
   EXPECT_FALSE(node.GetNigoriSpecifics().sync_tabs());
 }
 
 TEST_F(SyncManagerTest, SyncTabsInNigoriNode) {
-  syncable::ModelTypeSet encrypted_types;
-  encrypted_types.insert(syncable::SESSIONS);
+  syncable::ModelEnumSet encrypted_types(syncable::SESSIONS);
   sync_manager_.MaybeSetSyncTabsInNigoriNode(encrypted_types);
 
   ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare());
   ReadNode node(&trans);
   ASSERT_TRUE(node.InitByIdLookup(GetIdForDataType(syncable::NIGORI)));
   EXPECT_TRUE(node.GetNigoriSpecifics().sync_tabs());
 }
 
 TEST_F(SyncManagerTest, ProcessJsMessage) {
   const JsArgList kNoArgs;
@@ skipping 273 matching lines @@
   sync_manager_.TriggerOnNotificationStateChangeForTest(true);
   sync_manager_.TriggerOnNotificationStateChangeForTest(false);
 
   // Should trigger the replies.
   PumpLoop();
 }
 
 TEST_F(SyncManagerTest, OnIncomingNotification) {
   StrictMock<MockJsEventHandler> event_handler;
 
-  const syncable::ModelTypeBitSet empty_model_types;
-  syncable::ModelTypeBitSet model_types;
-  model_types.set(syncable::BOOKMARKS);
-  model_types.set(syncable::THEMES);
+  const syncable::ModelEnumSet empty_model_types;
+  syncable::ModelEnumSet model_types(syncable::BOOKMARKS, syncable::THEMES);
 
   // Build expected_args to have a single argument with the string
   // equivalents of model_types.
   DictionaryValue expected_details;
   {
     ListValue* model_type_list = new ListValue();
     expected_details.Set("changedTypes", model_type_list);
-    for (int i = syncable::FIRST_REAL_MODEL_TYPE;
-         i < syncable::MODEL_TYPE_COUNT; ++i) {
-      if (model_types[i]) {
-        model_type_list->Append(
-            Value::CreateStringValue(
-                syncable::ModelTypeToString(
-                    syncable::ModelTypeFromInt(i))));
-      }
+    for (syncable::ModelEnumSet::Iterator it = model_types.First();
+         it.Good(); it.Inc()) {
+      model_type_list->Append(
+          Value::CreateStringValue(
+              syncable::ModelTypeToString(it.Get())));
     }
   }
 
   EXPECT_CALL(event_handler,
               HandleJsEvent("onIncomingNotification",
                            HasDetailsAsDictionary(expected_details)));
 
   sync_manager_.TriggerOnIncomingNotificationForTest(empty_model_types);
   sync_manager_.TriggerOnIncomingNotificationForTest(model_types);
 
@@ skipping 335 matching lines @@
     EXPECT_EQ(syncable::BOOKMARKS, node2.GetModelType());
     // We should de-canonicalize the title in GetTitle(), but the title in the
     // specifics should be stored in the server legal form.
     EXPECT_EQ(raw_title2, node2.GetTitle());
     EXPECT_EQ(title2, node2.GetBookmarkSpecifics().title());
     EXPECT_EQ(url2, node2.GetBookmarkSpecifics().url());
   }
 }
 
 }  // namespace browser_sync