Revert of Add custom tabs tests using intents with non-null sessions

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java
index 41f9a6c718a80beb8449d9e4fe14f493df500c72..8744564e206908f7f221688f85e8f5180ee18464 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java
@@ -6,10 +6,15 @@
 
 import android.app.Activity;
 import android.app.Instrumentation;
+import android.content.ComponentName;
 import android.content.Intent;
+import android.net.Uri;
+import android.support.customtabs.CustomTabsIntent;
 
 import org.chromium.chrome.browser.DeferredStartupHandler;
+import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
@@ -62,9 +67,22 @@
                     public boolean isSatisfied() {
                         return DeferredStartupHandler.getInstance().isDeferredStartupComplete();
                     }
-                }, 5000, 200));
+                }));
 
         assertNotNull(tab);
         assertNotNull(tab.getView());
     }
+
+    /**
+     * Creates the simplest intent that is sufficient to let {@link ChromeLauncherActivity} launch
+     * the {@link CustomTabActivity}.
+     */
+    protected Intent createMinimalCustomTabIntent(String url) {
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setComponent(new ComponentName(getInstrumentation().getTargetContext(),
+                ChromeLauncherActivity.class));
+        IntentUtils.safePutBinderExtra(intent, CustomTabsIntent.EXTRA_SESSION, null);
+        return intent;
+    }
 }