Introduce ProfileInvalidationProvider wrapper for InvalidationService

chrome/browser/invalidation/ticl_invalidation_service.cc

 // Copyright (c) 2013 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/invalidation/ticl_invalidation_service.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
 #include "chrome/common/chrome_content_client.h"
@@ skipping 51 matching lines @@
       settings_provider_(settings_provider.Pass()),
       invalidator_registrar_(new syncer::InvalidatorRegistrar()),
       request_access_token_backoff_(&kRequestAccessTokenBackoffPolicy),
       network_channel_type_(PUSH_CLIENT_CHANNEL),
       gcm_driver_(gcm_driver),
       request_context_(request_context),
       logger_() {}
 
 TiclInvalidationService::~TiclInvalidationService() {
   DCHECK(CalledOnValidThread());
+  settings_provider_->RemoveObserver(this);
+  identity_provider_->RemoveActiveAccountRefreshTokenObserver(this);
+  identity_provider_->RemoveObserver(this);
+  if (IsStarted()) {
+    StopInvalidator();
+  }
 }
 
 void TiclInvalidationService::Init(
     scoped_ptr<syncer::InvalidationStateTracker> invalidation_state_tracker) {
   DCHECK(CalledOnValidThread());
   invalidation_state_tracker_ = invalidation_state_tracker.Pass();
 
   if (invalidation_state_tracker_->GetInvalidatorClientId().empty()) {
     invalidation_state_tracker_->ClearAndSetNewClientId(
         GenerateInvalidatorClientId());
@@ skipping 212 matching lines @@
 
 void TiclInvalidationService::OnIncomingInvalidation(
     const syncer::ObjectIdInvalidationMap& invalidation_map) {
   invalidator_registrar_->DispatchInvalidationsToHandlers(invalidation_map);
 
   logger_.OnInvalidation(invalidation_map);
 }
 
 std::string TiclInvalidationService::GetOwnerName() const { return "TICL"; }
 
-void TiclInvalidationService::Shutdown() {
-  DCHECK(CalledOnValidThread());
-  settings_provider_->RemoveObserver(this);
-  identity_provider_->RemoveActiveAccountRefreshTokenObserver(this);
-  identity_provider_->RemoveObserver(this);
-  if (IsStarted()) {
-    StopInvalidator();
-  }
-  invalidation_state_tracker_.reset();
-  invalidator_registrar_.reset();
-}
-
 bool TiclInvalidationService::IsReadyToStart() {
   if (identity_provider_->GetActiveAccountId().empty()) {
     DVLOG(2) << "Not starting TiclInvalidationService: User is not signed in.";
     return false;
   }
 
   OAuth2TokenService* token_service = identity_provider_->GetTokenService();
   if (!token_service) {
     DVLOG(2)
         << "Not starting TiclInvalidationService: "
@@ skipping 106 matching lines @@
 }
 
 void TiclInvalidationService::StopInvalidator() {
   DCHECK(invalidator_);
   gcm_invalidation_bridge_.reset();
   invalidator_->UnregisterHandler(this);
   invalidator_.reset();
 }
 
 }  // namespace invalidation