[Sync] Rename ModelEnumSet to ModelTypeSet

chrome/browser/sync/notifier/registration_manager_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/registration_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
 #include <deque>
@@ skipping 77 matching lines @@
   virtual void Unregister(const invalidation::ObjectId& oid) {
     syncable::ModelType model_type = ObjectIdToModelType(oid);
     EXPECT_TRUE(registered_types_.Has(model_type));
     registered_types_.Remove(model_type);
   }
 
   virtual void Unregister(const std::vector<invalidation::ObjectId>& oids) {
     // Unused for now.
   }
 
-  const syncable::ModelEnumSet GetRegisteredTypes() const {
+  const syncable::ModelTypeSet GetRegisteredTypes() const {
     return registered_types_;
   }
 
  private:
-  syncable::ModelEnumSet registered_types_;
+  syncable::ModelTypeSet registered_types_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeInvalidationClient);
 };
 
 const syncable::ModelType kModelTypes[] = {
   syncable::BOOKMARKS,
   syncable::PREFERENCES,
   syncable::THEMES,
   syncable::AUTOFILL,
   syncable::EXTENSIONS,
 };
 const size_t kModelTypeCount = arraysize(kModelTypes);
 
-syncable::ModelEnumSet FromPtr(
+syncable::ModelTypeSet FromPtr(
     const syncable::ModelType* types, size_t count) {
-  syncable::ModelEnumSet type_set;
+  syncable::ModelTypeSet type_set;
   for (size_t i = 0; i < count; ++i) {
     type_set.Put(types[i]);
   }
   return type_set;
 }
 
 void ExpectPendingRegistrations(
-    syncable::ModelEnumSet expected_pending_types,
+    syncable::ModelTypeSet expected_pending_types,
     double expected_delay_seconds,
     const RegistrationManager::PendingRegistrationMap& pending_registrations) {
-  syncable::ModelEnumSet pending_types;
+  syncable::ModelTypeSet pending_types;
   for (RegistrationManager::PendingRegistrationMap::const_iterator it =
            pending_registrations.begin(); it != pending_registrations.end();
        ++it) {
     SCOPED_TRACE(syncable::ModelTypeToString(it->first));
     pending_types.Put(it->first);
     base::TimeDelta offset =
         it->second.last_registration_request -
         it->second.registration_attempt;
     base::TimeDelta expected_delay =
         base::TimeDelta::FromSeconds(
@@ skipping 12 matching lines @@
   EXPECT_TRUE(pending_types.Equals(expected_pending_types));
 }
 
 class RegistrationManagerTest : public testing::Test {
  protected:
   RegistrationManagerTest()
       : fake_registration_manager_(&fake_invalidation_client_) {}
 
   virtual ~RegistrationManagerTest() {}
 
-  void LoseRegistrations(syncable::ModelEnumSet types) {
-    for (syncable::ModelEnumSet::Iterator it = types.First();
+  void LoseRegistrations(syncable::ModelTypeSet types) {
+    for (syncable::ModelTypeSet::Iterator it = types.First();
          it.Good(); it.Inc()) {
       fake_invalidation_client_.LoseRegistration(it.Get());
       fake_registration_manager_.MarkRegistrationLost(it.Get());
     }
   }
 
-  void DisableTypes(syncable::ModelEnumSet types) {
-    for (syncable::ModelEnumSet::Iterator it = types.First();
+  void DisableTypes(syncable::ModelTypeSet types) {
+    for (syncable::ModelTypeSet::Iterator it = types.First();
          it.Good(); it.Inc()) {
       fake_invalidation_client_.LoseRegistration(it.Get());
       fake_registration_manager_.DisableType(it.Get());
     }
   }
 
   // Used by MarkRegistrationLostBackoff* tests.
   void RunBackoffTest(double jitter) {
     fake_registration_manager_.SetJitter(jitter);
-    syncable::ModelEnumSet types = FromPtr(kModelTypes, kModelTypeCount);
+    syncable::ModelTypeSet types = FromPtr(kModelTypes, kModelTypeCount);
     fake_registration_manager_.SetRegisteredTypes(types);
 
     // Lose some types.
-    syncable::ModelEnumSet lost_types = FromPtr(kModelTypes, 2);
+    syncable::ModelTypeSet lost_types = FromPtr(kModelTypes, 2);
     LoseRegistrations(lost_types);
     ExpectPendingRegistrations(
         lost_types, 0.0,
         fake_registration_manager_.GetPendingRegistrations());
 
     // Trigger another failure to start delaying.
     fake_registration_manager_.FirePendingRegistrationsForTest();
     LoseRegistrations(lost_types);
 
     double scaled_jitter =
@@ skipping 35 matching lines @@
   FakeRegistrationManager fake_registration_manager_;
 
  private:
   // Needed by timers in RegistrationManager.
   MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistrationManagerTest);
 };
 
 TEST_F(RegistrationManagerTest, SetRegisteredTypes) {
-  syncable::ModelEnumSet types = FromPtr(kModelTypes, kModelTypeCount);
+  syncable::ModelTypeSet types = FromPtr(kModelTypes, kModelTypeCount);
 
   EXPECT_TRUE(fake_registration_manager_.GetRegisteredTypes().Empty());
   EXPECT_TRUE(fake_invalidation_client_.GetRegisteredTypes().Empty());
 
   fake_registration_manager_.SetRegisteredTypes(types);
   EXPECT_TRUE(fake_registration_manager_.GetRegisteredTypes().Equals(types));
   EXPECT_TRUE(fake_invalidation_client_.GetRegisteredTypes().Equals(types));
 
   types.Put(syncable::APPS);
   types.Remove(syncable::BOOKMARKS);
@@ skipping 34 matching lines @@
   EXPECT_EQ(10, GetRoundedBackoff(5.0,  0.0));
   EXPECT_EQ(12, GetRoundedBackoff(5.0, +1.0));
 
   // Test ceiling.
   EXPECT_EQ(19, GetRoundedBackoff(13.0, -1.0));
   EXPECT_EQ(20, GetRoundedBackoff(13.0,  0.0));
   EXPECT_EQ(20, GetRoundedBackoff(13.0, +1.0));
 }
 
 TEST_F(RegistrationManagerTest, MarkRegistrationLost) {
-  syncable::ModelEnumSet types = FromPtr(kModelTypes, kModelTypeCount);
+  syncable::ModelTypeSet types = FromPtr(kModelTypes, kModelTypeCount);
 
   fake_registration_manager_.SetRegisteredTypes(types);
   EXPECT_TRUE(fake_registration_manager_.GetPendingRegistrations().empty());
 
   // Lose some types.
-  syncable::ModelEnumSet lost_types = FromPtr(
+  syncable::ModelTypeSet lost_types = FromPtr(
       kModelTypes, 3);
-  syncable::ModelEnumSet non_lost_types = FromPtr(
+  syncable::ModelTypeSet non_lost_types = FromPtr(
       kModelTypes + 3, kModelTypeCount - 3);
   LoseRegistrations(lost_types);
   ExpectPendingRegistrations(
       lost_types, 0.0,
       fake_registration_manager_.GetPendingRegistrations());
   EXPECT_TRUE(
       fake_registration_manager_.GetRegisteredTypes().Equals(non_lost_types));
   EXPECT_TRUE(
       fake_invalidation_client_.GetRegisteredTypes().Equals(non_lost_types));
 
@@ skipping 11 matching lines @@
 
 TEST_F(RegistrationManagerTest, MarkRegistrationLostBackoffMid) {
   RunBackoffTest(0.0);
 }
 
 TEST_F(RegistrationManagerTest, MarkRegistrationLostBackoffHigh) {
   RunBackoffTest(+1.0);
 }
 
 TEST_F(RegistrationManagerTest, MarkRegistrationLostBackoffReset) {
-  syncable::ModelEnumSet types = FromPtr(kModelTypes, kModelTypeCount);
+  syncable::ModelTypeSet types = FromPtr(kModelTypes, kModelTypeCount);
 
   fake_registration_manager_.SetRegisteredTypes(types);
 
   // Lose some types.
-  syncable::ModelEnumSet lost_types = FromPtr(kModelTypes, 2);
+  syncable::ModelTypeSet lost_types = FromPtr(kModelTypes, 2);
   LoseRegistrations(lost_types);
   ExpectPendingRegistrations(
       lost_types, 0.0,
       fake_registration_manager_.GetPendingRegistrations());
 
   // Trigger another failure to start delaying.
   fake_registration_manager_.FirePendingRegistrationsForTest();
   LoseRegistrations(lost_types);
   double expected_delay =
       RegistrationManager::kInitialRegistrationDelaySeconds;
   ExpectPendingRegistrations(
       lost_types, expected_delay,
       fake_registration_manager_.GetPendingRegistrations());
 
   // Set types again.
   fake_registration_manager_.SetRegisteredTypes(types);
   ExpectPendingRegistrations(
-      syncable::ModelEnumSet(), 0.0,
+      syncable::ModelTypeSet(), 0.0,
       fake_registration_manager_.GetPendingRegistrations());
 }
 
 TEST_F(RegistrationManagerTest, MarkAllRegistrationsLost) {
-  syncable::ModelEnumSet types = FromPtr(kModelTypes, kModelTypeCount);
+  syncable::ModelTypeSet types = FromPtr(kModelTypes, kModelTypeCount);
 
   fake_registration_manager_.SetRegisteredTypes(types);
 
   fake_invalidation_client_.LoseAllRegistrations();
   fake_registration_manager_.MarkAllRegistrationsLost();
 
-  syncable::ModelEnumSet expected_types;
+  syncable::ModelTypeSet expected_types;
   EXPECT_TRUE(
       fake_registration_manager_.GetRegisteredTypes().Equals(expected_types));
   EXPECT_TRUE(
       fake_invalidation_client_.GetRegisteredTypes().Equals(expected_types));
 
   ExpectPendingRegistrations(
       types, 0.0,
       fake_registration_manager_.GetPendingRegistrations());
 
   // Trigger another failure to start delaying.
   fake_registration_manager_.FirePendingRegistrationsForTest();
   fake_invalidation_client_.LoseAllRegistrations();
   fake_registration_manager_.MarkAllRegistrationsLost();
   double expected_delay =
       RegistrationManager::kInitialRegistrationDelaySeconds;
   ExpectPendingRegistrations(
       types, expected_delay,
       fake_registration_manager_.GetPendingRegistrations());
 
   // Pretend we waited long enough to re-register.
   fake_registration_manager_.FirePendingRegistrationsForTest();
   EXPECT_TRUE(
       fake_registration_manager_.GetRegisteredTypes().Equals(types));
   EXPECT_TRUE(
       fake_invalidation_client_.GetRegisteredTypes().Equals(types));
 }
 
 TEST_F(RegistrationManagerTest, DisableType) {
-  syncable::ModelEnumSet types = FromPtr(kModelTypes, kModelTypeCount);
+  syncable::ModelTypeSet types = FromPtr(kModelTypes, kModelTypeCount);
 
   fake_registration_manager_.SetRegisteredTypes(types);
   EXPECT_TRUE(fake_registration_manager_.GetPendingRegistrations().empty());
 
   // Disable some types.
-  syncable::ModelEnumSet disabled_types = FromPtr(
+  syncable::ModelTypeSet disabled_types = FromPtr(
       kModelTypes, 3);
-  syncable::ModelEnumSet enabled_types = FromPtr(
+  syncable::ModelTypeSet enabled_types = FromPtr(
       kModelTypes + 3, kModelTypeCount - 3);
   DisableTypes(disabled_types);
   ExpectPendingRegistrations(
-      syncable::ModelEnumSet(), 0.0,
+      syncable::ModelTypeSet(), 0.0,
       fake_registration_manager_.GetPendingRegistrations());
   EXPECT_TRUE(
       fake_registration_manager_.GetRegisteredTypes().Equals(enabled_types));
   EXPECT_TRUE(
       fake_invalidation_client_.GetRegisteredTypes().Equals(enabled_types));
 
   fake_registration_manager_.SetRegisteredTypes(types);
   EXPECT_TRUE(
       fake_registration_manager_.GetRegisteredTypes().Equals(enabled_types));
 
   fake_registration_manager_.MarkRegistrationLost(
       disabled_types.First().Get());
   ExpectPendingRegistrations(
-      syncable::ModelEnumSet(), 0.0,
+      syncable::ModelTypeSet(), 0.0,
       fake_registration_manager_.GetPendingRegistrations());
 
   fake_registration_manager_.MarkAllRegistrationsLost();
   ExpectPendingRegistrations(
       enabled_types, 0.0,
       fake_registration_manager_.GetPendingRegistrations());
 }
 
 }  // namespace
 }  // namespace notifier