sync: Remove ModelTypeInvalidationMap

sync/tools/sync_listen_notifications.cc

 // Copyright (c) 2012 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 <cstddef>
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/threading/thread.h"
 #include "jingle/notifier/base/notification_method.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/network_change_notifier.h"
 #include "net/dns/host_resolver.h"
 #include "net/http/transport_security_state.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/notifier/invalidation_handler.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/invalidation_util.h"
 #include "sync/notifier/invalidator.h"
 #include "sync/notifier/non_blocking_invalidator.h"
 #include "sync/tools/null_invalidation_state_tracker.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
@@ skipping 17 matching lines @@
   NotificationPrinter() {}
   virtual ~NotificationPrinter() {}
 
   virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE {
     LOG(INFO) << "Invalidator state changed to "
               << InvalidatorStateToString(state);
   }
 
   virtual void OnIncomingInvalidation(
       const ObjectIdInvalidationMap& invalidation_map) OVERRIDE {
-    const ModelTypeInvalidationMap& type_invalidation_map =
-        ObjectIdInvalidationMapToModelTypeInvalidationMap(invalidation_map);
-    for (ModelTypeInvalidationMap::const_iterator it =
-             type_invalidation_map.begin(); it != type_invalidation_map.end();
-         ++it) {
-      LOG(INFO) << "Remote invalidation: type = "
-                << ModelTypeToString(it->first)
+    for (ObjectIdInvalidationMap::const_iterator it = invalidation_map.begin();
+         it != invalidation_map.end(); ++it) {
+      LOG(INFO) << "Remote invalidation: id = "
+                << ObjectIdToString(it->first)
+                << ", version = " << it->second.version
                 << ", payload = " << it->second.payload;
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NotificationPrinter);
 };
 
 // Needed to use a real host resolver.
 class MyTestURLRequestContext : public net::TestURLRequestContext {
@@ skipping 128 matching lines @@
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncListenNotificationsMain(argc, argv);
 }