Eliminate ProfileOAuth2TokenService being a BCKS.

chrome/browser/signin/profile_oauth2_token_service.h

Index: chrome/browser/signin/profile_oauth2_token_service.h
diff --git a/chrome/browser/signin/profile_oauth2_token_service.h b/chrome/browser/signin/profile_oauth2_token_service.h
index ce2ce4d8ceeb9e54c05eeebdf951028d8a51bb51..f16cf01dcb0e1a0d09af448132e0561fc0978e20 100644
--- a/chrome/browser/signin/profile_oauth2_token_service.h
+++ b/chrome/browser/signin/profile_oauth2_token_service.h
@@ -21,6 +21,7 @@ class GoogleServiceAuthError;
 class Profile;
 class SigninGlobalError;
 
+// TODO(blundell): What should the following be rewritten to?

[blundell, 2014/02/10 16:19:16]

Suggestions here?

[Roger Tawa OOO till Jul 10th, 2014/02/10 19:49:13]

Seems like you can replace "BrowserContextKeyedService" with "component" and it
still reads correctly.  Maybe add that there is a BCKS wrapper if you are
starting with a Profile*?

[blundell, 2014/02/13 16:07:06]

Changed to "class" as "component" is an overloaded term. Don't want to add the
BCKS wrapper bit as this class will eventually move the component while the
wrapper will stay in //chrome. Thanks!

On 2014/02/10 19:49:13, Roger Tawa wrote:

 // ProfileOAuth2TokenService is a BrowserContextKeyedService that retrieves
 // OAuth2 access tokens for a given set of scopes using the OAuth2 login
 // refresh tokens.
@@ -35,14 +36,14 @@ class SigninGlobalError;
 //
 // Note: requests should be started from the UI thread. To start a
 // request from other thread, please use ProfileOAuth2TokenServiceRequest.
-class ProfileOAuth2TokenService : public OAuth2TokenService,
-                                  public BrowserContextKeyedService {
+class ProfileOAuth2TokenService : public OAuth2TokenService {
  public:
+  virtual ~ProfileOAuth2TokenService();
+
   // Initializes this token service with the profile.
   virtual void Initialize(Profile* profile);
 
-  // BrowserContextKeyedService implementation.
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown();
 
   // Gets an account id of the primary account related to the profile.
   // DEPRECATED: Use SigninManagerBase::GetAuthenticatedAccountId() instead.
@@ -82,7 +83,6 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
 
  protected:
   ProfileOAuth2TokenService();
-  virtual ~ProfileOAuth2TokenService();
 
   // OAuth2TokenService overrides.
   // Note: These methods are overriden so that ProfileOAuth2TokenService is a