[PlayBilling] Refactor IsReadyToPayServiceHelper constructor

Context:
Devguides suggest against doing any concrete things in constructor
since it's harder to test and prone to reading confusion.

Before:
IsReadyToPayServiceHelper did the service binding in the constructor.

After:
IsReadyToPayServiceHelper did the service binding in query().

Change:
* Move the service binding part from constructor to query().


Change-Id: Ibbc9adae00e64e01cbf1fe15298736b3d83d7950
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2198651
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#769025}

chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java

@@ -21,7 +21,6 @@ import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.components.payments.ErrorStrings;
 import org.chromium.components.payments.PayerData;
 import org.chromium.components.payments.PaymentApp;
-import org.chromium.components.payments.PaymentApp.InstrumentDetailsCallback;
 import org.chromium.components.payments.intent.IsReadyToPayServiceHelper;
 import org.chromium.components.payments.intent.WebPaymentIntentHelper;
 import org.chromium.components.payments.intent.WebPaymentIntentHelperType;
@@ -264,6 +263,7 @@ public class AndroidPaymentApp
         }
         mIsReadyToPayServiceHelper = new IsReadyToPayServiceHelper(
                 ContextUtils.getApplicationContext(), isReadyToPayIntent, /*resultHandler=*/this);
+        mIsReadyToPayServiceHelper.query();
     }
 
     @VisibleForTesting

chrome/android/javatests/src/org/chromium/chrome/browser/payments/IsReadyToPayServiceHelperTest.java

@@ -187,6 +187,7 @@ public class IsReadyToPayServiceHelperTest {
                         mErrorReceived = true;
                     }
                 });
+        helper.query();
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
@@ -215,6 +216,7 @@ public class IsReadyToPayServiceHelperTest {
                             Assert.fail();
                         }
                     });
+            helper.query();
         });
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
@@ -244,6 +246,7 @@ public class IsReadyToPayServiceHelperTest {
                             mErrorReceived = true;
                         }
                     });
+            helper.query();
         });
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
@@ -273,6 +276,7 @@ public class IsReadyToPayServiceHelperTest {
                             mErrorReceived = true;
                         }
                     });
+            helper.query();
         });
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
@@ -302,6 +306,7 @@ public class IsReadyToPayServiceHelperTest {
                             mErrorReceived = true;
                         }
                     });
+            helper.query();
         });
         // Assuming CriteriaHelper.DEFAULT_MAX_TIME_TO_POLL >
         // IsReadyToPayServiceHelper.SERVICE_CONNECTION_TIMEOUT_MS.

components/payments/content/android/java/src/org/chromium/components/payments/intent/IsReadyToPayServiceHelper.java

@@ -31,6 +31,7 @@ public class IsReadyToPayServiceHelper
     private boolean mIsServiceBindingInitiated;
     private boolean mIsReadyToPayQueried;
     private Handler mHandler;
+    private Intent mIsReadyToPayIntent;
 
     /** The callback that returns the result (success or error) to the helper's caller. */
     public interface ResultHandler {
@@ -45,8 +46,7 @@ public class IsReadyToPayServiceHelper
     }
 
     /**
-     * The constructor starts the IsReadyToPay service. The result would be returned asynchronously
-     * with one callback.
+     * Initiate the helper.
      * @param context The application context. Should not be null.
      * @param isReadyToPayIntent The IsReaddyToPay intent created by {@link
      *         WebPaymentIntentHelper#createIsReadyToPayIntent}. Should not be null.
@@ -60,6 +60,14 @@ public class IsReadyToPayServiceHelper
         mContext = context;
         mResultHandler = resultHandler;
         mHandler = new Handler();
+        mIsReadyToPayIntent = isReadyToPayIntent;
+    }
+
+    /**
+     * Query the IsReadyToPay service. The result would be returned in the resultHandler callback
+     * asynchronously. Note that resultHandler would be invoked only once.
+     */
+    public void query() {
         try {
             // This method returns "true if the system is in the process of bringing up a
             // service that your client has permission to bind to; false if the system couldn't
@@ -68,7 +76,7 @@ public class IsReadyToPayServiceHelper
             // the connection."
             // https://developer.android.com/reference/android/content/Context.html#bindService(android.content.Intent,%20android.content.ServiceConnection,%20int)
             mIsServiceBindingInitiated = mContext.bindService(
-                    isReadyToPayIntent, /*serviceConnection=*/this, Context.BIND_AUTO_CREATE);
+                    mIsReadyToPayIntent, /*serviceConnection=*/this, Context.BIND_AUTO_CREATE);
         } catch (SecurityException e) {
             // Intentionally blank, so mIsServiceBindingInitiated is false.
         }