Making OAuth2TokenService multi-login aware, updating callers, minor fixes

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"
@@ skipping 108 matching lines @@
   DVLOG(2) << "Logged in profile name: " << profile()->GetProfileName();
 
   StartAccessTokenFetch();
   return true;
 }
 
 void PushMessagingGetChannelIdFunction::StartAccessTokenFetch() {
   std::vector<std::string> scope_vector =
       extensions::ObfuscatedGaiaIdFetcher::GetScopes();
   OAuth2TokenService::ScopeSet scopes(scope_vector.begin(), scope_vector.end());
-  fetcher_access_token_request_ =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile())
-          ->StartRequest(scopes, this);
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
+  fetcher_access_token_request_ = token_service->StartRequest(
+      token_service->GetPrimaryAccountId(), scopes, this);
 }
 
 void PushMessagingGetChannelIdFunction::OnRefreshTokenAvailable(
     const std::string& account_id) {
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile())
       ->RemoveObserver(this);
   DVLOG(2) << "Newly logged in: " << profile()->GetProfileName();
   StartAccessTokenFetch();
 }
 
@@ skipping 40 matching lines @@
   if (!gaia_id.empty()) {
     ReportResult(gaia_id, std::string());
     return;
   }
 
   fetcher_->Start();
 }
 
 // Check if the user is logged in.
 bool PushMessagingGetChannelIdFunction::IsUserLoggedIn() const {
-  return ProfileOAuth2TokenServiceFactory::GetForProfile(profile())
-      ->RefreshTokenIsAvailable();
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
+  return token_service->RefreshTokenIsAvailable(
+      token_service->GetPrimaryAccountId());
 }
 
 void PushMessagingGetChannelIdFunction::ReportResult(
     const std::string& gaia_id, const std::string& error_string) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BuildAndSendResult(gaia_id, error_string);
 
   // Cache the obfuscated ID locally. It never changes for this user,
   // and if we call the web API too often, we get errors due to rate limiting.
@@ skipping 152 matching lines @@
   handler_ = mapper.Pass();
 }
 
 template <>
 void ProfileKeyedAPIFactory<PushMessagingAPI>::DeclareFactoryDependencies() {
   DependsOn(ExtensionSystemFactory::GetInstance());
   DependsOn(invalidation::InvalidationServiceFactory::GetInstance());
 }
 
 }  // namespace extensions