[Invalidations] Avoid usages of syncer namespace
Significant part of components/invalidation was under syncer namespace,
while other part was under invalidation namespace. This CL makes
components/invalidation content consistently using invalidation
namespace.
This CL is a pure refactoring.
Bug: 1031125
Change-Id: I37614c39c79b05cca457a2f8619d1f5bfdf1546d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617850
Reviewed-by: Marc Treib <[email protected]>
Reviewed-by: David Roger <[email protected]>
Reviewed-by: Ryo Hashimoto <[email protected]>
Commit-Queue: Maksim Moskvitin <[email protected]>
Cr-Commit-Position: refs/heads/master@{#842486}
diff --git a/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator.cc b/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator.cc
index 97031cf..c2eb8b1 100644
--- a/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator.cc
+++ b/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator.cc
@@ -51,7 +51,7 @@
CertProvisioningInvalidationHandler::BuildAndRegister(
CertScope scope,
invalidation::InvalidationService* invalidation_service,
- const syncer::Topic& topic,
+ const invalidation::Topic& topic,
OnInvalidationCallback on_invalidation_callback) {
auto invalidator = std::make_unique<CertProvisioningInvalidationHandler>(
scope, invalidation_service, topic, std::move(on_invalidation_callback));
@@ -66,7 +66,7 @@
CertProvisioningInvalidationHandler::CertProvisioningInvalidationHandler(
CertScope scope,
invalidation::InvalidationService* invalidation_service,
- const syncer::Topic& topic,
+ const invalidation::Topic& topic,
OnInvalidationCallback on_invalidation_callback)
: scope_(scope),
invalidation_service_(invalidation_service),
@@ -109,8 +109,8 @@
// Assuming that updating invalidator's topics with empty set can never fail
// since failure is only possible non-empty set with topic associated with
// some other invalidator.
- const bool topics_reset =
- invalidation_service_->UpdateInterestedTopics(this, syncer::TopicSet());
+ const bool topics_reset = invalidation_service_->UpdateInterestedTopics(
+ this, invalidation::TopicSet());
DCHECK(topics_reset);
invalidation_service_observer_.Remove(invalidation_service_);
@@ -118,22 +118,22 @@
}
void CertProvisioningInvalidationHandler::OnInvalidatorStateChange(
- syncer::InvalidatorState state) {
+ invalidation::InvalidatorState state) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
state_.is_invalidation_service_enabled =
- state == syncer::INVALIDATIONS_ENABLED;
+ state == invalidation::INVALIDATIONS_ENABLED;
}
void CertProvisioningInvalidationHandler::OnIncomingInvalidation(
- const syncer::TopicInvalidationMap& invalidation_map) {
+ const invalidation::TopicInvalidationMap& invalidation_map) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
if (!state_.is_invalidation_service_enabled) {
LOG(WARNING) << "Unexpected invalidation received.";
}
- const syncer::SingleObjectInvalidationSet& list =
+ const invalidation::SingleObjectInvalidationSet& list =
invalidation_map.ForTopic(topic_);
if (list.IsEmpty()) {
NOTREACHED() << "Incoming invlaidation does not contain invalidation"
@@ -154,7 +154,7 @@
}
bool CertProvisioningInvalidationHandler::IsPublicTopic(
- const syncer::Topic& topic) const {
+ const invalidation::Topic& topic) const {
return base::StartsWith(topic, kFcmCertProvisioningPublicTopicPrefix,
base::CompareCase::SENSITIVE);
}
@@ -195,7 +195,7 @@
}
void CertProvisioningUserInvalidator::Register(
- const syncer::Topic& topic,
+ const invalidation::Topic& topic,
OnInvalidationCallback on_invalidation_callback) {
invalidation::ProfileInvalidationProvider* invalidation_provider =
invalidation::ProfileInvalidationProviderFactory::GetForProfile(profile_);
@@ -241,7 +241,7 @@
}
void CertProvisioningDeviceInvalidator::Register(
- const syncer::Topic& topic,
+ const invalidation::Topic& topic,
OnInvalidationCallback on_invalidation_callback) {
topic_ = topic;
on_invalidation_callback_ = std::move(on_invalidation_callback);
diff --git a/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator.h b/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator.h
index 903abcb..78e944d9 100644
--- a/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator.h
+++ b/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator.h
@@ -33,7 +33,8 @@
// topic when destroyed so that subscription can be preserved if browser
// restarts. A user must explicitly call |Unregister| if subscription is not
// needed anymore.
-class CertProvisioningInvalidationHandler : public syncer::InvalidationHandler {
+class CertProvisioningInvalidationHandler
+ : public invalidation::InvalidationHandler {
public:
// Creates and registers the handler to |invalidation_service| with |topic|.
// |on_invalidation_callback| will be called when incoming invalidation is
@@ -42,13 +43,13 @@
static std::unique_ptr<CertProvisioningInvalidationHandler> BuildAndRegister(
CertScope scope,
invalidation::InvalidationService* invalidation_service,
- const syncer::Topic& topic,
+ const invalidation::Topic& topic,
OnInvalidationCallback on_invalidation_callback);
CertProvisioningInvalidationHandler(
CertScope scope,
invalidation::InvalidationService* invalidation_service,
- const syncer::Topic& topic,
+ const invalidation::Topic& topic,
OnInvalidationCallback on_invalidation_callback);
CertProvisioningInvalidationHandler(
const CertProvisioningInvalidationHandler&) = delete;
@@ -60,12 +61,12 @@
// Unregisters handler and unsubscribes given topic from invalidation service.
void Unregister();
- // syncer::InvalidationHandler:
- void OnInvalidatorStateChange(syncer::InvalidatorState state) override;
+ // invalidation::InvalidationHandler:
+ void OnInvalidatorStateChange(invalidation::InvalidatorState state) override;
void OnIncomingInvalidation(
- const syncer::TopicInvalidationMap& invalidation_map) override;
+ const invalidation::TopicInvalidationMap& invalidation_map) override;
std::string GetOwnerName() const override;
- bool IsPublicTopic(const syncer::Topic& topic) const override;
+ bool IsPublicTopic(const invalidation::Topic& topic) const override;
private:
// Registers the handler to |invalidation_service_| and subscribes with
@@ -91,13 +92,13 @@
ScopedObserver<
invalidation::InvalidationService,
- syncer::InvalidationHandler,
+ invalidation::InvalidationHandler,
&invalidation::InvalidationService::RegisterInvalidationHandler,
&invalidation::InvalidationService::UnregisterInvalidationHandler>
invalidation_service_observer_{this};
// A topic representing certificate invalidations.
- const syncer::Topic topic_;
+ const invalidation::Topic topic_;
// A callback to be called on incoming invalidation event.
const OnInvalidationCallback on_invalidation_callback_;
@@ -139,7 +140,7 @@
delete;
virtual ~CertProvisioningInvalidator();
- virtual void Register(const syncer::Topic& topic,
+ virtual void Register(const invalidation::Topic& topic,
OnInvalidationCallback on_invalidation_callback) = 0;
virtual void Unregister();
@@ -168,7 +169,7 @@
public:
explicit CertProvisioningUserInvalidator(Profile* profile);
- void Register(const syncer::Topic& topic,
+ void Register(const invalidation::Topic& topic,
OnInvalidationCallback on_invalidation_callback) override;
private:
@@ -200,7 +201,7 @@
policy::AffiliatedInvalidationServiceProvider* service_provider);
~CertProvisioningDeviceInvalidator() override;
- void Register(const syncer::Topic& topic,
+ void Register(const invalidation::Topic& topic,
OnInvalidationCallback on_invalidation_callback) override;
void Unregister() override;
@@ -209,7 +210,7 @@
void OnInvalidationServiceSet(
invalidation::InvalidationService* invalidation_service) override;
- syncer::Topic topic_;
+ invalidation::Topic topic_;
OnInvalidationCallback on_invalidation_callback_;
policy::AffiliatedInvalidationServiceProvider* service_provider_ = nullptr;
};
diff --git a/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator_unittest.cc b/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator_unittest.cc
index 0960b13..6cc5aec 100644
--- a/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator_unittest.cc
+++ b/chrome/browser/chromeos/cert_provisioning/cert_provisioning_invalidator_unittest.cc
@@ -53,30 +53,34 @@
}
void EnableInvalidationService() {
- invalidation_service_.SetInvalidatorState(syncer::INVALIDATIONS_ENABLED);
+ invalidation_service_.SetInvalidatorState(
+ invalidation::INVALIDATIONS_ENABLED);
}
void DisableInvalidationService() {
invalidation_service_.SetInvalidatorState(
- syncer::TRANSIENT_INVALIDATION_ERROR);
+ invalidation::TRANSIENT_INVALIDATION_ERROR);
}
- syncer::Invalidation CreateInvalidation(const syncer::Topic& topic) {
- return syncer::Invalidation::InitUnknownVersion(topic);
+ invalidation::Invalidation CreateInvalidation(
+ const invalidation::Topic& topic) {
+ return invalidation::Invalidation::InitUnknownVersion(topic);
}
- syncer::Invalidation FireInvalidation(const syncer::Topic& topic) {
- const syncer::Invalidation invalidation = CreateInvalidation(topic);
+ invalidation::Invalidation FireInvalidation(
+ const invalidation::Topic& topic) {
+ const invalidation::Invalidation invalidation = CreateInvalidation(topic);
invalidation_service_.EmitInvalidationForTest(invalidation);
base::RunLoop().RunUntilIdle();
return invalidation;
}
- bool IsInvalidationSent(const syncer::Invalidation& invalidation) {
+ bool IsInvalidationSent(const invalidation::Invalidation& invalidation) {
return !invalidation_service_.GetMockAckHandler()->IsUnsent(invalidation);
}
- bool IsInvalidationAcknowledged(const syncer::Invalidation& invalidation) {
+ bool IsInvalidationAcknowledged(
+ const invalidation::Invalidation& invalidation) {
return invalidation_service_.GetMockAckHandler()->IsAcknowledged(
invalidation);
}
@@ -96,8 +100,8 @@
base::test::SingleThreadTaskEnvironment task_environment_;
- const syncer::Topic kInvalidatorTopic;
- const syncer::Topic kSomeOtherTopic;
+ const invalidation::Topic kInvalidatorTopic;
+ const invalidation::Topic kSomeOtherTopic;
invalidation::FakeInvalidationService invalidation_service_;
@@ -180,7 +184,7 @@
EXPECT_EQ(0, incoming_invalidations_count_);
// Ensure that topic is still subscribed.
- const syncer::Topics topics =
+ const invalidation::Topics topics =
invalidation_service_.invalidator_registrar().GetAllSubscribedTopics();
EXPECT_NE(topics.end(), topics.find(kInvalidatorTopic));
}
diff --git a/chrome/browser/chromeos/cert_provisioning/mock_cert_provisioning_invalidator.h b/chrome/browser/chromeos/cert_provisioning/mock_cert_provisioning_invalidator.h
index f67499b..01e7d49c 100644
--- a/chrome/browser/chromeos/cert_provisioning/mock_cert_provisioning_invalidator.h
+++ b/chrome/browser/chromeos/cert_provisioning/mock_cert_provisioning_invalidator.h
@@ -32,7 +32,7 @@
MOCK_METHOD(void,
Register,
- (const syncer::Topic& topic,
+ (const invalidation::Topic& topic,
OnInvalidationCallback on_invalidation_callback),
(override));
diff --git a/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc b/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc
index d186521..e860fcc6 100644
--- a/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc
+++ b/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc
@@ -128,10 +128,10 @@
// timestamp in microseconds. The policy blob contains a timestamp in
// milliseconds. Convert from one to the other by multiplying by 1000.
const int64_t invalidation_version = policy.policy_data().timestamp() * 1000;
- syncer::Invalidation invalidation = syncer::Invalidation::Init(
+ invalidation::Invalidation invalidation = invalidation::Invalidation::Init(
kPolicyInvalidationTopic, invalidation_version, "dummy payload");
- syncer::TopicInvalidationMap invalidation_map;
+ invalidation::TopicInvalidationMap invalidation_map;
invalidation_map.Insert(invalidation);
invalidator->OnIncomingInvalidation(invalidation_map);
diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
index c31f521..e061c319 100644
--- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
+++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
@@ -72,7 +72,7 @@
} // namespace
class AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver
- : public syncer::InvalidationHandler {
+ : public invalidation::InvalidationHandler {
public:
explicit InvalidationServiceObserver(
AffiliatedInvalidationServiceProviderImpl* parent,
@@ -83,10 +83,10 @@
void CheckInvalidatorState();
bool IsServiceConnected() const;
- // public syncer::InvalidationHandler:
- void OnInvalidatorStateChange(syncer::InvalidatorState state) override;
+ // public invalidation::InvalidationHandler:
+ void OnInvalidatorStateChange(invalidation::InvalidatorState state) override;
void OnIncomingInvalidation(
- const syncer::TopicInvalidationMap& invalidation_map) override;
+ const invalidation::TopicInvalidationMap& invalidation_map) override;
std::string GetOwnerName() const override;
private:
@@ -112,7 +112,7 @@
is_observer_ready_(false) {
invalidation_service_->RegisterInvalidationHandler(this);
is_service_connected_ = invalidation_service->GetInvalidatorState() ==
- syncer::INVALIDATIONS_ENABLED;
+ invalidation::INVALIDATIONS_ENABLED;
is_observer_ready_ = true;
}
@@ -140,13 +140,14 @@
DCHECK(invalidation_service_);
DCHECK(parent_);
- syncer::InvalidatorState state = invalidation_service_->GetInvalidatorState();
- bool is_service_connected = (state == syncer::INVALIDATIONS_ENABLED);
+ invalidation::InvalidatorState state =
+ invalidation_service_->GetInvalidatorState();
+ bool is_service_connected = (state == invalidation::INVALIDATIONS_ENABLED);
if (is_service_connected_ == is_service_connected)
return;
- if (state == syncer::TRANSIENT_INVALIDATION_ERROR) {
+ if (state == invalidation::TRANSIENT_INVALIDATION_ERROR) {
// Do not cause disconnect if the number of disconnections caused by
// TRANSIENT_INVALIDATION_ERROR is more than the limit.
if (!transient_error_disconnect_limit_)
@@ -162,7 +163,7 @@
}
void AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver::
- OnInvalidatorStateChange(syncer::InvalidatorState state) {
+ OnInvalidatorStateChange(invalidation::InvalidatorState state) {
if (!is_observer_ready_)
return;
@@ -174,13 +175,13 @@
// * state == TRANSIENT_INVALIDATION_ERROR, hopefully will be resolved by
// InvalidationService, if not InvalidationService should notify again
// with another more severe state.
- bool should_notify = (state != syncer::INVALIDATIONS_ENABLED &&
- state != syncer::TRANSIENT_INVALIDATION_ERROR);
+ bool should_notify = (state != invalidation::INVALIDATIONS_ENABLED &&
+ state != invalidation::TRANSIENT_INVALIDATION_ERROR);
if (should_notify) {
is_service_connected_ = false;
parent_->OnInvalidationServiceDisconnected(invalidation_service_);
- } else if (state == syncer::TRANSIENT_INVALIDATION_ERROR) {
+ } else if (state == invalidation::TRANSIENT_INVALIDATION_ERROR) {
transient_error_retry_timer_.Stop();
transient_error_retry_timer_.Start(
FROM_HERE, kCheckInvalidatorStateDelay,
@@ -191,7 +192,7 @@
} else {
// If service is disconnected, ONLY notify parent in case:
// * state == INVALIDATIONS_ENABLED
- bool should_notify = (state == syncer::INVALIDATIONS_ENABLED);
+ bool should_notify = (state == invalidation::INVALIDATIONS_ENABLED);
if (should_notify) {
is_service_connected_ = true;
parent_->OnInvalidationServiceConnected(invalidation_service_);
@@ -201,7 +202,7 @@
void AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver::
OnIncomingInvalidation(
- const syncer::TopicInvalidationMap& invalidation_map) {}
+ const invalidation::TopicInvalidationMap& invalidation_map) {}
std::string AffiliatedInvalidationServiceProviderImpl::
InvalidationServiceObserver::GetOwnerName() const {
@@ -438,13 +439,13 @@
auto device_invalidation_service =
std::make_unique<invalidation::FCMInvalidationService>(
device_identity_provider_.get(),
- base::BindRepeating(&syncer::FCMNetworkHandler::Create,
+ base::BindRepeating(&invalidation::FCMNetworkHandler::Create,
g_browser_process->gcm_driver(),
device_instance_id_driver_.get()),
- base::BindRepeating(&syncer::PerUserTopicSubscriptionManager::Create,
- device_identity_provider_.get(),
- g_browser_process->local_state(),
- base::RetainedRef(url_loader_factory)),
+ base::BindRepeating(
+ &invalidation::PerUserTopicSubscriptionManager::Create,
+ device_identity_provider_.get(), g_browser_process->local_state(),
+ base::RetainedRef(url_loader_factory)),
device_instance_id_driver_.get(), g_browser_process->local_state(),
policy::kPolicyFCMInvalidationSenderID);
device_invalidation_service->Init();
diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
index 2fb1a80..a1bf3720 100644
--- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
+++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
@@ -57,7 +57,7 @@
std::unique_ptr<invalidation::FakeInvalidationService> invalidation_service(
new invalidation::FakeInvalidationService);
invalidation_service->SetInvalidatorState(
- syncer::TRANSIENT_INVALIDATION_ERROR);
+ invalidation::TRANSIENT_INVALIDATION_ERROR);
return invalidation_service;
}
@@ -70,7 +70,7 @@
void SendInvalidatorStateChangeNotification(
invalidation::InvalidationService* service,
- syncer::InvalidatorState state) {
+ invalidation::InvalidatorState state) {
static_cast<invalidation::FCMInvalidationService*>(service)
->OnInvalidatorStateChange(state);
}
@@ -78,8 +78,8 @@
} // namespace
// A simple AffiliatedInvalidationServiceProvider::Consumer that registers a
-// syncer::FakeInvalidationHandler with the invalidation::InvalidationService
-// that is currently being made available.
+// invalidation::FakeInvalidationHandler with
+// the invalidation::InvalidationService that is currently being made available.
class FakeConsumer : public AffiliatedInvalidationServiceProvider::Consumer {
public:
explicit FakeConsumer(AffiliatedInvalidationServiceProviderImpl* provider);
@@ -94,7 +94,7 @@
private:
AffiliatedInvalidationServiceProviderImpl* provider_;
- syncer::FakeInvalidationHandler invalidation_handler_;
+ invalidation::FakeInvalidationHandler invalidation_handler_;
int invalidation_service_set_count_ = 0;
invalidation::InvalidationService* invalidation_service_ = nullptr;
@@ -287,7 +287,7 @@
// that the consumer is informed about this.
EXPECT_EQ(0, consumer_->GetAndClearInvalidationServiceSetCount());
profile_invalidation_service_->SetInvalidatorState(
- syncer::INVALIDATIONS_ENABLED);
+ invalidation::INVALIDATIONS_ENABLED);
EXPECT_EQ(1, consumer_->GetAndClearInvalidationServiceSetCount());
EXPECT_EQ(profile_invalidation_service_, consumer_->GetInvalidationService());
@@ -312,7 +312,7 @@
// Indicate that the per-profile invalidation service has connected. Verify
// that the consumer is not called back.
profile_invalidation_service_->SetInvalidatorState(
- syncer::INVALIDATIONS_ENABLED);
+ invalidation::INVALIDATIONS_ENABLED);
EXPECT_EQ(0, consumer_->GetAndClearInvalidationServiceSetCount());
// Verify that the device-global invalidation service still exists.
@@ -330,7 +330,7 @@
// that the consumer is informed about this.
EXPECT_EQ(0, consumer_->GetAndClearInvalidationServiceSetCount());
SendInvalidatorStateChangeNotification(device_invalidation_service_,
- syncer::INVALIDATIONS_ENABLED);
+ invalidation::INVALIDATIONS_ENABLED);
EXPECT_EQ(1, consumer_->GetAndClearInvalidationServiceSetCount());
EXPECT_EQ(device_invalidation_service_, consumer_->GetInvalidationService());
}
@@ -343,7 +343,7 @@
// that the consumer is informed about this.
EXPECT_EQ(0, consumer_->GetAndClearInvalidationServiceSetCount());
profile_invalidation_service_->SetInvalidatorState(
- syncer::INVALIDATION_CREDENTIALS_REJECTED);
+ invalidation::INVALIDATION_CREDENTIALS_REJECTED);
EXPECT_EQ(1, consumer_->GetAndClearInvalidationServiceSetCount());
EXPECT_EQ(nullptr, consumer_->GetInvalidationService());
@@ -409,7 +409,8 @@
// Verify that the consumer is informed about this.
EXPECT_EQ(0, consumer_->GetAndClearInvalidationServiceSetCount());
SendInvalidatorStateChangeNotification(
- device_invalidation_service_, syncer::INVALIDATION_CREDENTIALS_REJECTED);
+ device_invalidation_service_,
+ invalidation::INVALIDATION_CREDENTIALS_REJECTED);
EXPECT_EQ(1, consumer_->GetAndClearInvalidationServiceSetCount());
EXPECT_EQ(nullptr, consumer_->GetInvalidationService());
@@ -562,7 +563,7 @@
// Indicate that the second user's per-profile invalidation service has
// connected. Verify that the consumer is not called back.
second_profile_invalidation_service->SetInvalidatorState(
- syncer::INVALIDATIONS_ENABLED);
+ invalidation::INVALIDATIONS_ENABLED);
EXPECT_EQ(0, consumer_->GetAndClearInvalidationServiceSetCount());
// Indicate that the first user's per-profile invalidation service has
@@ -571,7 +572,7 @@
// user's.
EXPECT_EQ(0, consumer_->GetAndClearInvalidationServiceSetCount());
profile_invalidation_service_->SetInvalidatorState(
- syncer::INVALIDATION_CREDENTIALS_REJECTED);
+ invalidation::INVALIDATION_CREDENTIALS_REJECTED);
EXPECT_EQ(1, consumer_->GetAndClearInvalidationServiceSetCount());
EXPECT_EQ(second_profile_invalidation_service,
consumer_->GetInvalidationService());
@@ -661,7 +662,7 @@
// Indicate that the second user's per-profile invalidation service has
// connected. Verify that the consumer is not called back.
second_profile_invalidation_service->SetInvalidatorState(
- syncer::INVALIDATIONS_ENABLED);
+ invalidation::INVALIDATIONS_ENABLED);
EXPECT_EQ(0, consumer_->GetAndClearInvalidationServiceSetCount());
// Verify that the device-global invalidation service still does not exist.
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
index 2f5c2d9..cc4d031 100644
--- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
@@ -51,12 +51,12 @@
auto service = std::make_unique<FCMInvalidationService>(
identity_provider,
base::BindRepeating(
- &syncer::FCMNetworkHandler::Create,
+ &FCMNetworkHandler::Create,
gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver(),
instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile)
->driver()),
base::BindRepeating(
- &syncer::PerUserTopicSubscriptionManager::Create, identity_provider,
+ &PerUserTopicSubscriptionManager::Create, identity_provider,
profile->GetPrefs(),
base::RetainedRef(
content::BrowserContext::GetDefaultStoragePartition(profile)
diff --git a/chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc b/chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
index 693ceb9..37ee17f5 100644
--- a/chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
+++ b/chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
@@ -351,11 +351,11 @@
invalidation_service_ =
std::make_unique<invalidation::FCMInvalidationService>(
identity_provider_.get(),
- base::BindRepeating(&syncer::FCMNetworkHandler::Create,
+ base::BindRepeating(&invalidation::FCMNetworkHandler::Create,
g_browser_process->gcm_driver(),
device_instance_id_driver_.get()),
base::BindRepeating(
- &syncer::PerUserTopicSubscriptionManager::Create,
+ &invalidation::PerUserTopicSubscriptionManager::Create,
identity_provider_.get(), g_browser_process->local_state(),
base::RetainedRef(
g_browser_process->shared_url_loader_factory())),
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index 8ff0569..7e17e098 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -404,7 +404,7 @@
base::Time::NowFromSystemTime() - base::Time::UnixEpoch();
GetInvalidationServiceForSenderId(kPolicyFCMInvalidationSenderID)
- ->EmitInvalidationForTest(syncer::Invalidation::Init(
+ ->EmitInvalidationForTest(invalidation::Invalidation::Init(
policy_invalidation_topic, now.InMicroseconds() /* version */,
"payload"));
{
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
index 61342c8..1a3810e 100644
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/policy/cloud/cloud_policy_invalidator.h"
+#include <memory>
#include <utility>
#include "base/bind.h"
@@ -254,18 +255,18 @@
}
void CloudPolicyInvalidator::OnInvalidatorStateChange(
- syncer::InvalidatorState state) {
+ invalidation::InvalidatorState state) {
DCHECK(state_ == STARTED);
DCHECK(thread_checker_.CalledOnValidThread());
- invalidation_service_enabled_ = state == syncer::INVALIDATIONS_ENABLED;
+ invalidation_service_enabled_ = state == invalidation::INVALIDATIONS_ENABLED;
UpdateInvalidationsEnabled();
}
void CloudPolicyInvalidator::OnIncomingInvalidation(
- const syncer::TopicInvalidationMap& invalidation_map) {
+ const invalidation::TopicInvalidationMap& invalidation_map) {
DCHECK(state_ == STARTED);
DCHECK(thread_checker_.CalledOnValidThread());
- const syncer::SingleObjectInvalidationSet& list =
+ const invalidation::SingleObjectInvalidationSet& list =
invalidation_map.ForTopic(topic_);
if (list.IsEmpty()) {
NOTREACHED();
@@ -287,7 +288,8 @@
return owner_name_;
}
-bool CloudPolicyInvalidator::IsPublicTopic(const syncer::Topic& topic) const {
+bool CloudPolicyInvalidator::IsPublicTopic(
+ const invalidation::Topic& topic) const {
return IsPublicInvalidationTopic(topic);
}
@@ -343,7 +345,7 @@
void CloudPolicyInvalidator::OnStoreError(CloudPolicyStore* store) {}
void CloudPolicyInvalidator::HandleInvalidation(
- const syncer::Invalidation& invalidation) {
+ const invalidation::Invalidation& invalidation) {
// Ignore old invalidations.
if (invalid_ && !invalidation.is_unknown_version() &&
invalidation.version() <= invalidation_version_) {
@@ -394,7 +396,7 @@
// Update invalidation state.
invalid_ = true;
- invalidation_.reset(new syncer::Invalidation(invalidation));
+ invalidation_ = std::make_unique<invalidation::Invalidation>(invalidation);
invalidation_version_ = version;
// In order to prevent the cloud policy server from becoming overwhelmed when
@@ -426,7 +428,7 @@
const enterprise_management::PolicyData* policy) {
// Create the Topic based on the policy data.
// If the policy does not specify a Topic, then unregister.
- syncer::Topic topic;
+ invalidation::Topic topic;
if (!policy || !GetCloudPolicyTopicFromPolicy(*policy, &topic)) {
Unregister();
return;
@@ -438,7 +440,7 @@
Register(topic);
}
-void CloudPolicyInvalidator::Register(const syncer::Topic& topic) {
+void CloudPolicyInvalidator::Register(const invalidation::Topic& topic) {
// Register this handler with the invalidation service if needed.
if (!is_registered_) {
OnInvalidatorStateChange(invalidation_service_->GetInvalidatorState());
@@ -469,8 +471,8 @@
if (is_registered_) {
if (invalid_)
AcknowledgeInvalidation();
- CHECK(invalidation_service_->UpdateInterestedTopics(this,
- syncer::TopicSet()));
+ CHECK(invalidation_service_->UpdateInterestedTopics(
+ this, invalidation::TopicSet()));
invalidation_service_->UnregisterInvalidationHandler(this);
is_registered_ = false;
UpdateInvalidationsEnabled();
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.h b/chrome/browser/policy/cloud/cloud_policy_invalidator.h
index 454617fe..90e44b00 100644
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator.h
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.h
@@ -35,7 +35,7 @@
namespace policy {
// Listens for and provides policy invalidations.
-class CloudPolicyInvalidator : public syncer::InvalidationHandler,
+class CloudPolicyInvalidator : public invalidation::InvalidationHandler,
public CloudPolicyCore::Observer,
public CloudPolicyStore::Observer {
public:
@@ -116,12 +116,12 @@
return invalidation_service_;
}
- // syncer::InvalidationHandler:
- void OnInvalidatorStateChange(syncer::InvalidatorState state) override;
+ // invalidation::InvalidationHandler:
+ void OnInvalidatorStateChange(invalidation::InvalidatorState state) override;
void OnIncomingInvalidation(
- const syncer::TopicInvalidationMap& invalidation_map) override;
+ const invalidation::TopicInvalidationMap& invalidation_map) override;
std::string GetOwnerName() const override;
- bool IsPublicTopic(const syncer::Topic& topic) const override;
+ bool IsPublicTopic(const invalidation::Topic& topic) const override;
// CloudPolicyCore::Observer:
void OnCoreConnected(CloudPolicyCore* core) override;
@@ -134,7 +134,7 @@
private:
// Handle an invalidation to the policy.
- void HandleInvalidation(const syncer::Invalidation& invalidation);
+ void HandleInvalidation(const invalidation::Invalidation& invalidation);
// Update topic subscription with the invalidation service based on the
// given policy data.
@@ -142,7 +142,7 @@
// Registers this handler with |invalidation_service_| if needed and
// subscribes to the given |topic| with the invalidation service.
- void Register(const syncer::Topic& topic);
+ void Register(const invalidation::Topic& topic);
// Unregisters this handler and unsubscribes from the current topic with
// the invalidation service.
@@ -216,7 +216,7 @@
bool is_registered_;
// The topic representing the policy in the invalidation service.
- syncer::Topic topic_;
+ invalidation::Topic topic_;
// Whether the policy is current invalid. This is set to true when an
// invalidation is received and reset when the policy fetched due to the
@@ -237,7 +237,7 @@
int64_t highest_handled_invalidation_version_;
// The most up to date invalidation.
- std::unique_ptr<syncer::Invalidation> invalidation_;
+ std::unique_ptr<invalidation::Invalidation> invalidation_;
// The maximum random delay, in ms, between receiving an invalidation and
// fetching the new policy.
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
index 4094673..c2bad151 100644
--- a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
@@ -131,13 +131,14 @@
void EnableInvalidationService();
// Causes the invalidation service to fire an invalidation.
- syncer::Invalidation FireInvalidation(PolicyObject object,
- int64_t version,
- const std::string& payload);
+ invalidation::Invalidation FireInvalidation(PolicyObject object,
+ int64_t version,
+ const std::string& payload);
// Causes the invalidation service to fire an invalidation with unknown
// version.
- syncer::Invalidation FireUnknownVersionInvalidation(PolicyObject object);
+ invalidation::Invalidation FireUnknownVersionInvalidation(
+ PolicyObject object);
// Checks the expected value of the currently set invalidation info.
bool CheckInvalidationInfo(int64_t version, const std::string& payload);
@@ -151,7 +152,7 @@
bool CheckPolicyRefreshed();
bool CheckPolicyRefreshedWithUnknownVersion();
- bool IsUnsent(const syncer::Invalidation& invalidation);
+ bool IsUnsent(const invalidation::Invalidation& invalidation);
// Returns the invalidations enabled state set by the invalidator on the
// refresh scheduler.
@@ -159,7 +160,8 @@
// Determines if the invalidation with the given ack handle has been
// acknowledged.
- bool IsInvalidationAcknowledged(const syncer::Invalidation& invalidation);
+ bool IsInvalidationAcknowledged(
+ const invalidation::Invalidation& invalidation);
// Determines if the invalidator has registered for an object with the
// invalidation service.
@@ -194,7 +196,7 @@
bool CheckPolicyRefreshCount(int count);
// Returns the invalidation topic corresponding to the given policy object.
- const syncer::Topic& GetPolicyTopic(PolicyObject object) const;
+ const invalidation::Topic& GetPolicyTopic(PolicyObject object) const;
base::test::SingleThreadTaskEnvironment task_environment_;
@@ -210,8 +212,8 @@
std::unique_ptr<CloudPolicyInvalidator> invalidator_;
// Topics for the test policy objects.
- syncer::Topic topic_a_;
- syncer::Topic topic_b_;
+ invalidation::Topic topic_a_;
+ invalidation::Topic topic_b_;
// Fake policy values which are alternated to cause the store to report a
// changed policy.
@@ -321,28 +323,29 @@
void CloudPolicyInvalidatorTestBase::DisableInvalidationService() {
invalidation_service_.SetInvalidatorState(
- syncer::TRANSIENT_INVALIDATION_ERROR);
+ invalidation::TRANSIENT_INVALIDATION_ERROR);
}
void CloudPolicyInvalidatorTestBase::EnableInvalidationService() {
- invalidation_service_.SetInvalidatorState(syncer::INVALIDATIONS_ENABLED);
+ invalidation_service_.SetInvalidatorState(
+ invalidation::INVALIDATIONS_ENABLED);
}
-syncer::Invalidation CloudPolicyInvalidatorTestBase::FireInvalidation(
+invalidation::Invalidation CloudPolicyInvalidatorTestBase::FireInvalidation(
PolicyObject object,
int64_t version,
const std::string& payload) {
- syncer::Invalidation invalidation =
- syncer::Invalidation::Init(GetPolicyTopic(object), version, payload);
+ invalidation::Invalidation invalidation = invalidation::Invalidation::Init(
+ GetPolicyTopic(object), version, payload);
invalidation_service_.EmitInvalidationForTest(invalidation);
return invalidation;
}
-syncer::Invalidation
+invalidation::Invalidation
CloudPolicyInvalidatorTestBase::FireUnknownVersionInvalidation(
PolicyObject object) {
- syncer::Invalidation invalidation =
- syncer::Invalidation::InitUnknownVersion(GetPolicyTopic(object));
+ invalidation::Invalidation invalidation =
+ invalidation::Invalidation::InitUnknownVersion(GetPolicyTopic(object));
invalidation_service_.EmitInvalidationForTest(invalidation);
return invalidation;
}
@@ -365,7 +368,7 @@
}
bool CloudPolicyInvalidatorTestBase::IsUnsent(
- const syncer::Invalidation& invalidation) {
+ const invalidation::Invalidation& invalidation) {
return invalidation_service_.GetMockAckHandler()->IsUnsent(invalidation);
}
@@ -379,7 +382,7 @@
}
bool CloudPolicyInvalidatorTestBase::IsInvalidationAcknowledged(
- const syncer::Invalidation& invalidation) {
+ const invalidation::Invalidation& invalidation) {
// The acknowledgement task is run through a WeakHandle that posts back to our
// own thread. We need to run any posted tasks before we can check
// acknowledgement status.
@@ -453,7 +456,7 @@
return testing::Mock::VerifyAndClearExpectations(client_);
}
-const syncer::Topic& CloudPolicyInvalidatorTestBase::GetPolicyTopic(
+const invalidation::Topic& CloudPolicyInvalidatorTestBase::GetPolicyTopic(
PolicyObject object) const {
EXPECT_TRUE(object == POLICY_OBJECT_A || object == POLICY_OBJECT_B);
return object == POLICY_OBJECT_A ? topic_a_ : topic_b_;
@@ -557,7 +560,8 @@
EXPECT_TRUE(CheckPolicyRefreshedWithUnknownVersion());
EXPECT_TRUE(IsUnsent(FireUnknownVersionInvalidation(POLICY_OBJECT_B)));
EXPECT_TRUE(CheckPolicyNotRefreshed());
- syncer::Invalidation inv = FireUnknownVersionInvalidation(POLICY_OBJECT_A);
+ invalidation::Invalidation inv =
+ FireUnknownVersionInvalidation(POLICY_OBJECT_A);
// Check re-registration for object B. Make sure the pending invalidation for
// object A is acknowledged without making the callback.
@@ -586,7 +590,8 @@
EXPECT_TRUE(CheckPolicyRefreshedWithUnknownVersion());
// Check unregistration when store is loaded with no invalidation object id.
- syncer::Invalidation inv = FireUnknownVersionInvalidation(POLICY_OBJECT_A);
+ invalidation::Invalidation inv =
+ FireUnknownVersionInvalidation(POLICY_OBJECT_A);
EXPECT_FALSE(IsInvalidationAcknowledged(inv));
StorePolicy(POLICY_OBJECT_NONE);
EXPECT_FALSE(IsInvalidatorRegistered());
@@ -610,7 +615,7 @@
StorePolicy(POLICY_OBJECT_A);
StartInvalidator();
EXPECT_TRUE(InvalidationsEnabled());
- syncer::Invalidation inv =
+ invalidation::Invalidation inv =
FireInvalidation(POLICY_OBJECT_A, V(12), "test_payload");
// Make sure client info is set as soon as the invalidation is received.
@@ -631,7 +636,8 @@
// Register and fire invalidation with unknown version.
StorePolicy(POLICY_OBJECT_A);
StartInvalidator();
- syncer::Invalidation inv = FireUnknownVersionInvalidation(POLICY_OBJECT_A);
+ invalidation::Invalidation inv =
+ FireUnknownVersionInvalidation(POLICY_OBJECT_A);
// Make sure client info is not set until after the invalidation callback is
// made.
@@ -651,11 +657,14 @@
// Generate multiple invalidations.
StorePolicy(POLICY_OBJECT_A);
StartInvalidator();
- syncer::Invalidation inv1 = FireInvalidation(POLICY_OBJECT_A, V(1), "test1");
+ invalidation::Invalidation inv1 =
+ FireInvalidation(POLICY_OBJECT_A, V(1), "test1");
EXPECT_TRUE(CheckInvalidationInfo(V(1), "test1"));
- syncer::Invalidation inv2 = FireInvalidation(POLICY_OBJECT_A, V(2), "test2");
+ invalidation::Invalidation inv2 =
+ FireInvalidation(POLICY_OBJECT_A, V(2), "test2");
EXPECT_TRUE(CheckInvalidationInfo(V(2), "test2"));
- syncer::Invalidation inv3 = FireInvalidation(POLICY_OBJECT_A, V(3), "test3");
+ invalidation::Invalidation inv3 =
+ FireInvalidation(POLICY_OBJECT_A, V(3), "test3");
EXPECT_TRUE(CheckInvalidationInfo(V(3), "test3"));
// Make sure the replaced invalidations are acknowledged.
@@ -685,15 +694,18 @@
// unique invalidation version numbers.
StorePolicy(POLICY_OBJECT_A);
StartInvalidator();
- syncer::Invalidation inv1 = FireUnknownVersionInvalidation(POLICY_OBJECT_A);
+ invalidation::Invalidation inv1 =
+ FireUnknownVersionInvalidation(POLICY_OBJECT_A);
EXPECT_TRUE(CheckInvalidationInfo(0, std::string()));
EXPECT_TRUE(CheckPolicyRefreshedWithUnknownVersion());
EXPECT_TRUE(CheckInvalidationInfo(-1, std::string()));
- syncer::Invalidation inv2 = FireUnknownVersionInvalidation(POLICY_OBJECT_A);
+ invalidation::Invalidation inv2 =
+ FireUnknownVersionInvalidation(POLICY_OBJECT_A);
EXPECT_TRUE(CheckInvalidationInfo(0, std::string()));
EXPECT_TRUE(CheckPolicyRefreshedWithUnknownVersion());
EXPECT_TRUE(CheckInvalidationInfo(-2, std::string()));
- syncer::Invalidation inv3 = FireUnknownVersionInvalidation(POLICY_OBJECT_A);
+ invalidation::Invalidation inv3 =
+ FireUnknownVersionInvalidation(POLICY_OBJECT_A);
EXPECT_TRUE(CheckInvalidationInfo(0, std::string()));
EXPECT_TRUE(CheckPolicyRefreshedWithUnknownVersion());
EXPECT_TRUE(CheckInvalidationInfo(-3, std::string()));
@@ -722,14 +734,16 @@
// Check that an invalidation whose version is lower than the highest handled
// so far is acknowledged but ignored otherwise.
- syncer::Invalidation inv1 = FireInvalidation(POLICY_OBJECT_A, V(1), "test1");
+ invalidation::Invalidation inv1 =
+ FireInvalidation(POLICY_OBJECT_A, V(1), "test1");
EXPECT_TRUE(CheckPolicyNotRefreshed());
EXPECT_TRUE(CheckInvalidationInfo(0, std::string()));
EXPECT_TRUE(IsInvalidationAcknowledged(inv1));
EXPECT_EQ(V(2), GetHighestHandledInvalidationVersion());
// Check that an invalidation with an unknown version is handled.
- syncer::Invalidation inv = FireUnknownVersionInvalidation(POLICY_OBJECT_A);
+ invalidation::Invalidation inv =
+ FireUnknownVersionInvalidation(POLICY_OBJECT_A);
EXPECT_TRUE(CheckPolicyRefreshedWithUnknownVersion());
EXPECT_TRUE(CheckInvalidationInfo(-1, std::string()));
StorePolicy(POLICY_OBJECT_A, -1);
@@ -738,7 +752,8 @@
// Check that an invalidation whose version matches the highest handled so far
// is acknowledged but ignored otherwise.
- syncer::Invalidation inv2 = FireInvalidation(POLICY_OBJECT_A, V(2), "test2");
+ invalidation::Invalidation inv2 =
+ FireInvalidation(POLICY_OBJECT_A, V(2), "test2");
EXPECT_TRUE(CheckPolicyNotRefreshed());
EXPECT_TRUE(CheckInvalidationInfo(0, std::string()));
EXPECT_TRUE(IsInvalidationAcknowledged(inv2));
@@ -746,7 +761,8 @@
// Check that an invalidation whose version is higher than the highest handled
// so far is handled, causing a policy refresh.
- syncer::Invalidation inv3 = FireInvalidation(POLICY_OBJECT_A, V(3), "test3");
+ invalidation::Invalidation inv3 =
+ FireInvalidation(POLICY_OBJECT_A, V(3), "test3");
EXPECT_TRUE(CheckPolicyRefreshed());
EXPECT_TRUE(CheckInvalidationInfo(V(3), "test3"));
StorePolicy(POLICY_OBJECT_A, V(3));
@@ -758,7 +774,8 @@
// Generate an invalidation.
StorePolicy(POLICY_OBJECT_A);
StartInvalidator();
- syncer::Invalidation inv = FireInvalidation(POLICY_OBJECT_A, V(3), "test");
+ invalidation::Invalidation inv =
+ FireInvalidation(POLICY_OBJECT_A, V(3), "test");
// Ensure that the policy is not refreshed and the invalidation is
// acknowledged if the store is loaded with the latest version before the
@@ -774,7 +791,8 @@
// Generate an invalidation.
StorePolicy(POLICY_OBJECT_A);
StartInvalidator();
- syncer::Invalidation inv = FireInvalidation(POLICY_OBJECT_A, V(3), "test");
+ invalidation::Invalidation inv =
+ FireInvalidation(POLICY_OBJECT_A, V(3), "test");
// Ensure that the policy refresh is not made after the invalidator is shut
// down.
@@ -826,7 +844,8 @@
// Generate an invalidation.
StorePolicy(POLICY_OBJECT_A);
StartInvalidator();
- syncer::Invalidation inv = FireInvalidation(POLICY_OBJECT_A, V(1), "test");
+ invalidation::Invalidation inv =
+ FireInvalidation(POLICY_OBJECT_A, V(1), "test");
EXPECT_TRUE(InvalidationsEnabled());
// Ensure that the policy is not refreshed after disconnecting the core, but
@@ -1111,7 +1130,7 @@
// should be ignored.
base::Time time = Now() - (invalidation_timeouts::kMaxInvalidationTimeDelta +
base::TimeDelta::FromSeconds(300));
- syncer::Invalidation inv =
+ invalidation::Invalidation inv =
FireInvalidation(POLICY_OBJECT_A, GetVersion(time), "test");
ASSERT_TRUE(IsInvalidationAcknowledged(inv));
ASSERT_TRUE(CheckPolicyNotRefreshed());
diff --git a/chrome/browser/policy/cloud/policy_invalidation_util.cc b/chrome/browser/policy/cloud/policy_invalidation_util.cc
index 408dfe4..0eed5dd9 100644
--- a/chrome/browser/policy/cloud/policy_invalidation_util.cc
+++ b/chrome/browser/policy/cloud/policy_invalidation_util.cc
@@ -16,14 +16,14 @@
} // namespace
-bool IsPublicInvalidationTopic(const syncer::Topic& topic) {
+bool IsPublicInvalidationTopic(const invalidation::Topic& topic) {
return base::StartsWith(topic, kFcmPolicyPublicTopicPrefix,
base::CompareCase::SENSITIVE);
}
bool GetCloudPolicyTopicFromPolicy(
const enterprise_management::PolicyData& policy,
- syncer::Topic* topic) {
+ invalidation::Topic* topic) {
if (!policy.has_policy_invalidation_topic() ||
policy.policy_invalidation_topic().empty()) {
return false;
@@ -34,7 +34,7 @@
bool GetRemoteCommandTopicFromPolicy(
const enterprise_management::PolicyData& policy,
- syncer::Topic* topic) {
+ invalidation::Topic* topic) {
if (!policy.has_command_invalidation_topic() ||
policy.command_invalidation_topic().empty()) {
return false;
@@ -43,7 +43,7 @@
return true;
}
-bool IsInvalidationExpired(const syncer::Invalidation& invalidation,
+bool IsInvalidationExpired(const invalidation::Invalidation& invalidation,
const base::Time& last_fetch_time,
const base::Time& current_time) {
// If the version is unknown, consider the invalidation invalid if the
diff --git a/chrome/browser/policy/cloud/policy_invalidation_util.h b/chrome/browser/policy/cloud/policy_invalidation_util.h
index 3a69e78f..b8e855a4 100644
--- a/chrome/browser/policy/cloud/policy_invalidation_util.h
+++ b/chrome/browser/policy/cloud/policy_invalidation_util.h
@@ -15,11 +15,11 @@
} // namespace enterprise_management
-namespace syncer {
+namespace invalidation {
class Invalidation;
-} // namespace syncer
+} // namespace invalidation
namespace policy {
@@ -47,22 +47,22 @@
// addressed to topic "DeviceGuestModeEnabled". But if 2 clients with different
// users subscribe to private topic "BOOKMARK", they will receive different set
// of messages addressed to pair ("BOOKMARK", GAIA ID) respectievely.
-bool IsPublicInvalidationTopic(const syncer::Topic& topic);
+bool IsPublicInvalidationTopic(const invalidation::Topic& topic);
// Returns true if |policy| has data about policy to invalidate, and saves
// that data in |topic|, and false otherwise.
bool GetCloudPolicyTopicFromPolicy(
const enterprise_management::PolicyData& policy,
- syncer::Topic* topic);
+ invalidation::Topic* topic);
// The same as GetCloudPolicyTopicFromPolicy but gets the |topic| for
// remote command.
bool GetRemoteCommandTopicFromPolicy(
const enterprise_management::PolicyData& policy,
- syncer::Topic* topic);
+ invalidation::Topic* topic);
// Determines if an invalidation is expired.
-bool IsInvalidationExpired(const syncer::Invalidation& invalidation,
+bool IsInvalidationExpired(const invalidation::Invalidation& invalidation,
const base::Time& last_fetch_time,
const base::Time& current_time);
diff --git a/chrome/browser/policy/cloud/remote_commands_invalidator.cc b/chrome/browser/policy/cloud/remote_commands_invalidator.cc
index 7fc95e2..d14db74 100644
--- a/chrome/browser/policy/cloud/remote_commands_invalidator.cc
+++ b/chrome/browser/policy/cloud/remote_commands_invalidator.cc
@@ -70,23 +70,23 @@
}
void RemoteCommandsInvalidator::OnInvalidatorStateChange(
- syncer::InvalidatorState state) {
+ invalidation::InvalidatorState state) {
DCHECK_EQ(STARTED, state_);
DCHECK(thread_checker_.CalledOnValidThread());
- invalidation_service_enabled_ = state == syncer::INVALIDATIONS_ENABLED;
+ invalidation_service_enabled_ = state == invalidation::INVALIDATIONS_ENABLED;
UpdateInvalidationsEnabled();
}
void RemoteCommandsInvalidator::OnIncomingInvalidation(
- const syncer::TopicInvalidationMap& invalidation_map) {
+ const invalidation::TopicInvalidationMap& invalidation_map) {
DCHECK_EQ(STARTED, state_);
DCHECK(thread_checker_.CalledOnValidThread());
if (!invalidation_service_enabled_)
LOG(WARNING) << "Unexpected invalidation received.";
- const syncer::SingleObjectInvalidationSet& list =
+ const invalidation::SingleObjectInvalidationSet& list =
invalidation_map.ForTopic(topic_);
if (list.IsEmpty()) {
NOTREACHED();
@@ -105,7 +105,7 @@
}
bool RemoteCommandsInvalidator::IsPublicTopic(
- const syncer::Topic& topic) const {
+ const invalidation::Topic& topic) const {
return IsPublicInvalidationTopic(topic);
}
@@ -118,7 +118,7 @@
// Create the Topic based on the policy data.
// If the policy does not specify the Topic, then unregister.
- syncer::Topic topic;
+ invalidation::Topic topic;
if (!policy || !GetRemoteCommandTopicFromPolicy(*policy, &topic)) {
Unregister();
return;
@@ -130,7 +130,7 @@
Register(topic);
}
-void RemoteCommandsInvalidator::Register(const syncer::Topic& topic) {
+void RemoteCommandsInvalidator::Register(const invalidation::Topic& topic) {
// Register this handler with the invalidation service if needed.
if (!is_registered_) {
OnInvalidatorStateChange(invalidation_service_->GetInvalidatorState());
@@ -151,8 +151,8 @@
void RemoteCommandsInvalidator::Unregister() {
if (is_registered_) {
- CHECK(invalidation_service_->UpdateInterestedTopics(this,
- syncer::TopicSet()));
+ CHECK(invalidation_service_->UpdateInterestedTopics(
+ this, invalidation::TopicSet()));
invalidation_service_->UnregisterInvalidationHandler(this);
is_registered_ = false;
UpdateInvalidationsEnabled();
diff --git a/chrome/browser/policy/cloud/remote_commands_invalidator.h b/chrome/browser/policy/cloud/remote_commands_invalidator.h
index dd71c13..a639852 100644
--- a/chrome/browser/policy/cloud/remote_commands_invalidator.h
+++ b/chrome/browser/policy/cloud/remote_commands_invalidator.h
@@ -15,9 +15,9 @@
class InvalidationService;
} // namespace invalidation
-namespace syncer {
+namespace invalidation {
class Invalidation;
-} // namespace syncer
+} // namespace invalidation
namespace policy {
@@ -25,7 +25,7 @@
// services. It's not interacting with CloudPolicyClient/CloudPolicyCore
// directly, instead, it handles the interacting with invalidation service
// only and leaves interfaces to integrate with subclasses.
-class RemoteCommandsInvalidator : public syncer::InvalidationHandler {
+class RemoteCommandsInvalidator : public invalidation::InvalidationHandler {
public:
explicit RemoteCommandsInvalidator(std::string owner_name);
~RemoteCommandsInvalidator() override;
@@ -54,12 +54,12 @@
// Whether the invalidator currently has the ability to receive invalidations.
bool invalidations_enabled() { return invalidations_enabled_; }
- // syncer::InvalidationHandler:
- void OnInvalidatorStateChange(syncer::InvalidatorState state) override;
+ // invalidation::InvalidationHandler:
+ void OnInvalidatorStateChange(invalidation::InvalidatorState state) override;
void OnIncomingInvalidation(
- const syncer::TopicInvalidationMap& invalidation_map) override;
+ const invalidation::TopicInvalidationMap& invalidation_map) override;
std::string GetOwnerName() const override;
- bool IsPublicTopic(const syncer::Topic& topic) const override;
+ bool IsPublicTopic(const invalidation::Topic& topic) const override;
protected:
virtual void OnInitialize() = 0;
@@ -70,7 +70,7 @@
// Subclasses must override this method to implement the actual remote
// commands fetch.
virtual void DoRemoteCommandsFetch(
- const syncer::Invalidation& invalidation) = 0;
+ const invalidation::Invalidation& invalidation) = 0;
// Subclasses must call this function to set the topic for remote command
// invalidations.
@@ -79,7 +79,7 @@
private:
// Registers this handler with |invalidation_service_| if needed and
// subscribes to the given |topic| with the invalidation service.
- void Register(const syncer::Topic& topic);
+ void Register(const invalidation::Topic& topic);
// Unregisters this handler and unsubscribes from the current topic with
// the invalidation service.
@@ -117,7 +117,7 @@
bool is_registered_ = false;
// The Topic representing the remote commands in the invalidation service.
- syncer::Topic topic_;
+ invalidation::Topic topic_;
// A thread checker to make sure that callbacks are invoked on the correct
// thread.
diff --git a/chrome/browser/policy/cloud/remote_commands_invalidator_impl.cc b/chrome/browser/policy/cloud/remote_commands_invalidator_impl.cc
index 1644f99..b24ecec 100644
--- a/chrome/browser/policy/cloud/remote_commands_invalidator_impl.cc
+++ b/chrome/browser/policy/cloud/remote_commands_invalidator_impl.cc
@@ -85,7 +85,7 @@
}
void RemoteCommandsInvalidatorImpl::DoRemoteCommandsFetch(
- const syncer::Invalidation& invalidation) {
+ const invalidation::Invalidation& invalidation) {
DCHECK(core_->remote_commands_service());
RecordInvalidationMetric(invalidation);
@@ -114,7 +114,7 @@
void RemoteCommandsInvalidatorImpl::OnStoreError(CloudPolicyStore* core) {}
void RemoteCommandsInvalidatorImpl::RecordInvalidationMetric(
- const syncer::Invalidation& invalidation) const {
+ const invalidation::Invalidation& invalidation) const {
const auto last_fetch_time =
base::Time::FromJavaTime(core_->store()->policy()->timestamp());
const auto current_time = clock_->Now();
diff --git a/chrome/browser/policy/cloud/remote_commands_invalidator_impl.h b/chrome/browser/policy/cloud/remote_commands_invalidator_impl.h
index b8b2581..0be6252 100644
--- a/chrome/browser/policy/cloud/remote_commands_invalidator_impl.h
+++ b/chrome/browser/policy/cloud/remote_commands_invalidator_impl.h
@@ -33,7 +33,8 @@
void OnShutdown() override;
void OnStart() override;
void OnStop() override;
- void DoRemoteCommandsFetch(const syncer::Invalidation& invalidation) override;
+ void DoRemoteCommandsFetch(
+ const invalidation::Invalidation& invalidation) override;
// CloudPolicyCore::Observer:
void OnCoreConnected(CloudPolicyCore* core) override;
@@ -46,7 +47,8 @@
void OnStoreError(CloudPolicyStore* store) override;
private:
- void RecordInvalidationMetric(const syncer::Invalidation& invalidation) const;
+ void RecordInvalidationMetric(
+ const invalidation::Invalidation& invalidation) const;
CloudPolicyCore* const core_;
diff --git a/chrome/browser/policy/cloud/remote_commands_invalidator_unittest.cc b/chrome/browser/policy/cloud/remote_commands_invalidator_unittest.cc
index 89e67ac..de4447f1 100644
--- a/chrome/browser/policy/cloud/remote_commands_invalidator_unittest.cc
+++ b/chrome/browser/policy/cloud/remote_commands_invalidator_unittest.cc
@@ -40,9 +40,9 @@
MOCK_METHOD0(OnShutdown, void());
MOCK_METHOD0(OnStart, void());
MOCK_METHOD0(OnStop, void());
- MOCK_METHOD1(DoRemoteCommandsFetch, void(const syncer::Invalidation&));
+ MOCK_METHOD1(DoRemoteCommandsFetch, void(const invalidation::Invalidation&));
- void SetInvalidationTopic(const syncer::Topic& topic) {
+ void SetInvalidationTopic(const invalidation::Topic& topic) {
em::PolicyData policy_data;
policy_data.set_command_invalidation_topic(topic);
ReloadPolicyData(&policy_data);
@@ -63,29 +63,33 @@
: kTestingTopic1("abcdef"), kTestingTopic2("defabc") {}
void EnableInvalidationService() {
- invalidation_service_.SetInvalidatorState(syncer::INVALIDATIONS_ENABLED);
+ invalidation_service_.SetInvalidatorState(
+ invalidation::INVALIDATIONS_ENABLED);
}
void DisableInvalidationService() {
invalidation_service_.SetInvalidatorState(
- syncer::TRANSIENT_INVALIDATION_ERROR);
+ invalidation::TRANSIENT_INVALIDATION_ERROR);
}
- syncer::Invalidation CreateInvalidation(const syncer::Topic& topic) {
- return syncer::Invalidation::InitUnknownVersion(topic);
+ invalidation::Invalidation CreateInvalidation(
+ const invalidation::Topic& topic) {
+ return invalidation::Invalidation::InitUnknownVersion(topic);
}
- syncer::Invalidation FireInvalidation(const syncer::Topic& topic) {
- const syncer::Invalidation invalidation = CreateInvalidation(topic);
+ invalidation::Invalidation FireInvalidation(
+ const invalidation::Topic& topic) {
+ const invalidation::Invalidation invalidation = CreateInvalidation(topic);
invalidation_service_.EmitInvalidationForTest(invalidation);
return invalidation;
}
- bool IsInvalidationSent(const syncer::Invalidation& invalidation) {
+ bool IsInvalidationSent(const invalidation::Invalidation& invalidation) {
return !invalidation_service_.GetMockAckHandler()->IsUnsent(invalidation);
}
- bool IsInvalidationAcknowledged(const syncer::Invalidation& invalidation) {
+ bool IsInvalidationAcknowledged(
+ const invalidation::Invalidation& invalidation) {
return invalidation_service_.GetMockAckHandler()->IsAcknowledged(
invalidation);
}
@@ -123,22 +127,22 @@
}
// Fire an invalidation to verify that invalidation is not working.
- void VerifyInvalidationDisabled(const syncer::Topic& topic) {
- const syncer::Invalidation invalidation = FireInvalidation(topic);
+ void VerifyInvalidationDisabled(const invalidation::Topic& topic) {
+ const invalidation::Invalidation invalidation = FireInvalidation(topic);
base::RunLoop().RunUntilIdle();
EXPECT_FALSE(IsInvalidationSent(invalidation));
}
// Fire an invalidation to verify that invalidation works.
- void VerifyInvalidationEnabled(const syncer::Topic& topic) {
+ void VerifyInvalidationEnabled(const invalidation::Topic& topic) {
EXPECT_TRUE(invalidator_.invalidations_enabled());
EXPECT_CALL(
invalidator_,
DoRemoteCommandsFetch(InvalidationsEqual(CreateInvalidation(topic))))
.Times(1);
- const syncer::Invalidation invalidation = FireInvalidation(topic);
+ const invalidation::Invalidation invalidation = FireInvalidation(topic);
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(IsInvalidationSent(invalidation));
@@ -146,8 +150,8 @@
VerifyExpectations();
}
- syncer::Topic kTestingTopic1;
- syncer::Topic kTestingTopic2;
+ invalidation::Topic kTestingTopic1;
+ invalidation::Topic kTestingTopic2;
base::test::SingleThreadTaskEnvironment task_environment_;
@@ -175,7 +179,8 @@
// Fire an invalidation with different object id, no invalidation will be
// received.
- const syncer::Invalidation invalidation1 = FireInvalidation(kTestingTopic2);
+ const invalidation::Invalidation invalidation1 =
+ FireInvalidation(kTestingTopic2);
base::RunLoop().RunUntilIdle();
EXPECT_FALSE(IsInvalidationSent(invalidation1));
@@ -186,7 +191,8 @@
EXPECT_CALL(invalidator_, DoRemoteCommandsFetch(InvalidationsEqual(
CreateInvalidation(kTestingTopic1))))
.Times(1);
- const syncer::Invalidation invalidation2 = FireInvalidation(kTestingTopic1);
+ const invalidation::Invalidation invalidation2 =
+ FireInvalidation(kTestingTopic1);
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(IsInvalidationSent(invalidation2));
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 171c537..362a8e8 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -644,6 +644,8 @@
GpuModeManager::RegisterPrefs(registry);
signin::IdentityManager::RegisterLocalStatePrefs(registry);
invalidation::FCMInvalidationService::RegisterPrefs(registry);
+ invalidation::InvalidatorRegistrarWithMemory::RegisterPrefs(registry);
+ invalidation::PerUserTopicSubscriptionManager::RegisterPrefs(registry);
language::GeoLanguageProvider::RegisterLocalStatePrefs(registry);
language::UlpLanguageCodeLocator::RegisterLocalStatePrefs(registry);
memory::EnterpriseMemoryLimitPrefObserver::RegisterPrefs(registry);
@@ -664,8 +666,6 @@
sessions::SessionIdGenerator::RegisterPrefs(registry);
SSLConfigServiceManager::RegisterPrefs(registry);
subresource_filter::IndexedRulesetVersion::RegisterPrefs(registry);
- syncer::InvalidatorRegistrarWithMemory::RegisterPrefs(registry);
- syncer::PerUserTopicSubscriptionManager::RegisterPrefs(registry);
SystemNetworkContextManager::RegisterPrefs(registry);
update_client::RegisterPrefs(registry);
variations::VariationsService::RegisterPrefs(registry);
@@ -857,6 +857,8 @@
image_fetcher::ImageCache::RegisterProfilePrefs(registry);
site_engagement::ImportantSitesUtil::RegisterProfilePrefs(registry);
IncognitoModePrefs::RegisterProfilePrefs(registry);
+ invalidation::PerUserTopicSubscriptionManager::RegisterProfilePrefs(registry);
+ invalidation::InvalidatorRegistrarWithMemory::RegisterProfilePrefs(registry);
language::LanguagePrefs::RegisterProfilePrefs(registry);
login_detection::prefs::RegisterProfilePrefs(registry);
lookalikes::RegisterProfilePrefs(registry);
@@ -899,8 +901,6 @@
sync_sessions::SessionSyncPrefs::RegisterProfilePrefs(registry);
syncer::DeviceInfoPrefs::RegisterProfilePrefs(registry);
syncer::SyncPrefs::RegisterProfilePrefs(registry);
- syncer::PerUserTopicSubscriptionManager::RegisterProfilePrefs(registry);
- syncer::InvalidatorRegistrarWithMemory::RegisterProfilePrefs(registry);
TemplateURLPrepopulateData::RegisterProfilePrefs(registry);
translate::TranslatePrefs::RegisterProfilePrefs(registry);
omnibox::RegisterProfilePrefs(registry);
diff --git a/chrome/browser/sync/test/integration/fake_server_invalidation_sender.cc b/chrome/browser/sync/test/integration/fake_server_invalidation_sender.cc
index 66f6a88..ea072bf 100644
--- a/chrome/browser/sync/test/integration/fake_server_invalidation_sender.cc
+++ b/chrome/browser/sync/test/integration/fake_server_invalidation_sender.cc
@@ -19,13 +19,13 @@
FakeServerInvalidationSender::FakeServerInvalidationSender(
const std::string& client_id,
bool self_notify,
- base::RepeatingCallback<syncer::FCMNetworkHandler*()>
+ base::RepeatingCallback<invalidation::FCMNetworkHandler*()>
fcm_network_handler_getter)
: client_id_(client_id),
self_notify_(self_notify),
fcm_network_handler_getter_(fcm_network_handler_getter) {}
-FakeServerInvalidationSender::~FakeServerInvalidationSender() {}
+FakeServerInvalidationSender::~FakeServerInvalidationSender() = default;
void FakeServerInvalidationSender::OnCommit(
const std::string& committer_invalidator_client_id,
@@ -33,7 +33,7 @@
if (!self_notify_ && client_id_ == committer_invalidator_client_id) {
return;
}
- syncer::FCMNetworkHandler* fcm_network_handler =
+ invalidation::FCMNetworkHandler* fcm_network_handler =
fcm_network_handler_getter_.Run();
// If there is no FCM network handler registered for this profile, there is
// nothing to do. This could be the case during test Setup phase because the
diff --git a/chrome/browser/sync/test/integration/fake_server_invalidation_sender.h b/chrome/browser/sync/test/integration/fake_server_invalidation_sender.h
index 5d95fc3a..198d5b14 100644
--- a/chrome/browser/sync/test/integration/fake_server_invalidation_sender.h
+++ b/chrome/browser/sync/test/integration/fake_server_invalidation_sender.h
@@ -5,12 +5,10 @@
#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SENDER_H_
#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SENDER_H_
-#include "base/macros.h"
-
#include "components/sync/base/model_type.h"
#include "components/sync/test/fake_server/fake_server.h"
-namespace syncer {
+namespace invalidation {
class FCMNetworkHandler;
}
@@ -24,8 +22,12 @@
FakeServerInvalidationSender(
const std::string& client_id,
bool self_notify,
- base::RepeatingCallback<syncer::FCMNetworkHandler*()>
+ base::RepeatingCallback<invalidation::FCMNetworkHandler*()>
fcm_network_handler_getter);
+ FakeServerInvalidationSender(const FakeServerInvalidationSender& other) =
+ delete;
+ FakeServerInvalidationSender& operator=(
+ const FakeServerInvalidationSender& other) = delete;
~FakeServerInvalidationSender() override;
// FakeServer::Observer implementation.
@@ -35,10 +37,8 @@
private:
const std::string client_id_;
const bool self_notify_;
- const base::RepeatingCallback<syncer::FCMNetworkHandler*()>
+ const base::RepeatingCallback<invalidation::FCMNetworkHandler*()>
fcm_network_handler_getter_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeServerInvalidationSender);
};
} // namespace fake_server
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 86e24e8..d4e889c 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -135,10 +135,10 @@
}
class FakePerUserTopicSubscriptionManager
- : public syncer::PerUserTopicSubscriptionManager {
+ : public invalidation::PerUserTopicSubscriptionManager {
public:
explicit FakePerUserTopicSubscriptionManager(PrefService* local_state)
- : syncer::PerUserTopicSubscriptionManager(
+ : invalidation::PerUserTopicSubscriptionManager(
/*identity_provider=*/nullptr,
/*pref_service=*/local_state,
/*url_loader_factory=*/nullptr,
@@ -146,28 +146,28 @@
/*migrate_prefs=*/false) {}
~FakePerUserTopicSubscriptionManager() override = default;
- void UpdateSubscribedTopics(const syncer::Topics& topics,
+ void UpdateSubscribedTopics(const invalidation::Topics& topics,
const std::string& instance_id_token) override {}
private:
DISALLOW_COPY_AND_ASSIGN(FakePerUserTopicSubscriptionManager);
};
-std::unique_ptr<syncer::FCMNetworkHandler> CreateFCMNetworkHandler(
+std::unique_ptr<invalidation::FCMNetworkHandler> CreateFCMNetworkHandler(
Profile* profile,
- std::map<const Profile*, syncer::FCMNetworkHandler*>*
+ std::map<const Profile*, invalidation::FCMNetworkHandler*>*
profile_to_fcm_network_handler_map,
gcm::GCMDriver* gcm_driver,
instance_id::InstanceIDDriver* instance_id_driver,
const std::string& sender_id,
const std::string& app_id) {
- auto handler = std::make_unique<syncer::FCMNetworkHandler>(
+ auto handler = std::make_unique<invalidation::FCMNetworkHandler>(
gcm_driver, instance_id_driver, sender_id, app_id);
(*profile_to_fcm_network_handler_map)[profile] = handler.get();
return handler;
}
-std::unique_ptr<syncer::PerUserTopicSubscriptionManager>
+std::unique_ptr<invalidation::PerUserTopicSubscriptionManager>
CreatePerUserTopicSubscriptionManager(
invalidation::IdentityProvider* identity_provider,
PrefService* local_state,
@@ -177,9 +177,9 @@
return std::make_unique<FakePerUserTopicSubscriptionManager>(local_state);
}
-syncer::FCMNetworkHandler* GetFCMNetworkHandler(
+invalidation::FCMNetworkHandler* GetFCMNetworkHandler(
Profile* profile,
- std::map<const Profile*, syncer::FCMNetworkHandler*>*
+ std::map<const Profile*, invalidation::FCMNetworkHandler*>*
profile_to_fcm_network_handler_map) {
// Delivering FCM notifications does not work if explicitly signed-out.
signin::IdentityManager* identity_manager =
@@ -1064,7 +1064,7 @@
// static
std::unique_ptr<KeyedService> SyncTest::CreateProfileInvalidationProvider(
- std::map<const Profile*, syncer::FCMNetworkHandler*>*
+ std::map<const Profile*, invalidation::FCMNetworkHandler*>*
profile_to_fcm_network_handler_map,
std::map<const Profile*, std::unique_ptr<instance_id::InstanceIDDriver>>*
profile_to_instance_id_driver_map,
diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h
index cdb6a1a..5c649b61 100644
--- a/chrome/browser/sync/test/integration/sync_test.h
+++ b/chrome/browser/sync/test/integration/sync_test.h
@@ -360,7 +360,7 @@
Profile::CreateStatus status);
static std::unique_ptr<KeyedService> CreateProfileInvalidationProvider(
- std::map<const Profile*, syncer::FCMNetworkHandler*>*
+ std::map<const Profile*, invalidation::FCMNetworkHandler*>*
profile_to_fcm_network_handler_map,
std::map<const Profile*, std::unique_ptr<instance_id::InstanceIDDriver>>*
profile_to_instance_id_driver_map,
@@ -497,7 +497,7 @@
// Maps a profile to the corresponding FCMNetworkHandler. Contains one entry
// per profile. It is used to simulate an incoming FCM messages to different
// profiles within the FakeServerInvalidationSender.
- std::map<const Profile*, syncer::FCMNetworkHandler*>
+ std::map<const Profile*, invalidation::FCMNetworkHandler*>
profile_to_fcm_network_handler_map_;
std::map<const Profile*, std::unique_ptr<instance_id::InstanceIDDriver>>
diff --git a/chrome/browser/ui/webui/invalidations/invalidations_message_handler.cc b/chrome/browser/ui/webui/invalidations/invalidations_message_handler.cc
index 9987d42a..a56c8de4 100644
--- a/chrome/browser/ui/webui/invalidations/invalidations_message_handler.cc
+++ b/chrome/browser/ui/webui/invalidations/invalidations_message_handler.cc
@@ -89,9 +89,9 @@
}
void InvalidationsMessageHandler::OnStateChange(
- const syncer::InvalidatorState& new_state,
+ const invalidation::InvalidatorState& new_state,
const base::Time& last_changed_timestamp) {
- std::string state(syncer::InvalidatorStateToString(new_state));
+ std::string state(invalidation::InvalidatorStateToString(new_state));
web_ui()->CallJavascriptFunctionUnsafe(
"chrome.invalidations.updateInvalidatorState", base::Value(state),
base::Value(last_changed_timestamp.ToJsTime()));
@@ -99,7 +99,7 @@
void InvalidationsMessageHandler::OnUpdatedTopics(
const std::string& handler_name,
- const syncer::TopicCountMap& topics) {
+ const invalidation::TopicCountMap& topics) {
base::ListValue list_of_objects;
for (const auto& topic_item : topics) {
std::unique_ptr<base::DictionaryValue> dic(new base::DictionaryValue());
@@ -120,7 +120,7 @@
const base::DictionaryValue& details) {}
void InvalidationsMessageHandler::OnInvalidation(
- const syncer::TopicInvalidationMap& new_invalidations) {
+ const invalidation::TopicInvalidationMap& new_invalidations) {
std::unique_ptr<base::ListValue> invalidations_list =
new_invalidations.ToValue();
web_ui()->CallJavascriptFunctionUnsafe(
diff --git a/chrome/browser/ui/webui/invalidations/invalidations_message_handler.h b/chrome/browser/ui/webui/invalidations/invalidations_message_handler.h
index b4d9b7c..7331887 100644
--- a/chrome/browser/ui/webui/invalidations/invalidations_message_handler.h
+++ b/chrome/browser/ui/webui/invalidations/invalidations_message_handler.h
@@ -30,13 +30,14 @@
// Implementation of InvalidationLoggerObserver.
void OnRegistrationChange(
const std::multiset<std::string>& registered_handlers) override;
- void OnStateChange(const syncer::InvalidatorState& new_state,
+ void OnStateChange(const invalidation::InvalidatorState& new_state,
const base::Time& last_change_timestamp) override;
- void OnUpdatedTopics(const std::string& handler_name,
- const syncer::TopicCountMap& topics_counts) override;
+ void OnUpdatedTopics(
+ const std::string& handler_name,
+ const invalidation::TopicCountMap& topics_counts) override;
void OnDebugMessage(const base::DictionaryValue& details) override;
void OnInvalidation(
- const syncer::TopicInvalidationMap& new_invalidations) override;
+ const invalidation::TopicInvalidationMap& new_invalidations) override;
void OnDetailedStatus(const base::DictionaryValue& network_details) override;
// Implementation of WebUIMessageHandler.
