Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/invalidation_util.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 "sync/notifier/invalidation_util.h"
 
+#include <ostream>
 #include <sstream>
 
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
 
+namespace invalidation {
+void PrintTo(const invalidation::ObjectId& id, std::ostream* os) {
+  *os << syncer::ObjectIdToString(id);
+}
+}  // namespace invalidation
+
 namespace syncer {
 
 bool ObjectIdLessThan::operator()(const invalidation::ObjectId& lhs,
                                   const invalidation::ObjectId& rhs) const {
   return (lhs.source() < rhs.source()) ||
          (lhs.source() == rhs.source() && lhs.name() < rhs.name());
 }
 
 bool RealModelTypeToObjectId(ModelType model_type,
                              invalidation::ObjectId* object_id) {
@@ skipping 51 matching lines @@
     const invalidation::Invalidation& invalidation) {
   std::stringstream ss;
   ss << "{ ";
   ss << "object_id: " << ObjectIdToString(invalidation.object_id()) << ", ";
   ss << "version: " << invalidation.version();
   ss << " }";
   return ss.str();
 }
 
 }  // namespace syncer