OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/login/oauth2_login_manager_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/chromeos/login/oauth2_login_manager_factory.h"
+
+#include "chrome/browser/chromeos/login/oauth2_login_manager.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 
-ProfileOAuth2TokenServiceFactory::ProfileOAuth2TokenServiceFactory()
+namespace chromeos {
+
+OAuth2LoginManagerFactory::OAuth2LoginManagerFactory()
     : BrowserContextKeyedServiceFactory(
-        "ProfileOAuth2TokenService",
+        "OAuth2LoginManager",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(GlobalErrorServiceFactory::GetInstance());
   DependsOn(SigninManagerFactory::GetInstance());
   DependsOn(TokenServiceFactory::GetInstance());
+  DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
 }
 
-ProfileOAuth2TokenServiceFactory::~ProfileOAuth2TokenServiceFactory() {
+OAuth2LoginManagerFactory::~OAuth2LoginManagerFactory() {
 }
 
-#if defined(OS_ANDROID)
 // static
-AndroidProfileOAuth2TokenService*
-    ProfileOAuth2TokenServiceFactory::GetForProfile(Profile* profile) {
-  return static_cast<AndroidProfileOAuth2TokenService*>(
+OAuth2LoginManager* OAuth2LoginManagerFactory::GetForProfile(
+    Profile* profile) {
+  return static_cast<OAuth2LoginManager*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
-#else
-// static
-ProfileOAuth2TokenService* ProfileOAuth2TokenServiceFactory::GetForProfile(
-    Profile* profile) {
-  return static_cast<ProfileOAuth2TokenService*>(
-      GetInstance()->GetServiceForBrowserContext(profile, true));
-}
-#endif  // defined(OS_ANDROID)
 
 // static
-ProfileOAuth2TokenServiceFactory*
-    ProfileOAuth2TokenServiceFactory::GetInstance() {
-  return Singleton<ProfileOAuth2TokenServiceFactory>::get();
+OAuth2LoginManagerFactory*
+    OAuth2LoginManagerFactory::GetInstance() {
+  return Singleton<OAuth2LoginManagerFactory>::get();
 }
 
 BrowserContextKeyedService*
-ProfileOAuth2TokenServiceFactory::BuildServiceInstanceFor(
+OAuth2LoginManagerFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
-  ProfileOAuth2TokenService* service;
-#if defined(OS_ANDROID)
-  service = new AndroidProfileOAuth2TokenService();
-#else
-  service = new ProfileOAuth2TokenService();
-#endif
-  service->Initialize(profile);
+  OAuth2LoginManager* service;
+  service = new OAuth2LoginManager(profile);
   return service;
 }
+
+}  // namespace chromeos