Commit fff63e13 authored by Marc Treib's avatar Marc Treib Committed by Commit Bot

Delete unused invalidation serialization code

invalidation_util.h/cc contained a few functions to convert between
InvalidationObjectId and string that were unused, so this CL removes
them.

Bug: none
Change-Id: I4b90fb78eaf4a1b4c43f193715ed9d67da4642f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1943134
Commit-Queue: Marc Treib <treib@chromium.org>
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Auto-Submit: Marc Treib <treib@chromium.org>
Reviewed-by: default avatarMohamed Amir Yosef <mamir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720189}
parent 023060d8
...@@ -235,7 +235,6 @@ test("components_unittests") { ...@@ -235,7 +235,6 @@ test("components_unittests") {
"//components/gcm_driver/instance_id:unit_tests", "//components/gcm_driver/instance_id:unit_tests",
"//components/history/content/browser:unit_tests", "//components/history/content/browser:unit_tests",
"//components/invalidation/impl:unit_tests", "//components/invalidation/impl:unit_tests",
"//components/invalidation/public:unit_tests",
"//components/keyed_service/content:unit_tests", "//components/keyed_service/content:unit_tests",
"//components/language/content/browser:unit_tests", "//components/language/content/browser:unit_tests",
"//components/link_header_util:unit_tests", "//components/link_header_util:unit_tests",
......
...@@ -36,16 +36,3 @@ static_library("public") { ...@@ -36,16 +36,3 @@ static_library("public") {
"//base:i18n", "//base:i18n",
] ]
} }
source_set("unit_tests") {
testonly = true
sources = [
"invalidation_util_unittest.cc",
]
deps = [
":public",
"//base",
"//base/test:test_support",
"//testing/gtest",
]
}
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "components/invalidation/public/invalidation_handler.h" #include "components/invalidation/public/invalidation_handler.h"
#include "components/invalidation/public/invalidation_object_id.h" #include "components/invalidation/public/invalidation_object_id.h"
#include "google/cacheinvalidation/include/types.h" #include "google/cacheinvalidation/include/types.h"
#include "google/cacheinvalidation/types.pb.h"
namespace { namespace {
......
...@@ -99,26 +99,6 @@ struct INVALIDATION_EXPORT InvalidationObjectIdLessThan { ...@@ -99,26 +99,6 @@ struct INVALIDATION_EXPORT InvalidationObjectIdLessThan {
const invalidation::InvalidationObjectId& rhs) const; const invalidation::InvalidationObjectId& rhs) const;
}; };
typedef std::set<invalidation::InvalidationObjectId,
InvalidationObjectIdLessThan>
InvalidationObjectIdSet;
typedef std::
map<invalidation::InvalidationObjectId, int, InvalidationObjectIdLessThan>
InvalidationObjectIdCountMap;
std::unique_ptr<base::DictionaryValue> InvalidationObjectIdToValue(
const invalidation::InvalidationObjectId& object_id);
// TODO(melandory): figure out the security implications for such serialization.
std::string SerializeInvalidationObjectId(
const invalidation::InvalidationObjectId& object_id);
bool DeserializeInvalidationObjectId(const std::string& serialized,
invalidation::InvalidationObjectId* id);
INVALIDATION_EXPORT std::string InvalidationObjectIdToString(
const invalidation::InvalidationObjectId& object_id);
ObjectIdSet ConvertTopicsToIds(TopicSet topics); ObjectIdSet ConvertTopicsToIds(TopicSet topics);
ObjectIdSet ConvertTopicsToIds(Topics topics); ObjectIdSet ConvertTopicsToIds(Topics topics);
invalidation::ObjectId ConvertTopicToId(const Topic& topic); invalidation::ObjectId ConvertTopicToId(const Topic& topic);
......
// 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.
#include "components/invalidation/public/invalidation_util.h"
#include "components/invalidation/public/invalidation_object_id.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace syncer {
class InvalidationObjectIdSerializationTest : public testing::Test {
public:
InvalidationObjectIdSerializationTest() : kObjectId_(10, "ASDF") {}
const invalidation::InvalidationObjectId kObjectId_;
};
TEST_F(InvalidationObjectIdSerializationTest,
ShouldCorrectlyDeserializeSerialized) {
std::string serialized = SerializeInvalidationObjectId(kObjectId_);
invalidation::InvalidationObjectId id;
DeserializeInvalidationObjectId(serialized, &id);
EXPECT_EQ(kObjectId_, id);
}
} // namespace syncer
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment