[Sync] Rename ModelEnumSet to ModelTypeSet

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::ModelEnumSet ParamsMeaningAllEnabledTypes() {
-    syncable::ModelEnumSet request_params(
+  syncable::ModelTypeSet ParamsMeaningAllEnabledTypes() {
+    syncable::ModelTypeSet request_params(
         syncable::BOOKMARKS, syncable::AUTOFILL);
     return request_params;
   }
 
-  syncable::ModelEnumSet ParamsMeaningJustOneEnabledType() {
-    return syncable::ModelEnumSet(syncable::AUTOFILL);
+  syncable::ModelTypeSet ParamsMeaningJustOneEnabledType() {
+    return syncable::ModelTypeSet(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 401 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::ModelEnumSet types;
+  syncable::ModelTypeSet types;
   std::string payload = "test";
   syncable::ModelTypePayloadMap types_with_payloads =
       syncable::ModelTypePayloadMapFromEnumSet(types, payload);
   EXPECT_TRUE(types_with_payloads.empty());
 
   types.Put(syncable::BOOKMARKS);
   types.Put(syncable::PASSWORDS);
   types.Put(syncable::AUTOFILL);
   payload = "test2";
   types_with_payloads =
@@ skipping 40 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