Refactor AO2TS to make it easier to componentize.

chrome/browser/signin/profile_oauth2_token_service_factory.cc

 // Copyright (c) 2012 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 "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/signin_error_controller_factory.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 
 #if defined(OS_ANDROID)
-#include "chrome/browser/signin/android_profile_oauth2_token_service.h"
+#include "chrome/browser/signin/oauth2_token_service_delegate_android.h"
 #else
-#include "components/signin/core/browser/mutable_profile_oauth2_token_service.h"
+#include "chrome/browser/signin/mutable_profile_oauth2_token_service_delegate.h"
 #endif
 
 ProfileOAuth2TokenServiceFactory::ProfileOAuth2TokenServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "ProfileOAuth2TokenService",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(GlobalErrorServiceFactory::GetInstance());
   DependsOn(WebDataServiceFactory::GetInstance());
   DependsOn(ChromeSigninClientFactory::GetInstance());
   DependsOn(SigninErrorControllerFactory::GetInstance());
 }
 
 ProfileOAuth2TokenServiceFactory::~ProfileOAuth2TokenServiceFactory() {
 }
 
 ProfileOAuth2TokenService*
 ProfileOAuth2TokenServiceFactory::GetForProfile(Profile* profile) {
   return static_cast<ProfileOAuth2TokenService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
-ProfileOAuth2TokenServiceFactory::PlatformSpecificOAuth2TokenService*
-ProfileOAuth2TokenServiceFactory::GetPlatformSpecificForProfile(
-    Profile* profile) {
-  return static_cast<PlatformSpecificOAuth2TokenService*>(
-      GetForProfile(profile));
-}
-
-// static
 ProfileOAuth2TokenServiceFactory*
     ProfileOAuth2TokenServiceFactory::GetInstance() {
   return Singleton<ProfileOAuth2TokenServiceFactory>::get();
 }
 
 KeyedService* ProfileOAuth2TokenServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
+#if defined(OS_ANDROID)
+  OAuth2TokenServiceDelegateAndroid* delegate =
+      new OAuth2TokenServiceDelegateAndroid();
+  delegate->Initialize();
+#else
   Profile* profile = static_cast<Profile*>(context);
-  PlatformSpecificOAuth2TokenService* service =
-      new PlatformSpecificOAuth2TokenService();
-  service->Initialize(
-      ChromeSigninClientFactory::GetInstance()->GetForProfile(profile),
-      SigninErrorControllerFactory::GetInstance()->GetForProfile(profile));
+  // TODO(acleung): This is br0ked for non-android right now. FIXME.
+  MutableProfileOAuth2TokenServiceDelegate* delegate =
+      new MutableProfileOAuth2TokenServiceDelegate(
+          ChromeSigninClientFactory::GetInstance()->GetForProfile(profile),
+          SigninErrorControllerFactory::GetInstance()->GetForProfile(profile));
+#endif
+  ProfileOAuth2TokenService* service = new ProfileOAuth2TokenService(delegate);
   return service;
 }