[Sync] Replace all instances of ModelTypeSet with ModelEnumSet

Also change some functions to return ModelEnumSets directly instead of
taking a pointer value.

BUG=79970
TEST=


Review URL: http://codereview.chromium.org/8851006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113906 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 90 deletions

diff --git a/chrome/browser/sync/syncable/model_type.cc b/chrome/browser/sync/syncable/model_type.cc
index b7e147c..4bbadbf 100644
--- a/chrome/browser/sync/syncable/model_type.cc
+++ b/chrome/browser/sync/syncable/model_type.cc
@@ -287,17 +287,6 @@ StringValue* ModelTypeToValue(ModelType model_type) {
   return Value::CreateStringValue("");
 }
 
-std::string ModelTypeSetToString(const ModelTypeSet& model_types) {
-  std::string result;
-  for (ModelTypeSet::const_iterator iter = model_types.begin();
-       iter != model_types.end();) {
-    result += ModelTypeToString(*iter);
-    if (++iter != model_types.end())
-      result += ", ";
-  }
-  return result;
-}
-
 ModelType ModelTypeFromValue(const Value& value) {
   if (value.IsType(Value::TYPE_STRING)) {
     std::string result;
@@ -361,23 +350,6 @@ std::string ModelEnumSetToString(ModelEnumSet model_types) {
   return result;
 }
 
-ModelTypeSet ModelEnumSetToSet(ModelEnumSet enum_set) {
-  ModelTypeSet model_type_set;
-  for (ModelEnumSet::Iterator it = enum_set.First(); it.Good(); it.Inc()) {
-    model_type_set.insert(it.Get());
-  }
-  return model_type_set;
-}
-
-ModelEnumSet ModelTypeSetToEnumSet(const ModelTypeSet& model_type_set) {
-  ModelEnumSet enum_set;
-  for (ModelTypeSet::const_iterator it = model_type_set.begin();
-       it != model_type_set.end(); ++it) {
-    enum_set.Put(*it);
-  }
-  return enum_set;
-}
-
 base::ListValue* ModelEnumSetToValue(ModelEnumSet model_types) {
   ListValue* value = new ListValue();
   for (ModelEnumSet::Iterator it = model_types.First(); it.Good(); it.Inc()) {
@@ -387,23 +359,6 @@ base::ListValue* ModelEnumSetToValue(ModelEnumSet model_types) {
   return value;
 }
 
-ListValue* ModelTypeSetToValue(const ModelTypeSet& model_types) {
-  ListValue* value = new ListValue();
-  for (ModelTypeSet::const_iterator i = model_types.begin();
-       i != model_types.end(); ++i) {
-    value->Append(Value::CreateStringValue(ModelTypeToString(*i)));
-  }
-  return value;
-}
-
-ModelTypeSet ModelTypeSetFromValue(const base::ListValue& value) {
-  ModelTypeSet result;
-  for (ListValue::const_iterator i = value.begin(); i != value.end(); ++i) {
-    result.insert(ModelTypeFromValue(**i));
-  }
-  return result;
-}
-
 ModelEnumSet ModelEnumSetFromValue(const base::ListValue& value) {
   ModelEnumSet result;
   for (ListValue::const_iterator i = value.begin(); i != value.end(); ++i) {
@@ -656,14 +611,6 @@ bool NotificationTypeToRealModelType(const std::string& notification_type,
   }
 }
 
-ModelTypeSet GetAllRealModelTypes() {
-  ModelTypeSet all_types;
-  for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
-    all_types.insert(ModelTypeFromInt(i));
-  }
-  return all_types;
-}
-
 bool IsRealDataType(ModelType model_type) {
   return model_type >= FIRST_REAL_MODEL_TYPE && model_type < MODEL_TYPE_COUNT;
 }
diff --git a/chrome/browser/sync/syncable/model_type.h b/chrome/browser/sync/syncable/model_type.h
index f31c377..a532e02 100644
--- a/chrome/browser/sync/syncable/model_type.h
+++ b/chrome/browser/sync/syncable/model_type.h
@@ -85,7 +85,6 @@ enum ModelType {
   MODEL_TYPE_COUNT,
 };
 
-typedef std::set<ModelType> ModelTypeSet;
 typedef browser_sync::EnumSet<
   ModelType, FIRST_REAL_MODEL_TYPE, LAST_REAL_MODEL_TYPE> ModelEnumSet;
 typedef browser_sync::EnumSet<
@@ -137,25 +136,14 @@ base::StringValue* ModelTypeToValue(ModelType model_type);
 // Converts a Value into a ModelType - complement to ModelTypeToValue().
 ModelType ModelTypeFromValue(const base::Value& value);
 
-std::string ModelTypeSetToString(const ModelTypeSet& model_types);
-
 // Returns the ModelType corresponding to the name |model_type_string|.
 ModelType ModelTypeFromString(const std::string& model_type_string);
 
 std::string ModelEnumSetToString(ModelEnumSet model_types);
 
-ModelTypeSet ModelEnumSetToSet(ModelEnumSet enum_set);
-
-ModelEnumSet ModelTypeSetToEnumSet(const ModelTypeSet& model_type_set);
-
 // Caller takes ownership of returned list.
 base::ListValue* ModelEnumSetToValue(ModelEnumSet model_types);
 
-// Caller takes ownership of returned list.
-base::ListValue* ModelTypeSetToValue(const ModelTypeSet& model_types);
-
-ModelTypeSet ModelTypeSetFromValue(const base::ListValue& value);
-
 ModelEnumSet ModelEnumSetFromValue(const base::ListValue& value);
 
 // Returns a string corresponding to the syncable tag for this datatype.
@@ -178,9 +166,6 @@ bool RealModelTypeToNotificationType(ModelType model_type,
 bool NotificationTypeToRealModelType(const std::string& notification_type,
                                      ModelType* model_type);
 
-// Returns a ModelTypeSet with all real model types.
-ModelTypeSet GetAllRealModelTypes();
-
 // Returns true if |model_type| is a real datatype
 bool IsRealDataType(ModelType model_type);
 
diff --git a/chrome/browser/sync/syncable/model_type_unittest.cc b/chrome/browser/sync/syncable/model_type_unittest.cc
index 2db0ab9..c5b9196 100644
--- a/chrome/browser/sync/syncable/model_type_unittest.cc
+++ b/chrome/browser/sync/syncable/model_type_unittest.cc
@@ -38,12 +38,10 @@ TEST_F(ModelTypeTest, ModelTypeFromValue) {
   }
 }
 
-TEST_F(ModelTypeTest, ModelTypeSetToValue) {
-  ModelTypeSet model_types;
-  model_types.insert(syncable::BOOKMARKS);
-  model_types.insert(syncable::APPS);
+TEST_F(ModelTypeTest, ModelEnumSetToValue) {
+  const ModelEnumSet model_types(syncable::BOOKMARKS, syncable::APPS);
 
-  scoped_ptr<ListValue> value(ModelTypeSetToValue(model_types));
+  scoped_ptr<ListValue> value(ModelEnumSetToValue(model_types));
   EXPECT_EQ(2u, value->GetSize());
   std::string types[2];
   EXPECT_TRUE(value->GetString(0, &types[0]));
@@ -52,26 +50,17 @@ TEST_F(ModelTypeTest, ModelTypeSetToValue) {
   EXPECT_EQ("Apps", types[1]);
 }
 
-TEST_F(ModelTypeTest, ModelTypeSetFromValue) {
+TEST_F(ModelTypeTest, ModelEnumSetFromValue) {
   // Try empty set first.
-  ModelTypeSet model_types;
-  scoped_ptr<ListValue> value(ModelTypeSetToValue(model_types));
-  EXPECT_EQ(model_types, ModelTypeSetFromValue(*value));
+  ModelEnumSet model_types;
+  scoped_ptr<ListValue> value(ModelEnumSetToValue(model_types));
+  EXPECT_TRUE(model_types.Equals(ModelEnumSetFromValue(*value)));
 
   // Now try with a few random types.
-  model_types.insert(BOOKMARKS);
-  model_types.insert(APPS);
-  value.reset(ModelTypeSetToValue(model_types));
-  EXPECT_EQ(model_types, ModelTypeSetFromValue(*value));
-}
-
-TEST_F(ModelTypeTest, GetAllRealModelTypes) {
-  const ModelTypeSet& all_types = GetAllRealModelTypes();
-  for (int i = 0; i < MODEL_TYPE_COUNT; ++i) {
-    ModelType type = ModelTypeFromInt(i);
-    EXPECT_EQ(IsRealDataType(type), all_types.count(type) > 0u);
-  }
-  EXPECT_EQ(0u, all_types.count(MODEL_TYPE_COUNT));
+  model_types.Put(BOOKMARKS);
+  model_types.Put(APPS);
+  value.reset(ModelEnumSetToValue(model_types));
+  EXPECT_TRUE(model_types.Equals(ModelEnumSetFromValue(*value)));
 }
 
 TEST_F(ModelTypeTest, IsRealDataType) {