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

Index: chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
index 4dcbee4e6a0655fa4473406da68aee28070423da..f4bdedc2fe6f00a4ab3699bdcfd00eda183fb34a 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
@@ -17,6 +17,8 @@
 #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/extensions/token_cache/token_cache_service.h"
+#include "chrome/browser/extensions/token_cache/token_cache_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
@@ -40,6 +42,7 @@ namespace {
 const char kChannelIdSeparator[] = "/";
 const char kUserNotSignedIn[] = "The user is not signed in.";
 const char kTokenServiceNotAvailable[] = "Failed to get token service.";
+const int kObfuscatedGaiaIdTimeoutInDays = 30;
 }
 
 namespace extensions {
@@ -130,10 +133,14 @@ bool PushMessagingGetChannelIdFunction::StartGaiaIdFetch() {
       token_service->GetOAuth2LoginRefreshToken();
   fetcher_.reset(new ObfuscatedGaiaIdFetcher(context, this, refresh_token));
 
+  // Get the token cache and see if we have already cached a Gaia Id.
+  TokenCacheService* token_cache =
+      TokenCacheServiceFactory::GetForProfile(profile());
+
   // 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);
+      token_cache->RetrieveToken(GaiaConstants::kObfuscatedGaiaId);
   if (!gaia_id.empty()) {
     ReportResult(gaia_id, std::string());
     return true;
@@ -178,11 +185,12 @@ void PushMessagingGetChannelIdFunction::ReportResult(
   // 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);
-    }
+    base::TimeDelta timeout =
+        base::TimeDelta::FromDays(kObfuscatedGaiaIdTimeoutInDays);
+    TokenCacheService* token_cache =
+        TokenCacheServiceFactory::GetForProfile(profile());
+    token_cache->StoreToken(GaiaConstants::kObfuscatedGaiaId, gaia_id,
+                            timeout);
   }
 
   // Balanced in RunImpl.