Build a new TokenCacheService so I can stop using TokenService for something it wasn't designed for.

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/extensions/api/push_messaging/push_messaging_invalidation_handler.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"

[dcheng, 2013/02/28 19:18:04]

Seems like we don't need these includes anymore.

[Pete Williamson, 2013/03/04 18:32:53]

Nope, these are still used elsewhere (StartGaiaIdFetch, etc.)

 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/browser/token_cache/token_cache.h"
+#include "chrome/browser/token_cache/token_cache_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/push_messaging.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "google_apis/gaia/gaia_constants.h"
@@ skipping 83 matching lines @@
   net::URLRequestContextGetter* context = profile()->GetRequestContext();
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile());
   if (!token_service) {
     ReportResult(std::string(), std::string(kTokenServiceNotAvailable));
     return false;
   }
   const std::string& refresh_token =
       token_service->GetOAuth2LoginRefreshToken();
   fetcher_.reset(new ObfuscatedGaiaIdFetcher(context, this, refresh_token));
 
-  // Check the cache, if we already have a gaia ID, use it instead of
-  // fetching the ID over the network.
-  const std::string& gaia_id =
-      token_service->GetTokenForService(GaiaConstants::kObfuscatedGaiaId);
-  if (!gaia_id.empty()) {
-    ReportResult(gaia_id, std::string());
-    return true;
+  // Get the token cache and see if we have already cached a Gaia Id.
+  TokenCacheService* token_cache =
+      TokenCacheServiceFactory::GetForProfile(profile());
+  if (token_cache != NULL) {

[dcheng, 2013/02/28 19:18:04]

Why would this be NULL?

[Pete Williamson, 2013/03/04 18:32:53]

I was thinking out of memory in the token cache service.   However, if the out
of memory handler catches the exception, I don't need to test for null here. 
Test removed.

+    // Check the cache, if we already have a gaia ID, use it instead of
+    // fetching the ID over the network.
+    const std::string& gaia_id =
+        token_cache->RetrieveToken(GaiaConstants::kObfuscatedGaiaId);
+    if (!gaia_id.empty()) {
+      ReportResult(gaia_id, std::string());
+      return true;
+    }
   }
 
   fetcher_->Start();
 
   // Will finish asynchronously.
   return true;
 }
 
 // Check if the user is logged in.
 bool PushMessagingGetChannelIdFunction::IsUserLoggedIn() const {
@@ skipping 21 matching lines @@
 
 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.
   if (!gaia_id.empty()) {
-    TokenService* token_service = TokenServiceFactory::GetForProfile(profile());
-    if (token_service) {
-      token_service->AddAuthTokenManually(GaiaConstants::kObfuscatedGaiaId,
-                                          gaia_id);
+    TokenCacheService* token_cache =
+        TokenCacheServiceFactory::GetForProfile(profile());
+    if (token_cache) {

[dcheng, 2013/02/28 19:18:04]

Ditto. Why would this be NULL?

[Pete Williamson, 2013/03/04 18:32:53]

Done.

+      token_cache->StoreToken(GaiaConstants::kObfuscatedGaiaId, gaia_id,
+                              GaiaConstants::kObfuscatedGaiaIdTimeout);
     }
   }
 
   // Balanced in RunImpl.
   Release();
 }
 
 void PushMessagingGetChannelIdFunction::BuildAndSendResult(
     const std::string& gaia_id, const std::string& error_message) {
   std::string channel_id;
@@ skipping 104 matching lines @@
   handler_ = mapper.Pass();
 }
 
 template <>
 void ProfileKeyedAPIFactory<PushMessagingAPI>::DeclareFactoryDependencies() {
   DependsOn(ExtensionSystemFactory::GetInstance());
   DependsOn(ProfileSyncServiceFactory::GetInstance());
 }
 
 }  // namespace extensions