Delete unused InvalidationObjectId

Bug: 1029481
Change-Id: I5863bfa19ec45d668e742895b4e59aab73fb8042
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2050782
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Auto-Submit: Marc Treib <treib@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740660}

components/invalidation/impl/fcm_invalidation_listener.h

@@ -15,7 +15,6 @@
 #include "components/invalidation/impl/per_user_topic_subscription_manager.h"
 #include "components/invalidation/impl/unacked_invalidation_set.h"
 #include "components/invalidation/public/ack_handler.h"
-#include "components/invalidation/public/invalidation_object_id.h"
 #include "components/invalidation/public/invalidation_util.h"
 #include "components/invalidation/public/invalidator_state.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"

components/invalidation/public/invalidation_object_id.h

-// Copyright 2018 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.
-
-#ifndef COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_OBJECT_ID_H_
-#define COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_OBJECT_ID_H_
-
-#include <string>
-
-namespace invalidation {
-
-/* A class to represent a unique object id that an application can register or
- * unregister for.
- */
-class InvalidationObjectId {
- public:
-  InvalidationObjectId() : is_initialized_(false) {}
-
-  /* Creates an object id for the given source and name (the name is copied). */
-  InvalidationObjectId(int source, const std::string& name)
-      : is_initialized_(true), source_(source), name_(name) {}
-
-  void Init(int source, const std::string& name) {
-    is_initialized_ = true;
-    source_ = source;
-    name_ = name;
-  }
-
-  int source() const {
-    DCHECK(is_initialized_);
-    return source_;
-  }
-
-  const std::string& name() const {
-    DCHECK(is_initialized_);
-    return name_;
-  }
-
-  bool operator==(const InvalidationObjectId& object_id) const {
-    DCHECK(is_initialized_);
-    DCHECK(object_id.is_initialized_);
-    return (source() == object_id.source()) && (name() == object_id.name());
-  }
-
- private:
-  /* Whether the object id has been initialized. */
-  bool is_initialized_;
-
-  /* The invalidation source type. */
-  int source_;
-
-  /* The name/unique id for the object. */
-  std::string name_;
-};
-
-}  // namespace invalidation
-
-#endif  // COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_OBJECT_ID_H_

components/invalidation/public/invalidation_util.cc

@@ -13,16 +13,8 @@
 #include "base/values.h"
 #include "components/invalidation/public/invalidation.h"
 #include "components/invalidation/public/invalidation_handler.h"
-#include "components/invalidation/public/invalidation_object_id.h"
 #include "google/cacheinvalidation/include/types.h"
 
-namespace {
-
-const char kSourceKey[] = "source";
-const char kNameKey[] = "name";
-
-}  // namespace
-
 namespace syncer {
 
 const int kDeprecatedSourceForFCM = 2000;
@@ -81,67 +73,6 @@ std::string ObjectIdToString(const invalidation::ObjectId& object_id) {
   return str;
 }
 
-bool InvalidationObjectIdLessThan::operator()(
-    const invalidation::InvalidationObjectId& lhs,
-    const invalidation::InvalidationObjectId& rhs) const {
-  return (lhs.source() < rhs.source()) ||
-         (lhs.source() == rhs.source() && lhs.name() < rhs.name());
-}
-
-std::unique_ptr<base::DictionaryValue> InvalidationObjectIdToValue(
-    const invalidation::InvalidationObjectId& object_id) {
-  std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
-  value->SetString(kNameKey, object_id.name());
-  value->SetInteger(kSourceKey, object_id.source());
-  return value;
-}
-
-std::string SerializeInvalidationObjectId(
-    const invalidation::InvalidationObjectId& object_id) {
-  std::unique_ptr<base::DictionaryValue> value =
-      InvalidationObjectIdToValue(object_id);
-  std::string serialized_id;
-  JSONStringValueSerializer serializer(&serialized_id);
-  serializer.Serialize(*value);
-  return serialized_id;
-}
-
-bool DeserializeInvalidationObjectId(const std::string& serialized_id,
-                                     invalidation::InvalidationObjectId* id) {
-  JSONStringValueDeserializer deserializer(serialized_id);
-  int error_code;
-  std::string error_msg;
-  std::unique_ptr<base::Value> value =
-      deserializer.Deserialize(&error_code, &error_msg);
-  base::DictionaryValue* dict = nullptr;
-
-  if (!value->GetAsDictionary(&dict)) {
-    DLOG(WARNING) << "Unable to get dictionary";
-    return false;
-  }
-
-  int source = 0;
-  if (!dict->GetInteger(kSourceKey, &source)) {
-    DLOG(WARNING) << "Unable to deserialize source";
-    return false;
-  }
-
-  std::string name;
-  if (!dict->GetString(kNameKey, &name)) {
-    DLOG(WARNING) << "Unable to deserialize name";
-    return false;
-  }
-  id->Init(source, name);
-  return true;
-}
-
-std::string InvalidationObjectIdToString(
-    const invalidation::InvalidationObjectId& object_id) {
-  std::string str;
-  base::JSONWriter::Write(*InvalidationObjectIdToValue(object_id), &str);
-  return str;
-}
-
 Topics ConvertIdsToTopics(ObjectIdSet ids, InvalidationHandler* handler) {
   Topics topics;
   for (const auto& id : ids)

components/invalidation/public/invalidation_util.h

@@ -23,7 +23,6 @@ class DictionaryValue;
 
 namespace invalidation {
 class ObjectId;
-class InvalidationObjectId;
 }  // namespace invalidation
 
 namespace syncer {
@@ -92,13 +91,6 @@ bool ObjectIdFromValue(const base::DictionaryValue& value,
 INVALIDATION_EXPORT std::string ObjectIdToString(
     const invalidation::ObjectId& object_id);
 
-// Same set of utils as above but for the InvalidationObjectId.
-
-struct INVALIDATION_EXPORT InvalidationObjectIdLessThan {
-  bool operator()(const invalidation::InvalidationObjectId& lhs,
-                  const invalidation::InvalidationObjectId& rhs) const;
-};
-
 ObjectIdSet ConvertTopicsToIds(TopicSet topics);
 ObjectIdSet ConvertTopicsToIds(Topics topics);
 invalidation::ObjectId ConvertTopicToId(const Topic& topic);