[Sync] Rename ModelEnumSet to ModelTypeSet

chrome/browser/sync/engine/model_safe_worker_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/engine/model_safe_worker.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 26 matching lines @@
       "{\"Bookmarks\":\"GROUP_PASSIVE\",\"Encryption keys\":\"GROUP_UI\","
       "\"Preferences\":\"GROUP_DB\"}",
       ModelSafeRoutingInfoToString(routing_info));
 }
 
 TEST_F(ModelSafeWorkerTest, GetRoutingInfoTypes) {
   ModelSafeRoutingInfo routing_info;
   routing_info[syncable::BOOKMARKS] = GROUP_PASSIVE;
   routing_info[syncable::NIGORI] = GROUP_UI;
   routing_info[syncable::PREFERENCES] = GROUP_DB;
-  const syncable::ModelEnumSet expected_types(
+  const syncable::ModelTypeSet expected_types(
       syncable::BOOKMARKS,
       syncable::NIGORI,
       syncable::PREFERENCES);
   EXPECT_TRUE(GetRoutingInfoTypes(routing_info).Equals(expected_types));
 }
 
 }  // namespace
 }  // namespace browser_sync