[Sync] Convert syncable/ directory to ModelEnumSet

chrome/browser/sync/notifier/p2p_notifier_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 "chrome/browser/sync/notifier/p2p_notifier.h"
 
 #include <cstddef>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 57 matching lines @@
     p2p_notifier_->AddObserver(&mock_observer_);
   }
 
   virtual void TearDown() {
     p2p_notifier_->RemoveObserver(&mock_observer_);
     p2p_notifier_.reset();
     talk_mediator_ = NULL;
   }
 
   syncable::ModelTypePayloadMap MakePayloadMap(
-      const syncable::ModelTypeSet& types) {
-    return syncable::ModelTypePayloadMapFromBitSet(
-        syncable::ModelTypeBitSetFromSet(types), "");
+      syncable::ModelEnumSet types) {
+    return syncable::ModelTypePayloadMapFromEnumSet(types, "");
   }
 
   MessageLoop message_loop_;
   // Owned by |p2p_notifier_|.
   notifier::TalkMediator* talk_mediator_;
   scoped_ptr<P2PNotifier> p2p_notifier_;
   StrictMock<MockSyncNotifierObserver> mock_observer_;
 };
 
 TEST_F(P2PNotifierTest, P2PNotificationTarget) {
   for (int i = FIRST_NOTIFICATION_TARGET;
        i <= LAST_NOTIFICATION_TARGET; ++i) {
     P2PNotificationTarget target = static_cast<P2PNotificationTarget>(i);
     const std::string& target_str = P2PNotificationTargetToString(target);
     EXPECT_FALSE(target_str.empty());
     EXPECT_EQ(target, P2PNotificationTargetFromString(target_str));
   }
   EXPECT_EQ(NOTIFY_SELF, P2PNotificationTargetFromString("unknown"));
 }
 
 TEST_F(P2PNotifierTest, P2PNotificationDataIsTargeted) {
   {
     const P2PNotificationData notification_data(
-        "sender", NOTIFY_SELF, syncable::ModelTypeSet());
+        "sender", NOTIFY_SELF, syncable::ModelEnumSet());
     EXPECT_TRUE(notification_data.IsTargeted("sender"));
     EXPECT_FALSE(notification_data.IsTargeted("other1"));
     EXPECT_FALSE(notification_data.IsTargeted("other2"));
   }
   {
     const P2PNotificationData notification_data(
-        "sender", NOTIFY_OTHERS, syncable::ModelTypeSet());
+        "sender", NOTIFY_OTHERS, syncable::ModelEnumSet());
     EXPECT_FALSE(notification_data.IsTargeted("sender"));
     EXPECT_TRUE(notification_data.IsTargeted("other1"));
     EXPECT_TRUE(notification_data.IsTargeted("other2"));
   }
   {
     const P2PNotificationData notification_data(
-        "sender", NOTIFY_ALL, syncable::ModelTypeSet());
+        "sender", NOTIFY_ALL, syncable::ModelEnumSet());
     EXPECT_TRUE(notification_data.IsTargeted("sender"));
     EXPECT_TRUE(notification_data.IsTargeted("other1"));
     EXPECT_TRUE(notification_data.IsTargeted("other2"));
   }
 }
 
 TEST_F(P2PNotifierTest, P2PNotificationDataDefault) {
   const P2PNotificationData notification_data;
   EXPECT_TRUE(notification_data.IsTargeted(""));
   EXPECT_FALSE(notification_data.IsTargeted("other1"));
   EXPECT_FALSE(notification_data.IsTargeted("other2"));
-  EXPECT_TRUE(notification_data.GetChangedTypes().empty());
+  EXPECT_TRUE(notification_data.GetChangedTypes().Empty());
   const std::string& notification_data_str = notification_data.ToString();
   EXPECT_EQ(
       "{\"changedTypes\":[],\"notificationType\":\"notifySelf\","
       "\"senderId\":\"\"}", notification_data_str);
 
   P2PNotificationData notification_data_parsed;
   EXPECT_TRUE(notification_data_parsed.ResetFromString(notification_data_str));
   EXPECT_TRUE(notification_data.Equals(notification_data_parsed));
 }
 
 TEST_F(P2PNotifierTest, P2PNotificationDataNonDefault) {
-  syncable::ModelTypeSet changed_types;
-  changed_types.insert(syncable::BOOKMARKS);
-  changed_types.insert(syncable::THEMES);
+  const syncable::ModelEnumSet changed_types(
+      syncable::BOOKMARKS, syncable::THEMES);
   const P2PNotificationData notification_data(
       "sender", NOTIFY_ALL, changed_types);
   EXPECT_TRUE(notification_data.IsTargeted("sender"));
   EXPECT_TRUE(notification_data.IsTargeted("other1"));
   EXPECT_TRUE(notification_data.IsTargeted("other2"));
-  EXPECT_EQ(changed_types, notification_data.GetChangedTypes());
+  EXPECT_TRUE(notification_data.GetChangedTypes().Equals(changed_types));
   const std::string& notification_data_str = notification_data.ToString();
   EXPECT_EQ(
       "{\"changedTypes\":[\"Bookmarks\",\"Themes\"],"
       "\"notificationType\":\"notifyAll\","
       "\"senderId\":\"sender\"}", notification_data_str);
 
   P2PNotificationData notification_data_parsed;
   EXPECT_TRUE(notification_data_parsed.ResetFromString(notification_data_str));
   EXPECT_TRUE(notification_data.Equals(notification_data_parsed));
 }
 
 TEST_F(P2PNotifierTest, NotificationsBasic) {
-  syncable::ModelTypeSet enabled_types;
-  enabled_types.insert(syncable::BOOKMARKS);
-  enabled_types.insert(syncable::PREFERENCES);
+  syncable::ModelEnumSet enabled_types(
+      syncable::BOOKMARKS, syncable::PREFERENCES);
 
   EXPECT_CALL(mock_observer_, OnNotificationStateChange(true));
   EXPECT_CALL(mock_observer_,
               OnIncomingNotification(MakePayloadMap(enabled_types)));
 
   p2p_notifier_->SetUniqueId("sender");
   p2p_notifier_->UpdateCredentials("foo@bar.com", "fake_token");
   p2p_notifier_->UpdateEnabledTypes(enabled_types);
   // Sent with target NOTIFY_OTHERS so should not be propagated to
   // |mock_observer_|.
   {
-    syncable::ModelTypeSet changed_types;
-    enabled_types.insert(syncable::THEMES);
-    enabled_types.insert(syncable::APPS);
+    syncable::ModelEnumSet changed_types(
+        syncable::THEMES, syncable::APPS);
     p2p_notifier_->SendNotification(changed_types);
   }
 }
 
 TEST_F(P2PNotifierTest, SendNotificationData) {
-  syncable::ModelTypeSet enabled_types;
-  enabled_types.insert(syncable::BOOKMARKS);
-  enabled_types.insert(syncable::PREFERENCES);
+  syncable::ModelEnumSet enabled_types(
+      syncable::BOOKMARKS, syncable::PREFERENCES);
 
-  syncable::ModelTypeSet changed_types;
-  changed_types.insert(syncable::THEMES);
-  changed_types.insert(syncable::APPS);
+  syncable::ModelEnumSet changed_types(
+      syncable::THEMES, syncable::APPS);
 
   const syncable::ModelTypePayloadMap& changed_payload_map =
       MakePayloadMap(changed_types);
 
   EXPECT_CALL(mock_observer_, OnNotificationStateChange(true));
   EXPECT_CALL(mock_observer_,
               OnIncomingNotification(MakePayloadMap(enabled_types)));
 
   p2p_notifier_->SetUniqueId("sender");
   p2p_notifier_->UpdateCredentials("foo@bar.com", "fake_token");
@@ skipping 10 matching lines @@
       P2PNotificationData("sender", NOTIFY_SELF, changed_types));
 
   // Should be dropped.
   Mock::VerifyAndClearExpectations(&mock_observer_);
   p2p_notifier_->SendNotificationDataForTest(
       P2PNotificationData("sender2", NOTIFY_SELF, changed_types));
 
   // Should be dropped.
   Mock::VerifyAndClearExpectations(&mock_observer_);
   p2p_notifier_->SendNotificationDataForTest(
-      P2PNotificationData("sender", NOTIFY_SELF, syncable::ModelTypeSet()));
+      P2PNotificationData("sender", NOTIFY_SELF, syncable::ModelEnumSet()));
 
   // Should be dropped.
   p2p_notifier_->SendNotificationDataForTest(
       P2PNotificationData("sender", NOTIFY_OTHERS, changed_types));
 
   // Should be propagated.
   Mock::VerifyAndClearExpectations(&mock_observer_);
   EXPECT_CALL(mock_observer_, OnIncomingNotification(changed_payload_map));
   p2p_notifier_->SendNotificationDataForTest(
       P2PNotificationData("sender2", NOTIFY_OTHERS, changed_types));
 
   // Should be dropped.
   Mock::VerifyAndClearExpectations(&mock_observer_);
   p2p_notifier_->SendNotificationDataForTest(
-      P2PNotificationData("sender2", NOTIFY_OTHERS, syncable::ModelTypeSet()));
+      P2PNotificationData("sender2", NOTIFY_OTHERS, syncable::ModelEnumSet()));
 
   // Should be propagated.
   Mock::VerifyAndClearExpectations(&mock_observer_);
   EXPECT_CALL(mock_observer_, OnIncomingNotification(changed_payload_map));
   p2p_notifier_->SendNotificationDataForTest(
       P2PNotificationData("sender", NOTIFY_ALL, changed_types));
 
   // Should be propagated.
   Mock::VerifyAndClearExpectations(&mock_observer_);
   EXPECT_CALL(mock_observer_, OnIncomingNotification(changed_payload_map));
   p2p_notifier_->SendNotificationDataForTest(
       P2PNotificationData("sender2", NOTIFY_ALL, changed_types));
 
   // Should be dropped.
   Mock::VerifyAndClearExpectations(&mock_observer_);
   p2p_notifier_->SendNotificationDataForTest(
-      P2PNotificationData("sender2", NOTIFY_ALL, syncable::ModelTypeSet()));
+      P2PNotificationData("sender2", NOTIFY_ALL, syncable::ModelEnumSet()));
 }
 
 }  // namespace
 
 }  // namespace sync_notifier