Revert of 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 5825b0f6af63f57d6b2f27c15706a6495cf29ed5..0ff8620f23eac2142d42c096e514dbb7773ed602 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,6 +7,8 @@
 import android.app.Application;
 import android.content.Context;
 import android.net.Uri;
+import android.os.Bundle;
+import android.os.IBinder;
 import android.support.customtabs.ICustomTabsCallback;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -31,6 +33,17 @@
         mCustomTabsConnection.cleanupAll();
     }
 
+    private ICustomTabsCallback newDummyCallback() {
+        return new ICustomTabsCallback.Stub() {
+            @Override
+            public void onNavigationEvent(int navigationEvent, Bundle extras) {}
+            @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.
@@ -38,7 +51,7 @@
     @SmallTest
     public void testNewSession() {
         assertEquals(false, mCustomTabsConnection.newSession(null));
-        ICustomTabsCallback cb = CustomTabsTestUtils.newDummyCallback();
+        ICustomTabsCallback cb = newDummyCallback();
         assertEquals(true, mCustomTabsConnection.newSession(cb));
         assertEquals(false, mCustomTabsConnection.newSession(cb));
     }
@@ -61,7 +74,7 @@
             ICustomTabsCallback cb, String url, boolean shouldSucceed) {
         mCustomTabsConnection.warmup(0);
         if (cb == null) {
-            cb = CustomTabsTestUtils.newDummyCallback();
+            cb = newDummyCallback();
             mCustomTabsConnection.newSession(cb);
         }
         boolean succeeded = mCustomTabsConnection.mayLaunchUrl(cb, Uri.parse(url), null, null);
@@ -71,13 +84,12 @@
 
     /**
      * Tests that
-     * {@link CustomTabsConnection#mayLaunchUrl(
-     * ICustomTabsCallback, Uri, android.os.Bundle, java.util.List)}
+     * {@link CustomTabsConnection#mayLaunchUrl(long, String, Bundle, List<Bundle>)}
      * returns an error when called with an invalid session ID.
      */
     @SmallTest
     public void testNoMayLaunchUrlWithInvalidSessionId() {
-        assertWarmupAndMayLaunchUrl(CustomTabsTestUtils.newDummyCallback(), URL, false);
+        assertWarmupAndMayLaunchUrl(newDummyCallback(), URL, false);
     }
 
     /**