roll cacheinvalidation to @60

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

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

2 files changed, 15 insertions, 16 deletions

diff --git a/chrome/browser/sync/notifier/invalidation_util.cc b/chrome/browser/sync/notifier/invalidation_util.cc
index a5bc60a..a0f16b5 100644
--- a/chrome/browser/sync/notifier/invalidation_util.cc
+++ b/chrome/browser/sync/notifier/invalidation_util.cc
@@ -20,8 +20,7 @@ bool RealModelTypeToObjectId(syncable::ModelType model_type,
           model_type, &notification_type)) {
     return false;
   }
-  object_id->mutable_name()->set_string_value(notification_type);
-  object_id->set_source(invalidation::ObjectId::CHROME_SYNC);
+  object_id->Init(invalidation::ObjectSource::CHROME_SYNC, notification_type);
   return true;
 }
 
@@ -29,19 +28,27 @@ bool ObjectIdToRealModelType(const invalidation::ObjectId& object_id,
                              syncable::ModelType* model_type) {
   return
       syncable::NotificationTypeToRealModelType(
-          object_id.name().string_value(), model_type);
+          object_id.name(), model_type);
 }
 
 std::string ObjectIdToString(
     const invalidation::ObjectId& object_id) {
   std::stringstream ss;
   ss << "{ ";
-  ss << "name: " << object_id.name().string_value() << ", ";
+  ss << "name: " << object_id.name() << ", ";
   ss << "source: " << object_id.source();
   ss << " }";
   return ss.str();
 }
 
+std::string ObjectIdPToString(
+    const invalidation::ObjectIdP& object_id) {
+  return ObjectIdToString(
+      invalidation::ObjectId(
+          (invalidation::ObjectSource_Type) object_id.source(),
+          object_id.name().string_value()));
+}
+
 std::string StatusToString(
     const invalidation::Status& status) {
   std::stringstream ss;
@@ -57,17 +64,7 @@ std::string InvalidationToString(
   std::stringstream ss;
   ss << "{ ";
   ss << "object_id: " << ObjectIdToString(invalidation.object_id()) << ", ";
-  ss << "version: " << invalidation.version() << ", ";
-  ss << "components: { ";
-  const invalidation::ComponentStampLog& component_stamp_log =
-      invalidation.component_stamp_log();
-  for (int i = 0; i < component_stamp_log.stamp_size(); ++i) {
-    const invalidation::ComponentStamp& component_stamp =
-        component_stamp_log.stamp(i);
-    ss << "component: " << component_stamp.component() << ", ";
-    ss << "time: " << component_stamp.time() << ", ";
-  }
-  ss << " }";
+  ss << "version: " << invalidation.version();
   ss << " }";
   return ss.str();
 }
@@ -77,7 +74,7 @@ std::string RegistrationUpdateToString(
   std::stringstream ss;
   ss << "{ ";
   ss << "type: " << update.type() << ", ";
-  ss << "object_id: " << ObjectIdToString(update.object_id()) << ", ";
+  ss << "object_id: " << ObjectIdPToString(update.object_id()) << ", ";
   ss << "version: " << update.version() << ", ";
   ss << "sequence_number: " << update.sequence_number();
   ss << " }";
diff --git a/chrome/browser/sync/notifier/invalidation_util.h b/chrome/browser/sync/notifier/invalidation_util.h
index 75a9f6b..639ecdf 100644
--- a/chrome/browser/sync/notifier/invalidation_util.h
+++ b/chrome/browser/sync/notifier/invalidation_util.h
@@ -28,6 +28,8 @@ bool ObjectIdToRealModelType(const invalidation::ObjectId& object_id,
 
 std::string ObjectIdToString(const invalidation::ObjectId& object_id);
 
+std::string ObjectIdPToString(const invalidation::ObjectIdP& object_id);
+
 std::string StatusToString(const invalidation::Status& status);
 
 std::string InvalidationToString(