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

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.customtabs;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ skipping 40 matching lines @@
         }
     }
 
     private static final String TEST_URL = "about:blank";
     private ExternalNavigationHandler mUrlHandler;
     private CustomTabNavigationDelegate mNavigationDelegate;
 
     @Override
     public void startMainActivity() throws InterruptedException {
         super.startMainActivity();
-        startCustomTabActivityWithIntent(createMinimalCustomTabIntent(TEST_URL));
+        startCustomTabActivityWithIntent(CustomTabsTestUtils.createMinimalCustomTabIntent(
+                getInstrumentation().getTargetContext(), TEST_URL, null));
         Tab tab = getActivity().getActivityTab();
         assertTrue("A custom tab is not present in the activity.", tab instanceof CustomTab);
         CustomTab customTab = (CustomTab) tab;
         mUrlHandler = customTab.getExternalNavigationHandler();
         mNavigationDelegate = customTab.getExternalNavigationDelegate();
     }
 
     /**
      * For urls with special schemes and hosts, and there is exactly one activity having a matching
      * intent filter, the framework will make that activity the default handler of the special url.
@@ skipping 47 matching lines @@
                         false);
             }
         });
 
         loadUrlHelper.waitForCallback(0, 1);
         assertTrue("A new tab should not have been created.",
                 ApplicationStatus.getLastTrackedFocusedActivity() == getActivity());
         assertEquals(testUrl, getActivity().getActivityTab().getUrl());
     }
 }