[Sync] Convert syncable/ directory to ModelEnumSet

chrome/browser/sync/sessions/sync_session_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/sessions/sync_session.h"
 
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 90 matching lines @@
     *out = routes_;
   }
 
   StatusController* status() { return session_->mutable_status_controller(); }
  protected:
   void FailControllerInvocationIfDisabled(const std::string& msg) {
     if (!controller_invocations_allowed_)
       FAIL() << msg;
   }
 
-  syncable::ModelTypeBitSet ParamsMeaningAllEnabledTypes() {
-    syncable::ModelTypeBitSet request_params;
-    request_params[syncable::BOOKMARKS] = true;
-    request_params[syncable::AUTOFILL] = true;
+  syncable::ModelEnumSet ParamsMeaningAllEnabledTypes() {
+    syncable::ModelEnumSet request_params(
+        syncable::BOOKMARKS, syncable::AUTOFILL);
     return request_params;
   }
 
-  syncable::ModelTypeBitSet ParamsMeaningJustOneEnabledType() {
-    syncable::ModelTypeBitSet request_params;
-    request_params[syncable::AUTOFILL] = true;
-    return request_params;
+  syncable::ModelEnumSet ParamsMeaningJustOneEnabledType() {
+    return syncable::ModelEnumSet(syncable::AUTOFILL);
   }
 
   MessageLoop message_loop_;
   bool controller_invocations_allowed_;
   scoped_ptr<SyncSession> session_;
   scoped_ptr<SyncSessionContext> context_;
   std::vector<scoped_refptr<ModelSafeWorker> > workers_;
   ModelSafeRoutingInfo routes_;
 };
 
@@ skipping 198 matching lines @@
   session_->ResetTransientState();
   EXPECT_FALSE(status()->conflicts_resolved());
   EXPECT_FALSE(session_->HasMoreToSync());
   EXPECT_FALSE(status()->TestAndClearIsDirty());
 }
 
 TEST_F(SyncSessionTest, Coalesce) {
   std::vector<ModelSafeWorker*> workers_one, workers_two;
   ModelSafeRoutingInfo routes_one, routes_two;
   syncable::ModelTypePayloadMap one_type =
-      syncable::ModelTypePayloadMapFromBitSet(
+      syncable::ModelTypePayloadMapFromEnumSet(
           ParamsMeaningJustOneEnabledType(),
           std::string());
   syncable::ModelTypePayloadMap all_types =
-      syncable::ModelTypePayloadMapFromBitSet(
+      syncable::ModelTypePayloadMapFromEnumSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_one(sync_pb::GetUpdatesCallerInfo::PERIODIC, one_type);
   SyncSourceInfo source_two(sync_pb::GetUpdatesCallerInfo::LOCAL, all_types);
 
   scoped_refptr<ModelSafeWorker> passive_worker(
       new FakeModelWorker(GROUP_PASSIVE));
   scoped_refptr<ModelSafeWorker> db_worker(new FakeModelWorker(GROUP_DB));
   scoped_refptr<ModelSafeWorker> ui_worker(new FakeModelWorker(GROUP_UI));
   workers_one.push_back(passive_worker);
@@ skipping 32 matching lines @@
       std::find(one.workers().begin(), one.workers().end(), ui_worker);
   EXPECT_NE(it_db, one.workers().end());
   EXPECT_NE(it_ui, one.workers().end());
   EXPECT_EQ(routes_two, one.routing_info());
 }
 
 TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
   std::vector<ModelSafeWorker*> workers_one, workers_two;
   ModelSafeRoutingInfo routes_one, routes_two;
   syncable::ModelTypePayloadMap one_type =
-      syncable::ModelTypePayloadMapFromBitSet(
+      syncable::ModelTypePayloadMapFromEnumSet(
           ParamsMeaningJustOneEnabledType(),
           std::string());
   syncable::ModelTypePayloadMap all_types =
-      syncable::ModelTypePayloadMapFromBitSet(
+      syncable::ModelTypePayloadMapFromEnumSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_one(sync_pb::GetUpdatesCallerInfo::PERIODIC, one_type);
   SyncSourceInfo source_two(sync_pb::GetUpdatesCallerInfo::LOCAL, all_types);
 
   scoped_refptr<ModelSafeWorker> passive_worker(
       new FakeModelWorker(GROUP_PASSIVE));
   scoped_refptr<ModelSafeWorker> db_worker(new FakeModelWorker(GROUP_DB));
   scoped_refptr<ModelSafeWorker> ui_worker(new FakeModelWorker(GROUP_UI));
   workers_one.push_back(passive_worker);
@@ skipping 45 matching lines @@
       two.routing_info().find(syncable::AUTOFILL);
   EXPECT_NE(it, two.routing_info().end());
   EXPECT_EQ(it->second, GROUP_DB);
   EXPECT_EQ(two.routing_info().size(), 1U);
 }
 
 TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
   std::vector<ModelSafeWorker*> workers_first, workers_second;
   ModelSafeRoutingInfo routes_first, routes_second;
   syncable::ModelTypePayloadMap all_types =
-      syncable::ModelTypePayloadMapFromBitSet(
+      syncable::ModelTypePayloadMapFromEnumSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_first(sync_pb::GetUpdatesCallerInfo::PERIODIC,
       all_types);
   SyncSourceInfo source_second(sync_pb::GetUpdatesCallerInfo::LOCAL,
       all_types);
 
   scoped_refptr<ModelSafeWorker> passive_worker(
       new FakeModelWorker(GROUP_PASSIVE));
   scoped_refptr<FakeModelWorker> db_worker(new FakeModelWorker(GROUP_DB));
@@ skipping 55 matching lines @@
   EXPECT_NE(it1, second.routing_info().end());
   EXPECT_EQ(it1->second, GROUP_DB);
 
   EXPECT_NE(it2, second.routing_info().end());
   EXPECT_EQ(it2->second, GROUP_UI);
   EXPECT_EQ(second.routing_info().size(), 2U);
 }
 
 
 TEST_F(SyncSessionTest, MakeTypePayloadMapFromBitSet) {
-  syncable::ModelTypeBitSet types;
+  syncable::ModelEnumSet types;
   std::string payload = "test";
   syncable::ModelTypePayloadMap types_with_payloads =
-      syncable::ModelTypePayloadMapFromBitSet(types,
-                                              payload);
+      syncable::ModelTypePayloadMapFromEnumSet(types, payload);
   EXPECT_TRUE(types_with_payloads.empty());
 
-  types[syncable::BOOKMARKS] = true;
-  types[syncable::PASSWORDS] = true;
-  types[syncable::AUTOFILL] = true;
+  types.Put(syncable::BOOKMARKS);
+  types.Put(syncable::PASSWORDS);
+  types.Put(syncable::AUTOFILL);
   payload = "test2";
-  types_with_payloads = syncable::ModelTypePayloadMapFromBitSet(types, payload);
+  types_with_payloads =
+      syncable::ModelTypePayloadMapFromEnumSet(types, payload);
 
   ASSERT_EQ(3U, types_with_payloads.size());
   EXPECT_EQ(types_with_payloads[syncable::BOOKMARKS], payload);
   EXPECT_EQ(types_with_payloads[syncable::PASSWORDS], payload);
   EXPECT_EQ(types_with_payloads[syncable::AUTOFILL], payload);
 }
 
 TEST_F(SyncSessionTest, MakeTypePayloadMapFromRoutingInfo) {
   std::string payload = "test";
   syncable::ModelTypePayloadMap types_with_payloads
@@ skipping 29 matching lines @@
   EXPECT_EQ(empty_payload, original[syncable::BOOKMARKS]);
   EXPECT_EQ(payload1, original[syncable::PASSWORDS]);
   EXPECT_EQ(payload1, original[syncable::AUTOFILL]);
   EXPECT_EQ(payload2, original[syncable::SESSIONS]);
   EXPECT_EQ(payload3, original[syncable::THEMES]);
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace browser_sync