sync: Remove ModelTypeInvalidationMap

Removes the definition and all uses of ModelTypeInvalidationMap.

The ModelTypeInvalidationMap was useful only for sync-related
invalidations.  Its existence made sense when sync was the only client
for invalidations.  Now that we have many invalidations clients, it
makes sense to replace it with the more generic ObjectIdInvalidationMap.

The reason for doing this now is that the ObjectIdInvalidationMap will
soon be modified to be incompatible with the current definition of
ModelTypeInvalidationMap.  In order to support trickles it will be
modified to allow it to contain several invalidations per ObjectId.
Although it would have been possible to maintain compatibility by making
a corresponding modification to ModelTypeInvalidationMap, there's really
no point in having two invalidation map types.  In the long run, it
makes more sense to deprecate ModelTypeInvalidationMap.

BUG=233437

Review URL: https://chromiumcodereview.appspot.com/23238005

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

5 files changed, 11 insertions, 52 deletions

diff --git a/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc
index 9604929..623bfa9 100644
--- a/sync/notifier/invalidation_notifier_unittest.cc
+++ b/sync/notifier/invalidation_notifier_unittest.cc
@@ -11,7 +11,6 @@
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "net/url_request/url_request_test_util.h"
 #include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/base/model_type_invalidation_map.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/fake_invalidation_state_tracker.h"
diff --git a/sync/notifier/object_id_invalidation_map.cc b/sync/notifier/object_id_invalidation_map.cc
index 3dc7514..bde2e4c 100644
--- a/sync/notifier/object_id_invalidation_map.cc
+++ b/sync/notifier/object_id_invalidation_map.cc
@@ -90,35 +90,4 @@ bool ObjectIdInvalidationMapFromValue(const base::ListValue& value,
   return true;
 }
 
-ModelTypeInvalidationMap ObjectIdInvalidationMapToModelTypeInvalidationMap(
-    const ObjectIdInvalidationMap& invalidation_map) {
-  ModelTypeInvalidationMap type_invalidation_map;
-  for (ObjectIdInvalidationMap::const_iterator it = invalidation_map.begin();
-       it != invalidation_map.end(); ++it) {
-    ModelType model_type;
-    if (!ObjectIdToRealModelType(it->first, &model_type)) {
-      DLOG(WARNING) << "Invalid object ID: "
-                    << ObjectIdToString(it->first);
-      continue;
-    }
-    type_invalidation_map[model_type] = it->second;
-  }
-  return type_invalidation_map;
-}
-
-ObjectIdInvalidationMap ModelTypeInvalidationMapToObjectIdInvalidationMap(
-    const ModelTypeInvalidationMap& invalidation_map) {
-  ObjectIdInvalidationMap id_invalidation_map;
-  for (ModelTypeInvalidationMap::const_iterator it = invalidation_map.begin();
-       it != invalidation_map.end(); ++it) {
-    invalidation::ObjectId id;
-    if (!RealModelTypeToObjectId(it->first, &id)) {
-      DLOG(WARNING) << "Invalid model type " << it->first;
-      continue;
-    }
-    id_invalidation_map[id] = it->second;
-  }
-  return id_invalidation_map;
-}
-
 }  // namespace syncer
diff --git a/sync/notifier/object_id_invalidation_map.h b/sync/notifier/object_id_invalidation_map.h
index 0a6a95e..bb97fb3 100644
--- a/sync/notifier/object_id_invalidation_map.h
+++ b/sync/notifier/object_id_invalidation_map.h
@@ -13,7 +13,6 @@
 #include "google/cacheinvalidation/include/types.h"
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/base/invalidation.h"
-#include "sync/internal_api/public/base/model_type_invalidation_map.h"
 #include "sync/notifier/invalidation_util.h"
 
 namespace base {
@@ -42,14 +41,6 @@ scoped_ptr<base::ListValue> ObjectIdInvalidationMapToValue(
 bool ObjectIdInvalidationMapFromValue(const base::ListValue& value,
                                ObjectIdInvalidationMap* out);
 
-// Converts between ObjectIdInvalidationMaps and ModelTypeInvalidationMaps.
-SYNC_EXPORT_PRIVATE ModelTypeInvalidationMap
-    ObjectIdInvalidationMapToModelTypeInvalidationMap(
-        const ObjectIdInvalidationMap& invalidation_map);
-SYNC_EXPORT ObjectIdInvalidationMap
-    ModelTypeInvalidationMapToObjectIdInvalidationMap(
-        const ModelTypeInvalidationMap& invalidation_map);
-
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_H_
diff --git a/sync/notifier/object_id_invalidation_map_test_util.h b/sync/notifier/object_id_invalidation_map_test_util.h
index 47d03e9..0217da8 100644
--- a/sync/notifier/object_id_invalidation_map_test_util.h
+++ b/sync/notifier/object_id_invalidation_map_test_util.h
@@ -7,6 +7,7 @@
 
 // Convince googletest to use the correct overload for PrintTo().
 #include "sync/internal_api/public/base/invalidation_test_util.h"
+#include "sync/internal_api/public/base/model_type.h"
 #include "sync/notifier/object_id_invalidation_map.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/sync/notifier/p2p_invalidator_unittest.cc b/sync/notifier/p2p_invalidator_unittest.cc
index be9ee3f..24cfe02 100644
--- a/sync/notifier/p2p_invalidator_unittest.cc
+++ b/sync/notifier/p2p_invalidator_unittest.cc
@@ -8,7 +8,6 @@
 
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/base/model_type_invalidation_map.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/invalidator_test_template.h"
 #include "sync/notifier/object_id_invalidation_map_test_util.h"
@@ -96,8 +95,12 @@ class P2PInvalidatorTest : public testing::Test {
     delegate_.GetInvalidator()->UnregisterHandler(&fake_handler_);
   }
 
-  ModelTypeInvalidationMap MakeInvalidationMap(ModelTypeSet types) {
-    return ModelTypeSetToInvalidationMap(types, std::string());
+  ObjectIdInvalidationMap MakeInvalidationMap(ModelTypeSet types) {
+    ObjectIdInvalidationMap invalidations;
+    ObjectIdSet ids = ModelTypeSetToObjectIdSet(types);
+    return ObjectIdSetToInvalidationMap(ids,
+                                        Invalidation::kUnknownVersion,
+                                        std::string());
   }
 
   // Simulate receiving all the notifications we sent out since last
@@ -240,8 +243,7 @@ TEST_F(P2PInvalidatorTest, NotificationsBasic) {
   ReflectSentNotifications();
   EXPECT_EQ(1, fake_handler_.GetInvalidationCount());
   EXPECT_THAT(
-      ModelTypeInvalidationMapToObjectIdInvalidationMap(
-          MakeInvalidationMap(enabled_types)),
+      MakeInvalidationMap(enabled_types),
       Eq(fake_handler_.GetLastInvalidationMap()));
 
   // Sent with target NOTIFY_OTHERS so should not be propagated to
@@ -286,10 +288,8 @@ TEST_F(P2PInvalidatorTest, SendNotificationData) {
 
   ReflectSentNotifications();
   EXPECT_EQ(1, fake_handler_.GetInvalidationCount());
-  EXPECT_THAT(
-      ModelTypeInvalidationMapToObjectIdInvalidationMap(
-          MakeInvalidationMap(enabled_types)),
-      Eq(fake_handler_.GetLastInvalidationMap()));
+  EXPECT_THAT(MakeInvalidationMap(enabled_types),
+              Eq(fake_handler_.GetLastInvalidationMap()));
 
   // Should be dropped.
   invalidator->SendNotificationDataForTest(P2PNotificationData());
@@ -297,8 +297,7 @@ TEST_F(P2PInvalidatorTest, SendNotificationData) {
   EXPECT_EQ(1, fake_handler_.GetInvalidationCount());
 
   const ObjectIdInvalidationMap& expected_ids =
-      ModelTypeInvalidationMapToObjectIdInvalidationMap(
-          MakeInvalidationMap(expected_types));
+      MakeInvalidationMap(expected_types);
 
   // Should be propagated.
   invalidator->SendNotificationDataForTest(