[Sync] Replace all instances of ModelTypeSet with ModelEnumSet

chrome/browser/sync/sessions/sync_session_context_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_context.h"
 
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace browser_sync {
 namespace sessions {
 TEST(SyncSessionContextTest, AddUnthrottleTimeTest) {
-  syncable::ModelTypeSet types;
-  types.insert(syncable::BOOKMARKS);
-  types.insert(syncable::PASSWORDS);
+  syncable::ModelEnumSet types;
+  types.Put(syncable::BOOKMARKS);
+  types.Put(syncable::PASSWORDS);
 
   SyncSessionContext context;
   base::TimeTicks now = base::TimeTicks::Now();
   context.SetUnthrottleTime(types, now);
 
   EXPECT_EQ(context.unthrottle_times_.size(), 2U);
   EXPECT_EQ(context.unthrottle_times_[syncable::BOOKMARKS], now);
   EXPECT_EQ(context.unthrottle_times_[syncable::PASSWORDS], now);
 }
 
 TEST(SyncSessionContextTest, GetCurrentlyThrottledTypesTest) {
-  syncable::ModelTypeSet types;
-  types.insert(syncable::BOOKMARKS);
-  types.insert(syncable::PASSWORDS);
+  syncable::ModelEnumSet types;
+  types.Put(syncable::BOOKMARKS);
+  types.Put(syncable::PASSWORDS);
 
   SyncSessionContext context;
   base::TimeTicks now = base::TimeTicks::Now();
 
   // Now update the throttled types with time set to 10 seconds earlier from
   // now.
   context.SetUnthrottleTime(types, now - base::TimeDelta::FromSeconds(10));
   context.PruneUnthrottledTypes(base::TimeTicks::Now());
-  EXPECT_EQ(context.GetThrottledTypes(), syncable::ModelTypeSet());
+  EXPECT_TRUE(context.GetThrottledTypes().Empty());
 
   // Now update the throttled types with time set to 2 hours from now.
   context.SetUnthrottleTime(types, now + base::TimeDelta::FromSeconds(1200));
   context.PruneUnthrottledTypes(base::TimeTicks::Now());
-  EXPECT_EQ(context.GetThrottledTypes(), types);
+  EXPECT_TRUE(context.GetThrottledTypes().Equals(types));
 }
 }  // namespace sessions.
 }  // namespace browser_sync