Refactor AO2TS to make it easier to componentize.

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/profile_oauth2_token_service_factory.h b/chrome/browser/signin/profile_oauth2_token_service_factory.h
index f972e6c7575ecae8c2acc3af3f233a57aea53f9e..ac15a7c527129fc9598b1e38b646ae8d58ba79dd 100644
--- a/chrome/browser/signin/profile_oauth2_token_service_factory.h
+++ b/chrome/browser/signin/profile_oauth2_token_service_factory.h
@@ -12,7 +12,7 @@ class ProfileOAuth2TokenService;
 class Profile;
 
 #if defined(OS_ANDROID)
-class AndroidProfileOAuth2TokenService;
+class OAuth2TokenServiceDelegateAndroid;
 #else
 class MutableProfileOAuth2TokenService;
 #endif

[Roger Tawa OOO till Jul 10th, 2015/05/28 14:54:43]

We don't need these two forward declarations anymore.

[gogerald1, 2015/06/03 18:12:58]

Done.

@@ -29,30 +29,12 @@ class ProfileOAuth2TokenServiceFactory
   // incognito).
   static ProfileOAuth2TokenService* GetForProfile(Profile* profile);
 
-  // Returns the platform specific 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).
-  #if defined(OS_ANDROID)
-  static AndroidProfileOAuth2TokenService* GetPlatformSpecificForProfile(
-      Profile* profile);
-  #else
-  static MutableProfileOAuth2TokenService* GetPlatformSpecificForProfile(
-      Profile* profile);
-  #endif
-
   // Returns an instance of the ProfileOAuth2TokenServiceFactory singleton.
   static ProfileOAuth2TokenServiceFactory* GetInstance();
 
  private:
   friend struct DefaultSingletonTraits<ProfileOAuth2TokenServiceFactory>;
 
-#if defined(OS_ANDROID)
-  typedef AndroidProfileOAuth2TokenService PlatformSpecificOAuth2TokenService;
-#else
-  typedef MutableProfileOAuth2TokenService PlatformSpecificOAuth2TokenService;
-#endif
-
   ProfileOAuth2TokenServiceFactory();
   ~ProfileOAuth2TokenServiceFactory() override;