Decomped registration logic into its own class.

chrome/browser/sync/notifier/invalidation_util.cc

 // Copyright (c) 2010 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 "chrome/browser/sync/notifier/invalidation_util.h"
 
 #include <sstream>
 
 namespace sync_notifier {
 
 void RunAndDeleteClosure(invalidation::Closure* task) {
   task->Run();
   delete task;
 }
 
-// We need to write our own protobuf to string functions because we
-// use LITE_RUNTIME, which doesn't support DebugString().
+bool RealModelTypeToObjectId(syncable::ModelType model_type,
+                             invalidation::ObjectId* object_id) {
+  std::string notification_type;
+  if (!syncable::RealModelTypeToNotificationType(
+          model_type, &notification_type)) {
+    return false;
+  }
+  object_id->mutable_name()->set_string_value(notification_type);
+  object_id->set_source(invalidation::ObjectId::CHROME_SYNC);
+  return true;
+}
+
+bool ObjectIdToRealModelType(const invalidation::ObjectId& object_id,
+                             syncable::ModelType* model_type) {
+  return
+      syncable::NotificationTypeToRealModelType(
+          object_id.name().string_value(), model_type);
+}
 
 std::string ObjectIdToString(
     const invalidation::ObjectId& object_id) {
   std::stringstream ss;
   ss << "{ ";
   ss << "name: " << object_id.name().string_value() << ", ";
   ss << "source: " << object_id.source();
   ss << " }";
   return ss.str();
 }
@@ skipping 45 matching lines @@
   std::stringstream ss;
   ss << "{ ";
   ss << "operation: "
      << RegistrationUpdateToString(update_result.operation()) << ", ";
   ss << "status: " << StatusToString(update_result.status());
   ss << " }";
   return ss.str();
 }
 
 }  // namespace sync_notifier