Move TokenCacheService away from listening for Signin notifications.

chrome/browser/extensions/token_cache/token_cache_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 "base/logging.h"
 #include "chrome/browser/extensions/token_cache/token_cache_service.h"
-
-#include "base/logging.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "content/public/browser/notification_source.h"
+#include "chrome/browser/signin/signin_manager.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace extensions {
 
 TokenCacheService::TokenCacheService(Profile* profile) : profile_(profile) {
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
-                 content::Source<Profile>(profile_));
+  SigninManagerFactory::GetForProfile(profile)->AddObserver(this);
 }
 
 TokenCacheService::~TokenCacheService() {
+  SigninManagerFactory::GetForProfile(const_cast<Profile*>(profile_))

[Yoyo Zhou, 2014/02/18 17:45:54]

This should be in TokenCacheService::Shutdown.

Also declare in the TokenCacheServiceFactory constructor
DependsOn(SigninManagerFactory::GetInstance());
so that this class is destroyed first.

[blundell, 2014/02/18 19:53:42]

Great catches, thanks. Done.

On 2014/02/18 17:45:54, Yoyo Zhou wrote:

+      ->RemoveObserver(this);
 }
 
 void TokenCacheService::StoreToken(const std::string& token_name,
                                    const std::string& token_value,
                                    base::TimeDelta time_to_live) {
   TokenCacheData token_data;
 
   // Get the current time, and make sure that the token has not already expired.
   Time expiration_time;
   TimeDelta zero_delta;
@@ skipping 27 matching lines @@
     } else {
       // Remove this entry if it is expired.
       token_cache_.erase(it);
       return std::string();
     }
   }
 
   return std::string();
 }
 
-// Inherited from NotificationObserver.
-void TokenCacheService::Observe(int type,
-                                const content::NotificationSource& source,
-                                const content::NotificationDetails& details)  {
-  DCHECK(chrome::NOTIFICATION_GOOGLE_SIGNED_OUT == type);
+void TokenCacheService::GoogleSignedOut(const std::string& username) {
   token_cache_.clear();
 }
 
 }  // namespace extensions