Refactor AO2TS to make it easier to componentize.

chrome/browser/android/signin/signin_manager_android.cc

 // Copyright 2013 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 <vector>
 
 #include "chrome/browser/android/signin/signin_manager_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
-#include "chrome/browser/signin/android_profile_oauth2_token_service.h"
+#include "chrome/browser/signin/oauth2_token_service_delegate_android.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "google_apis/gaia/gaia_constants.h"
@@ skipping 222 matching lines @@
   ClearLastSignedInUser();
 }
 
 void SigninManagerAndroid::ClearLastSignedInUser() {
   profile_->GetPrefs()->ClearPref(prefs::kGoogleServicesLastUsername);
 }
 
 void SigninManagerAndroid::LogInSignedInUser(JNIEnv* env, jobject obj) {
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile_);
-    // Just fire the events and let the Account Reconcilor handles everything.
-    AndroidProfileOAuth2TokenService* token_service =
-        ProfileOAuth2TokenServiceFactory::GetPlatformSpecificForProfile(
-            profile_);
-    const std::string& primary_acct =
-        signin_manager->GetAuthenticatedAccountId();
-    token_service->ValidateAccounts(primary_acct, true);
+  // With the account consistency enabled let the account Reconcilor handles
+  // everything.
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
+  const std::string& primary_acct = signin_manager->GetAuthenticatedAccountId();
+
+  static_cast<OAuth2TokenServiceDelegateAndroid*>(token_service->GetDelegate())
+      ->ValidateAccounts(primary_acct, true);
 }
 
 jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env,
                                                        jobject obj) {
   return SigninManagerFactory::GetForProfile(profile_)->IsSigninAllowed();
 }
 
 jboolean SigninManagerAndroid::IsSignedInOnNative(JNIEnv* env, jobject obj) {
   return SigninManagerFactory::GetForProfile(profile_)->IsAuthenticated();
 }
@@ skipping 19 matching lines @@
   return !policy::BrowserPolicyConnector::IsNonEnterpriseUser(username);
 #else
   return false;
 #endif
 }
 
 // static
 bool SigninManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }