Revert of Android: Switch to thread pool executor

chrome/android/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java
index 2b1f41f6a3ef6647a350d36d346f74d2544e4e6f..f26d62d3c819f5fc37b987a914be77e7748e3917 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java
@@ -13,7 +13,6 @@
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Semaphore;
 
 /**
@@ -52,7 +51,7 @@
                     }
                 };
 
-        BackgroundSyncLauncher.shouldLaunchBrowserIfStopped(callback);
+        BackgroundSyncLauncher.shouldLaunchBrowserIfStopped(mContext, callback);
         try {
             // Wait on the callback to be called.
             semaphore.acquire();
@@ -60,16 +59,6 @@
             fail("Failed to acquire semaphore");
         }
         return mShouldLaunchResult;
-    }
-
-    private void waitForLaunchBrowserTask() {
-        try {
-            mLauncher.mLaunchBrowserIfStoppedTask.get();
-        } catch (InterruptedException e) {
-            fail("Launch task was interrupted");
-        } catch (ExecutionException e) {
-            fail("Launch task had execution exception");
-        }
     }
 
     @SmallTest
@@ -92,11 +81,9 @@
     @RetryOnFailure
     public void testSetLaunchWhenNextOnline() {
         assertFalse(shouldLaunchBrowserIfStoppedSync());
-        mLauncher.launchBrowserIfStopped(true, 0);
-        waitForLaunchBrowserTask();
+        mLauncher.launchBrowserIfStopped(mContext, true, 0);
         assertTrue(shouldLaunchBrowserIfStoppedSync());
-        mLauncher.launchBrowserIfStopped(false, 0);
-        waitForLaunchBrowserTask();
+        mLauncher.launchBrowserIfStopped(mContext, false, 0);
         assertFalse(shouldLaunchBrowserIfStoppedSync());
     }
 
@@ -104,8 +91,7 @@
     @Feature({"BackgroundSync"})
     @RetryOnFailure
     public void testNewLauncherDisablesNextOnline() {
-        mLauncher.launchBrowserIfStopped(true, 0);
-        waitForLaunchBrowserTask();
+        mLauncher.launchBrowserIfStopped(mContext, true, 0);
         assertTrue(shouldLaunchBrowserIfStoppedSync());
 
         // Simulate restarting the browser by deleting the launcher and creating a new one.