Introduce ProfileInvalidationProvider wrapper for InvalidationService

chrome/browser/extensions/api/push_messaging/push_messaging_api.cc

 // Copyright (c) 2012 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/extensions/api/push_messaging/push_messaging_api.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/token_cache/token_cache_service.h"
 #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h"
-#include "chrome/browser/invalidation/invalidation_service_factory.h"
+#include "chrome/browser/invalidation/profile_invalidation_provider.h"
+#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/extensions/api/push_messaging.h"
 #include "components/invalidation/invalidation_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 67 matching lines @@
       glue::GetChannelId::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   if (params && params->interactive) {
     interactive_ = *params->interactive;
   }
 
   // Balanced in ReportResult()
   AddRef();
 
-  invalidation::InvalidationService* invalidation_service =
-      invalidation::InvalidationServiceFactory::GetForProfile(GetProfile());
-  if (!invalidation_service) {
+  invalidation::ProfileInvalidationProvider* invalidation_provider =
+      invalidation::ProfileInvalidationProviderFactory::GetForProfile(
+          GetProfile());
+  if (!invalidation_provider) {
     error_ = kAPINotAvailableForUser;
     ReportResult(std::string(), error_);
     return false;
   }
 
   IdentityProvider* identity_provider =
-      invalidation_service->GetIdentityProvider();
+      invalidation_provider->GetInvalidationService()->GetIdentityProvider();
   if (!identity_provider->GetTokenService()->RefreshTokenIsAvailable(
           identity_provider->GetActiveAccountId())) {
     if (interactive_ && identity_provider->RequestLogin()) {
       identity_provider->AddActiveAccountRefreshTokenObserver(this);
       return true;
     } else {
       error_ = kUserNotSignedIn;
       ReportResult(std::string(), error_);
       return false;
     }
   }
 
   DVLOG(2) << "Logged in profile name: " << GetProfile()->GetProfileName();
 
   StartAccessTokenFetch();
   return true;
 }
 
 void PushMessagingGetChannelIdFunction::StartAccessTokenFetch() {
-  invalidation::InvalidationService* invalidation_service =
-      invalidation::InvalidationServiceFactory::GetForProfile(GetProfile());
-  CHECK(invalidation_service);
+  invalidation::ProfileInvalidationProvider* invalidation_provider =
+      invalidation::ProfileInvalidationProviderFactory::GetForProfile(
+          GetProfile());
+  CHECK(invalidation_provider);
   IdentityProvider* identity_provider =
-      invalidation_service->GetIdentityProvider();
+      invalidation_provider->GetInvalidationService()->GetIdentityProvider();
 
   std::vector<std::string> scope_vector =
       extensions::ObfuscatedGaiaIdFetcher::GetScopes();
   OAuth2TokenService::ScopeSet scopes(scope_vector.begin(), scope_vector.end());
   fetcher_access_token_request_ =
       identity_provider->GetTokenService()->StartRequest(
           identity_provider->GetActiveAccountId(), scopes, this);
 }
 
 void PushMessagingGetChannelIdFunction::OnRefreshTokenAvailable(
     const std::string& account_id) {
-  invalidation::InvalidationService* invalidation_service =
-      invalidation::InvalidationServiceFactory::GetForProfile(GetProfile());
-  CHECK(invalidation_service);
-  invalidation_service->GetIdentityProvider()->
+  invalidation::ProfileInvalidationProvider* invalidation_provider =
+      invalidation::ProfileInvalidationProviderFactory::GetForProfile(
+          GetProfile());
+  CHECK(invalidation_provider);
+  invalidation_provider->GetInvalidationService()->GetIdentityProvider()->
       RemoveActiveAccountRefreshTokenObserver(this);
   DVLOG(2) << "Newly logged in: " << GetProfile()->GetProfileName();
   StartAccessTokenFetch();
 }
 
 void PushMessagingGetChannelIdFunction::OnGetTokenSuccess(
     const OAuth2TokenService::Request* request,
     const std::string& access_token,
     const base::Time& expiration_time) {
   DCHECK_EQ(fetcher_access_token_request_.get(), request);
@@ skipping 98 matching lines @@
     error_text = base::IntToString(error.state());
   }
 
   DVLOG(1) << "GetChannelId status: '" << error_text << "'";
 
   // If we had bad credentials, try the logon again.
   switch (error.state()) {
     case GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS:
     case GoogleServiceAuthError::ACCOUNT_DELETED:
     case GoogleServiceAuthError::ACCOUNT_DISABLED: {
-      invalidation::InvalidationService* invalidation_service =
-          invalidation::InvalidationServiceFactory::GetForProfile(GetProfile());
-      CHECK(invalidation_service);
-      if (!interactive_ ||
-          !invalidation_service->GetIdentityProvider()->RequestLogin()) {
+      invalidation::ProfileInvalidationProvider* invalidation_provider =
+          invalidation::ProfileInvalidationProviderFactory::GetForProfile(
+              GetProfile());
+      CHECK(invalidation_provider);
+      if (!interactive_ || !invalidation_provider->GetInvalidationService()->
+              GetIdentityProvider()->RequestLogin()) {
         ReportResult(std::string(), error_text);
       }
       return;
     }
     default:
       // Return error to caller.
       ReportResult(std::string(), error_text);
       return;
   }
 }
@@ skipping 23 matching lines @@
 static base::LazyInstance<BrowserContextKeyedAPIFactory<PushMessagingAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<PushMessagingAPI>*
 PushMessagingAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 bool PushMessagingAPI::InitEventRouterAndHandler() {
-  invalidation::InvalidationService* invalidation_service =
-      invalidation::InvalidationServiceFactory::GetForProfile(profile_);
-  if (!invalidation_service)
+  invalidation::ProfileInvalidationProvider* invalidation_provider =
+      invalidation::ProfileInvalidationProviderFactory::GetForProfile(profile_);
+  if (!invalidation_provider)
     return false;
 
   if (!event_router_)
     event_router_.reset(new PushMessagingEventRouter(profile_));
   if (!handler_) {
-    handler_.reset(new PushMessagingInvalidationHandler(invalidation_service,
-                                                        event_router_.get()));
+    handler_.reset(new PushMessagingInvalidationHandler(
+        invalidation_provider->GetInvalidationService(),
+        event_router_.get()));
   }
 
   return true;
 }
 
 void PushMessagingAPI::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const Extension* extension) {
   if (!InitEventRouterAndHandler())
     return;
@@ skipping 34 matching lines @@
 
 void PushMessagingAPI::SetMapperForTest(
     scoped_ptr<PushMessagingInvalidationMapper> mapper) {
   handler_ = mapper.Pass();
 }
 
 template <>
 void
 BrowserContextKeyedAPIFactory<PushMessagingAPI>::DeclareFactoryDependencies() {
   DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
-  DependsOn(invalidation::InvalidationServiceFactory::GetInstance());
+  DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance());
 }
 
 }  // namespace extensions