Commit 06142604 authored by Mohamed Amir Yosef's avatar Mohamed Amir Yosef Committed by Commit Bot

[Sync] Delete FakeServerInvalidationService

With the recent introduction of FakeServerInvalidationSender which
excerises FCM-based invalidation production code, the
FakeServerInvalidationService isn't needed anymore.

Change-Id: I18b8eba337c27d9d3f7a5d12dd101ed5aea0c38f
Bug: 985287
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1758242
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689579}
parent 06767a26
// Copyright 2014 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/test/integration/fake_server_invalidation_service.h"
#include "components/invalidation/impl/invalidation_service_util.h"
#include "components/invalidation/public/invalidation.h"
#include "components/invalidation/public/object_id_invalidation_map.h"
#include "components/sync/base/invalidation_helper.h"
namespace fake_server {
FakeServerInvalidationService::FakeServerInvalidationService()
: client_id_(invalidation::GenerateInvalidatorClientId()),
self_notify_(true) {
invalidator_registrar_.UpdateInvalidatorState(syncer::INVALIDATIONS_ENABLED);
}
FakeServerInvalidationService::~FakeServerInvalidationService() {
}
void FakeServerInvalidationService::RegisterInvalidationHandler(
syncer::InvalidationHandler* handler) {
invalidator_registrar_.RegisterHandler(handler);
}
bool FakeServerInvalidationService::UpdateRegisteredInvalidationIds(
syncer::InvalidationHandler* handler,
const syncer::ObjectIdSet& ids) {
return invalidator_registrar_.UpdateRegisteredIds(handler, ids);
}
void FakeServerInvalidationService::UnregisterInvalidationHandler(
syncer::InvalidationHandler* handler) {
invalidator_registrar_.UnregisterHandler(handler);
}
syncer::InvalidatorState FakeServerInvalidationService::GetInvalidatorState()
const {
return invalidator_registrar_.GetInvalidatorState();
}
std::string FakeServerInvalidationService::GetInvalidatorClientId() const {
return client_id_;
}
invalidation::InvalidationLogger*
FakeServerInvalidationService::GetInvalidationLogger() {
return nullptr;
}
void FakeServerInvalidationService::RequestDetailedStatus(
base::Callback<void(const base::DictionaryValue&)> caller) const {
base::DictionaryValue value;
caller.Run(value);
}
void FakeServerInvalidationService::EnableSelfNotifications() {
self_notify_ = true;
}
void FakeServerInvalidationService::DisableSelfNotifications() {
self_notify_ = false;
}
void FakeServerInvalidationService::OnCommit(
const std::string& committer_id,
syncer::ModelTypeSet committed_model_types) {
syncer::ObjectIdSet object_ids = syncer::ModelTypeSetToObjectIdSet(
committed_model_types);
syncer::ObjectIdInvalidationMap invalidation_map;
for (auto it = object_ids.begin(); it != object_ids.end(); ++it) {
// TODO(pvalenzuela): Create more refined invalidations instead of
// invalidating all items of a given type.
if (self_notify_ || client_id_ != committer_id) {
invalidation_map.Insert(syncer::Invalidation::InitUnknownVersion(*it));
}
}
invalidator_registrar_.DispatchInvalidationsToHandlers(invalidation_map);
}
} // namespace fake_server
// Copyright 2014 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 CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SERVICE_H_
#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SERVICE_H_
#include <string>
#include <utility>
#include "base/macros.h"
#include "components/invalidation/impl/deprecated_invalidator_registrar.h"
#include "components/invalidation/public/invalidation_service.h"
#include "components/sync/base/model_type.h"
#include "components/sync/test/fake_server/fake_server.h"
namespace invalidation {
class InvalidationLogger;
}
namespace fake_server {
// An InvalidationService that is used in conjunction with FakeServer.
class FakeServerInvalidationService : public invalidation::InvalidationService,
public FakeServer::Observer {
public:
FakeServerInvalidationService();
~FakeServerInvalidationService() override;
void RegisterInvalidationHandler(
syncer::InvalidationHandler* handler) override;
bool UpdateRegisteredInvalidationIds(syncer::InvalidationHandler* handler,
const syncer::ObjectIdSet& ids) override;
void UnregisterInvalidationHandler(
syncer::InvalidationHandler* handler) override;
syncer::InvalidatorState GetInvalidatorState() const override;
std::string GetInvalidatorClientId() const override;
invalidation::InvalidationLogger* GetInvalidationLogger() override;
void RequestDetailedStatus(
base::Callback<void(const base::DictionaryValue&)> caller) const override;
// Functions to enable or disable sending of self-notifications. In the real
// world, clients do not receive notifications of their own commits.
void EnableSelfNotifications();
void DisableSelfNotifications();
// FakeServer::Observer:
void OnCommit(const std::string& committer_id,
syncer::ModelTypeSet committed_model_types) override;
private:
std::string client_id_;
bool self_notify_;
syncer::DeprecatedInvalidatorRegistrar invalidator_registrar_;
DISALLOW_COPY_AND_ASSIGN(FakeServerInvalidationService);
};
} // namespace fake_server
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SERVICE_H_
......@@ -5793,8 +5793,6 @@ if (!is_android && !is_fuchsia) {
"../browser/sync/test/integration/extensions_helper.h",
"../browser/sync/test/integration/fake_server_invalidation_sender.cc",
"../browser/sync/test/integration/fake_server_invalidation_sender.h",
"../browser/sync/test/integration/fake_server_invalidation_service.cc",
"../browser/sync/test/integration/fake_server_invalidation_service.h",
"../browser/sync/test/integration/fake_server_match_status_checker.cc",
"../browser/sync/test/integration/fake_server_match_status_checker.h",
"../browser/sync/test/integration/feature_toggler.cc",
......
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