| Index: chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
|
| diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
|
| similarity index 86%
|
| copy from chrome/browser/chromeos/policy/affiliated_invalidation_service_provider.cc
|
| copy to chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
|
| index 7fbbdf3c4d774cd4b7d826c50414756a04d04a07..353662c919f9ca2f2f93f1dd24d1abff947990bd 100644
|
| --- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider.cc
|
| +++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provider.h"
|
| +#include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h"
|
|
|
| #include <vector>
|
|
|
| @@ -35,14 +35,11 @@
|
|
|
| namespace policy {
|
|
|
| -AffiliatedInvalidationServiceProvider::Consumer::~Consumer() {
|
| -}
|
| -
|
| -class AffiliatedInvalidationServiceProvider::InvalidationServiceObserver
|
| +class AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver
|
| : public syncer::InvalidationHandler {
|
| public:
|
| explicit InvalidationServiceObserver(
|
| - AffiliatedInvalidationServiceProvider* parent,
|
| + AffiliatedInvalidationServiceProviderImpl* parent,
|
| invalidation::InvalidationService* invalidation_service);
|
| ~InvalidationServiceObserver() override;
|
|
|
| @@ -56,7 +53,7 @@ class AffiliatedInvalidationServiceProvider::InvalidationServiceObserver
|
| std::string GetOwnerName() const override;
|
|
|
| private:
|
| - AffiliatedInvalidationServiceProvider* parent_;
|
| + AffiliatedInvalidationServiceProviderImpl* parent_;
|
| invalidation::InvalidationService* invalidation_service_;
|
| bool is_service_connected_;
|
| bool is_observer_ready_;
|
| @@ -64,9 +61,9 @@ class AffiliatedInvalidationServiceProvider::InvalidationServiceObserver
|
| DISALLOW_COPY_AND_ASSIGN(InvalidationServiceObserver);
|
| };
|
|
|
| -AffiliatedInvalidationServiceProvider::InvalidationServiceObserver::
|
| +AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver::
|
| InvalidationServiceObserver(
|
| - AffiliatedInvalidationServiceProvider* parent,
|
| + AffiliatedInvalidationServiceProviderImpl* parent,
|
| invalidation::InvalidationService* invalidation_service)
|
| : parent_(parent),
|
| invalidation_service_(invalidation_service),
|
| @@ -78,24 +75,24 @@ AffiliatedInvalidationServiceProvider::InvalidationServiceObserver::
|
| is_observer_ready_ = true;
|
| }
|
|
|
| -AffiliatedInvalidationServiceProvider::InvalidationServiceObserver::
|
| +AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver::
|
| ~InvalidationServiceObserver() {
|
| is_observer_ready_ = false;
|
| invalidation_service_->UnregisterInvalidationHandler(this);
|
| }
|
|
|
| invalidation::InvalidationService*
|
| -AffiliatedInvalidationServiceProvider::InvalidationServiceObserver::
|
| +AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver::
|
| GetInvalidationService() {
|
| return invalidation_service_;
|
| }
|
|
|
| -bool AffiliatedInvalidationServiceProvider::InvalidationServiceObserver::
|
| +bool AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver::
|
| IsServiceConnected() const {
|
| return is_service_connected_;
|
| }
|
|
|
| -void AffiliatedInvalidationServiceProvider::InvalidationServiceObserver::
|
| +void AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver::
|
| OnInvalidatorStateChange(syncer::InvalidatorState state) {
|
| if (!is_observer_ready_)
|
| return;
|
| @@ -111,22 +108,24 @@ void AffiliatedInvalidationServiceProvider::InvalidationServiceObserver::
|
| parent_->OnInvalidationServiceDisconnected(invalidation_service_);
|
| }
|
|
|
| -void AffiliatedInvalidationServiceProvider::InvalidationServiceObserver::
|
| +void AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver::
|
| OnIncomingInvalidation(
|
| const syncer::ObjectIdInvalidationMap& invalidation_map) {
|
| }
|
|
|
| -std::string AffiliatedInvalidationServiceProvider::InvalidationServiceObserver::
|
| +std::string
|
| +AffiliatedInvalidationServiceProviderImpl::InvalidationServiceObserver::
|
| GetOwnerName() const {
|
| return "AffiliatedInvalidationService";
|
| }
|
|
|
| -AffiliatedInvalidationServiceProvider::AffiliatedInvalidationServiceProvider()
|
| +AffiliatedInvalidationServiceProviderImpl::
|
| +AffiliatedInvalidationServiceProviderImpl()
|
| : invalidation_service_(nullptr),
|
| consumer_count_(0),
|
| is_shut_down_(false) {
|
| - // The AffiliatedInvalidationServiceProvider should be created before any user
|
| - // Profiles.
|
| + // The AffiliatedInvalidationServiceProviderImpl should be created before any
|
| + // user Profiles.
|
| DCHECK(g_browser_process->profile_manager()->GetLoadedProfiles().empty());
|
|
|
| // Subscribe to notification about new user profiles becoming available.
|
| @@ -135,13 +134,13 @@ AffiliatedInvalidationServiceProvider::AffiliatedInvalidationServiceProvider()
|
| content::NotificationService::AllSources());
|
| }
|
|
|
| -AffiliatedInvalidationServiceProvider::
|
| -~AffiliatedInvalidationServiceProvider() {
|
| +AffiliatedInvalidationServiceProviderImpl::
|
| +~AffiliatedInvalidationServiceProviderImpl() {
|
| // Verify that the provider was shut down first.
|
| DCHECK(is_shut_down_);
|
| }
|
|
|
| -void AffiliatedInvalidationServiceProvider::Observe(
|
| +void AffiliatedInvalidationServiceProviderImpl::Observe(
|
| int type,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) {
|
| @@ -177,7 +176,7 @@ void AffiliatedInvalidationServiceProvider::Observe(
|
| }
|
| }
|
|
|
| -void AffiliatedInvalidationServiceProvider::RegisterConsumer(
|
| +void AffiliatedInvalidationServiceProviderImpl::RegisterConsumer(
|
| Consumer* consumer) {
|
| if (consumers_.HasObserver(consumer) || is_shut_down_)
|
| return;
|
| @@ -191,7 +190,7 @@ void AffiliatedInvalidationServiceProvider::RegisterConsumer(
|
| FindConnectedInvalidationService();
|
| }
|
|
|
| -void AffiliatedInvalidationServiceProvider::UnregisterConsumer(
|
| +void AffiliatedInvalidationServiceProviderImpl::UnregisterConsumer(
|
| Consumer* consumer) {
|
| if (!consumers_.HasObserver(consumer))
|
| return;
|
| @@ -205,7 +204,7 @@ void AffiliatedInvalidationServiceProvider::UnregisterConsumer(
|
| }
|
| }
|
|
|
| -void AffiliatedInvalidationServiceProvider::Shutdown() {
|
| +void AffiliatedInvalidationServiceProviderImpl::Shutdown() {
|
| is_shut_down_ = true;
|
|
|
| registrar_.RemoveAll();
|
| @@ -221,12 +220,12 @@ void AffiliatedInvalidationServiceProvider::Shutdown() {
|
| }
|
|
|
| invalidation::TiclInvalidationService*
|
| -AffiliatedInvalidationServiceProvider::
|
| +AffiliatedInvalidationServiceProviderImpl::
|
| GetDeviceInvalidationServiceForTest() const {
|
| return device_invalidation_service_.get();
|
| }
|
|
|
| -void AffiliatedInvalidationServiceProvider::OnInvalidationServiceConnected(
|
| +void AffiliatedInvalidationServiceProviderImpl::OnInvalidationServiceConnected(
|
| invalidation::InvalidationService* invalidation_service) {
|
| DCHECK(!is_shut_down_);
|
|
|
| @@ -254,7 +253,8 @@ void AffiliatedInvalidationServiceProvider::OnInvalidationServiceConnected(
|
| SetInvalidationService(invalidation_service);
|
| }
|
|
|
| -void AffiliatedInvalidationServiceProvider::OnInvalidationServiceDisconnected(
|
| +void
|
| +AffiliatedInvalidationServiceProviderImpl::OnInvalidationServiceDisconnected(
|
| invalidation::InvalidationService* invalidation_service) {
|
| DCHECK(!is_shut_down_);
|
|
|
| @@ -279,7 +279,8 @@ void AffiliatedInvalidationServiceProvider::OnInvalidationServiceDisconnected(
|
| SetInvalidationService(nullptr);
|
| }
|
|
|
| -void AffiliatedInvalidationServiceProvider::FindConnectedInvalidationService() {
|
| +void
|
| +AffiliatedInvalidationServiceProviderImpl::FindConnectedInvalidationService() {
|
| DCHECK(!invalidation_service_);
|
| DCHECK(consumer_count_);
|
| DCHECK(!is_shut_down_);
|
| @@ -326,7 +327,7 @@ void AffiliatedInvalidationServiceProvider::FindConnectedInvalidationService() {
|
| }
|
| }
|
|
|
| -void AffiliatedInvalidationServiceProvider::SetInvalidationService(
|
| +void AffiliatedInvalidationServiceProviderImpl::SetInvalidationService(
|
| invalidation::InvalidationService* invalidation_service) {
|
| DCHECK(!invalidation_service_);
|
| invalidation_service_ = invalidation_service;
|
| @@ -335,7 +336,8 @@ void AffiliatedInvalidationServiceProvider::SetInvalidationService(
|
| OnInvalidationServiceSet(invalidation_service_));
|
| }
|
|
|
| -void AffiliatedInvalidationServiceProvider::DestroyDeviceInvalidationService() {
|
| +void
|
| +AffiliatedInvalidationServiceProviderImpl::DestroyDeviceInvalidationService() {
|
| device_invalidation_service_observer_.reset();
|
| device_invalidation_service_.reset();
|
| }
|
|
|