Reland : Add custom tabs tests using intents with non-null sessions

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
index 27c67a62faba291a027183d6042a133341023f4c..c52d362760c6f26841af47d2c3d13c8a77762b07 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
@@ -7,8 +7,6 @@ package org.chromium.chrome.browser.customtabs;
 import android.app.Application;
 import android.content.Context;
 import android.net.Uri;
-import android.os.Bundle;
-import android.os.IBinder;
 import android.os.Process;
 import android.support.customtabs.ICustomTabsCallback;
 import android.test.InstrumentationTestCase;
@@ -35,19 +33,6 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
         mCustomTabsConnection.cleanupAll();
     }
 
-    private ICustomTabsCallback newDummyCallback() {
-        return new ICustomTabsCallback.Stub() {
-            @Override
-            public void onNavigationEvent(int navigationEvent, Bundle extras) {}
-            @Override
-            public void extraCallback(String callbackName, Bundle args) {}
-            @Override
-            public IBinder asBinder() {
-                return this;
-            }
-        };
-    }
-
     /**
      * Tests that we can create a new session. Registering with a null callback
      * fails, as well as multiple sessions with the same callback.
@@ -55,7 +40,7 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
     @SmallTest
     public void testNewSession() {
         assertEquals(false, mCustomTabsConnection.newSession(null));
-        ICustomTabsCallback cb = newDummyCallback();
+        ICustomTabsCallback cb = CustomTabsTestUtils.newDummyCallback();
         assertEquals(true, mCustomTabsConnection.newSession(cb));
         assertEquals(false, mCustomTabsConnection.newSession(cb));
     }
@@ -78,7 +63,7 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
             ICustomTabsCallback cb, String url, boolean shouldSucceed) {
         mCustomTabsConnection.warmup(0);
         if (cb == null) {
-            cb = newDummyCallback();
+            cb = CustomTabsTestUtils.newDummyCallback();
             mCustomTabsConnection.newSession(cb);
         }
         boolean succeeded = mCustomTabsConnection.mayLaunchUrl(cb, Uri.parse(url), null, null);
@@ -88,12 +73,13 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
 
     /**
      * Tests that
-     * {@link CustomTabsConnection#mayLaunchUrl(long, String, Bundle, List<Bundle>)}
+     * {@link CustomTabsConnection#mayLaunchUrl(
+     * ICustomTabsCallback, Uri, android.os.Bundle, java.util.List)}
      * returns an error when called with an invalid session ID.
      */
     @SmallTest
     public void testNoMayLaunchUrlWithInvalidSessionId() {
-        assertWarmupAndMayLaunchUrl(newDummyCallback(), URL, false);
+        assertWarmupAndMayLaunchUrl(CustomTabsTestUtils.newDummyCallback(), URL, false);
     }
 
     /**