Refactor AO2TS to make it easier to componentize.

chrome/test/base/testing_profile.cc

Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 86a6b3171d5642230c79564418e2ef28afa79f61..9e510e7eda36e523cec8ce51533523b8faa7f8a8 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -107,7 +107,7 @@
 #endif
 
 #if defined(OS_ANDROID)
-#include "chrome/browser/signin/android_profile_oauth2_token_service.h"
+#include "chrome/browser/signin/oauth2_token_service_delegate_android.h"
 #endif
 
 #if defined(ENABLE_SUPERVISED_USERS)
@@ -409,7 +409,7 @@ void TestingProfile::Init() {
 
 #if defined(OS_ANDROID)
   // Make sure token service knows its running in tests.
-  AndroidProfileOAuth2TokenService::set_is_testing_profile();
+  OAuth2TokenServiceDelegateAndroid::set_is_testing_profile();
 #endif
 
   // Normally this would happen during browser startup, but for tests