Refactor and improve UserRecoverableErrorHandler for Play Services.

chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java

 // Copyright 2015 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.externalauth;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ skipping 138 matching lines @@
      * @param context The context to use for getting package information.
      * @param authRequirements The requirements to be exercised on the caller.
      * @return Whether the caller meets the authentication requirements.
      */
     public boolean isCallerValid(Context context, int authRequirements) {
         return isCallerValid(context, authRequirements, "");
     }
 
     /**
      * Checks whether Google Play Services can be used, applying the specified error-handling
-     * policy if a user-recoverable error occurs. To avoid undue burden on the user, the error
-     * handling policy will be applied at most one time per browser startup (i.e., a dialog or
-     * a system notification).
-     * This method is threadsafe. If the specified error-handling policy requires UI interaction,
-     * an asynchronous task will be posted to the main thread to perform such interaction.
+     * policy if a user-recoverable error occurs. This method is threadsafe. If the specified
+     * error-handling policy requires UI interaction, it will be run on the UI thread.
      * @param context The current context.
      * @param errorHandler How to handle user-recoverable errors; must be non-null.
      * @return true if and only if Google Play Services can be used
      */
     public boolean canUseGooglePlayServices(
             final Context context, final UserRecoverableErrorHandler errorHandler) {
         final int errorCode = GooglePlayServicesUtil.isGooglePlayServicesAvailable(context);
         if (errorCode == ConnectionResult.SUCCESS) {
             return true; // Hooray!
         }
-        // The rest of the method is error-handling bits.
         Log.v(TAG, "Unable to use Google Play Services: %s",
                 GooglePlayServicesUtil.getErrorString(errorCode));
         if (GooglePlayServicesUtil.isUserRecoverableError(errorCode)) {
-            ThreadUtils.runOnUiThread(errorHandler);
+            Runnable errorHandlerTask = new Runnable() {
+                @Override
+                public void run() {
+                    errorHandler.handleError(context, errorCode);
+                }
+            };
+            ThreadUtils.runOnUiThread(errorHandlerTask);
         }
         return false;
     }
 }