Refactor AO2TS to make it easier to componentize.

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

 // 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.
 
 package org.chromium.chrome.browser.signin;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.Context;
 import android.preference.PreferenceManager;
@@ skipping 35 matching lines @@
      * implement this interface and register with {@link #addObserver}.
      */
     public interface OAuth2TokenServiceObserver {
         void onRefreshTokenAvailable(Account account);
         void onRefreshTokenRevoked(Account account);
         void onRefreshTokensLoaded();
     }
 
     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>();
     }
 
     public static OAuth2TokenService getForProfile(Profile profile) {
         ThreadUtils.assertOnUiThread();
         return (OAuth2TokenService) nativeGetForProfile(profile);
     }
 
     @CalledByNative
     private static OAuth2TokenService create(long nativeOAuth2Service) {
@@ skipping 148 matching lines @@
         if (accessToken != null) {
             AccountManagerHelper.get(context).invalidateAuthToken(accessToken);
         }
     }
 
     @CalledByNative
     public void validateAccounts(Context context, boolean forceNotifications) {
         ThreadUtils.assertOnUiThread();
         String currentlySignedInAccount =
                 ChromeSigninController.get(context).getSignedInAccountName();
-        nativeValidateAccounts(mNativeProfileOAuth2TokenService, currentlySignedInAccount,
-                               forceNotifications);
+        nativeValidateAccounts(mNativeOAuth2TokenServiceDelegateAndroid, currentlySignedInAccount,
+                forceNotifications);
     }
 
     /**
      * Triggers a notification to all observers of the native and Java instance of the
      * OAuth2TokenService that a refresh token is now available. This may cause observers to retry
      * operations that require authentication.
      */
     public void fireRefreshTokenAvailable(Account account) {
         ThreadUtils.assertOnUiThread();
         assert account != null;
-        nativeFireRefreshTokenAvailableFromJava(mNativeProfileOAuth2TokenService, account.name);
+        nativeFireRefreshTokenAvailableFromJava(
+                mNativeOAuth2TokenServiceDelegateAndroid, account.name);
     }
 
     @CalledByNative
     public void notifyRefreshTokenAvailable(String accountName) {
         assert accountName != null;
         Account account = AccountManagerHelper.createAccountFromName(accountName);
         for (OAuth2TokenServiceObserver observer : mObservers) {
             observer.onRefreshTokenAvailable(account);
         }
     }
 
     /**
      * Triggers a notification to all observers of the native and Java instance of the
      * OAuth2TokenService that a refresh token is now revoked.
      */
     public void fireRefreshTokenRevoked(Account account) {
         ThreadUtils.assertOnUiThread();
         assert account != null;
-        nativeFireRefreshTokenRevokedFromJava(mNativeProfileOAuth2TokenService, account.name);
+        nativeFireRefreshTokenRevokedFromJava(
+                mNativeOAuth2TokenServiceDelegateAndroid, account.name);
     }
 
     @CalledByNative
     public void notifyRefreshTokenRevoked(String accountName) {
         assert accountName != null;
         Account account = AccountManagerHelper.createAccountFromName(accountName);
         for (OAuth2TokenServiceObserver observer : mObservers) {
             observer.onRefreshTokenRevoked(account);
         }
     }
 
     /**
      * Triggers a notification to all observers of the native and Java instance of the
      * OAuth2TokenService that all refresh tokens now have been loaded.
      */
     public void fireRefreshTokensLoaded() {
         ThreadUtils.assertOnUiThread();
-        nativeFireRefreshTokensLoadedFromJava(mNativeProfileOAuth2TokenService);
+        nativeFireRefreshTokensLoadedFromJava(mNativeOAuth2TokenServiceDelegateAndroid);
     }
 
     @CalledByNative
     public void notifyRefreshTokensLoaded() {
         for (OAuth2TokenServiceObserver observer : mObservers) {
             observer.onRefreshTokensLoaded();
         }
     }
 
     private static String[] getStoredAccounts(Context context) {
         Set<String> accounts =
                 PreferenceManager.getDefaultSharedPreferences(context)
                         .getStringSet(STORED_ACCOUNTS_KEY, null);
         return accounts == null ? new String[]{} : accounts.toArray(new String[accounts.size()]);
     }
 
     @CalledByNative
     private static void saveStoredAccounts(Context context, String[] accounts) {
         Set<String> set = new HashSet<String>(Arrays.asList(accounts));
         PreferenceManager.getDefaultSharedPreferences(context).edit()
                 .putStringSet(STORED_ACCOUNTS_KEY, set).apply();
     }
 
     private static native Object nativeGetForProfile(Profile profile);
     private static native void nativeOAuth2TokenFetched(
             String authToken, boolean result, 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);
 }