Refactor OAuth2TokenService to have profile- and device-based implementations.

chrome/browser/signin/profile_oauth2_token_service_factory.h

Index: chrome/browser/signin/profile_oauth2_token_service_factory.h
diff --git a/chrome/browser/signin/oauth2_token_service_factory.h b/chrome/browser/signin/profile_oauth2_token_service_factory.h
similarity index 32%
rename from chrome/browser/signin/oauth2_token_service_factory.h
rename to chrome/browser/signin/profile_oauth2_token_service_factory.h
index 155f0e3928201397233eb7593626d241e735f14e..16469837493ceb4f7593e76e3fe82a893112a0ea 100644
--- a/chrome/browser/signin/oauth2_token_service_factory.h
+++ b/chrome/browser/signin/profile_oauth2_token_service_factory.h
@@ -2,39 +2,40 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SIGNIN_OAUTH2_TOKEN_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_SIGNIN_OAUTH2_TOKEN_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_FACTORY_H_
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
-class OAuth2TokenService;
+class ProfileOAuth2TokenService;
 class Profile;
 
-// Singleton that owns all OAuth2TokenServices and associates them with
+// Singleton that owns all ProfileOAuth2TokenServices and associates them with
 // Profiles. Listens for the Profile's destruction notification and cleans up
-// the associated OAuth2TokenService.
-class OAuth2TokenServiceFactory : public ProfileKeyedServiceFactory {
+// the associated ProfileOAuth2TokenService.
+class ProfileOAuth2TokenServiceFactory : public ProfileKeyedServiceFactory {
  public:
-  // Returns the instance of OAuth2TokenService associated with this profile
-  // (creating one if none exists). Returns NULL if this profile cannot have a
-  // OAuth2TokenService (for example, if |profile| is incognito).
-  static OAuth2TokenService* GetForProfile(Profile* profile);
+  // Returns the instance of ProfileOAuth2TokenService associated with this
+  // profile (creating one if none exists). Returns NULL if this profile
+  // cannot have a ProfileOAuth2TokenService (for example, if |profile| is
+  // incognito).
+  static ProfileOAuth2TokenService* GetForProfile(Profile* profile);
 
-  // Returns an instance of the OAuth2TokenServiceFactory singleton.
-  static OAuth2TokenServiceFactory* GetInstance();
+  // Returns an instance of the ProfileOAuth2TokenServiceFactory singleton.
+  static ProfileOAuth2TokenServiceFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<OAuth2TokenServiceFactory>;
+  friend struct DefaultSingletonTraits<ProfileOAuth2TokenServiceFactory>;
 
-  OAuth2TokenServiceFactory();
-  virtual ~OAuth2TokenServiceFactory();
+  ProfileOAuth2TokenServiceFactory();
+  virtual ~ProfileOAuth2TokenServiceFactory();
 
   // ProfileKeyedServiceFactory implementation.
   virtual ProfileKeyedService* BuildServiceInstanceFor(
       Profile* profile) const OVERRIDE;
 
-  DISALLOW_COPY_AND_ASSIGN(OAuth2TokenServiceFactory);
+  DISALLOW_COPY_AND_ASSIGN(ProfileOAuth2TokenServiceFactory);
 };
 
-#endif  // CHROME_BROWSER_SIGNIN_OAUTH2_TOKEN_SERVICE_FACTORY_H_
+#endif  // CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_FACTORY_H_