Refactor AO2TS to make it easier to componentize.

chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java
index ee0ec144ef611b8a7c39d160a072da634bfb1a47..af66e09ee6e9e31d5cd4bb63d145bbb44387eba8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java
@@ -53,11 +53,11 @@ public final class OAuth2TokenService {
 
     private static final String OAUTH2_SCOPE_PREFIX = "oauth2:";
 
-    private final long mNativeProfileOAuth2TokenService;
+    private final long mNativeOAuth2TokenServiceDelegateAndroid;
     private final ObserverList<OAuth2TokenServiceObserver> mObservers;
 
     private OAuth2TokenService(long nativeOAuth2Service) {
-        mNativeProfileOAuth2TokenService = nativeOAuth2Service;
+        mNativeOAuth2TokenServiceDelegateAndroid = nativeOAuth2Service;
         mObservers = new ObserverList<OAuth2TokenServiceObserver>();
     }
 
@@ -232,8 +232,8 @@ public final class OAuth2TokenService {
         ThreadUtils.assertOnUiThread();
         String currentlySignedInAccount =
                 ChromeSigninController.get(context).getSignedInAccountName();
-        nativeValidateAccounts(mNativeProfileOAuth2TokenService, currentlySignedInAccount,
-                               forceNotifications);
+        nativeValidateAccounts(mNativeOAuth2TokenServiceDelegateAndroid, currentlySignedInAccount,
+                forceNotifications);
     }
 
     /**
@@ -244,7 +244,8 @@ public final class OAuth2TokenService {
     public void fireRefreshTokenAvailable(Account account) {
         ThreadUtils.assertOnUiThread();
         assert account != null;
-        nativeFireRefreshTokenAvailableFromJava(mNativeProfileOAuth2TokenService, account.name);
+        nativeFireRefreshTokenAvailableFromJava(
+                mNativeOAuth2TokenServiceDelegateAndroid, account.name);
     }
 
     @CalledByNative
@@ -263,7 +264,8 @@ public final class OAuth2TokenService {
     public void fireRefreshTokenRevoked(Account account) {
         ThreadUtils.assertOnUiThread();
         assert account != null;
-        nativeFireRefreshTokenRevokedFromJava(mNativeProfileOAuth2TokenService, account.name);
+        nativeFireRefreshTokenRevokedFromJava(
+                mNativeOAuth2TokenServiceDelegateAndroid, account.name);
     }
 
     @CalledByNative
@@ -281,7 +283,7 @@ public final class OAuth2TokenService {
      */
     public void fireRefreshTokensLoaded() {
         ThreadUtils.assertOnUiThread();
-        nativeFireRefreshTokensLoadedFromJava(mNativeProfileOAuth2TokenService);
+        nativeFireRefreshTokensLoadedFromJava(mNativeOAuth2TokenServiceDelegateAndroid);
     }
 
     @CalledByNative
@@ -308,14 +310,12 @@ public final class OAuth2TokenService {
     private static native Object nativeGetForProfile(Profile profile);
     private static native void nativeOAuth2TokenFetched(
             String authToken, long nativeCallback);
-    private native void nativeValidateAccounts(
-            long nativeAndroidProfileOAuth2TokenService,
-            String currentlySignedInAccount,
-            boolean forceNotifications);
+    private native void nativeValidateAccounts(long nativeOAuth2TokenServiceDelegateAndroid,
+            String currentlySignedInAccount, boolean forceNotifications);
     private native void nativeFireRefreshTokenAvailableFromJava(
-            long nativeAndroidProfileOAuth2TokenService, String accountName);
+            long nativeOAuth2TokenServiceDelegateAndroid, String accountName);
     private native void nativeFireRefreshTokenRevokedFromJava(
-            long nativeAndroidProfileOAuth2TokenService, String accountName);
+            long nativeOAuth2TokenServiceDelegateAndroid, String accountName);
     private native void nativeFireRefreshTokensLoadedFromJava(
-            long nativeAndroidProfileOAuth2TokenService);
+            long nativeOAuth2TokenServiceDelegateAndroid);
 }