Start using the third_party/custom_tabs_client as support lib source

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/ClientManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/ClientManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/ClientManagerTest.java
index daed8588176f712d097dd4ef5ad2f899e78ab6c5..93c11ff38f41f167e97e203fd1f3d0cf0081b1ce 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/ClientManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/ClientManagerTest.java
@@ -5,9 +5,8 @@
 package org.chromium.chrome.browser.customtabs;
 
 import android.content.Context;
-import android.os.IBinder;
 import android.os.Process;
-import android.support.customtabs.ICustomTabsCallback;
+import android.support.customtabs.CustomTabsSessionToken;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.content.browser.test.NativeLibraryTestBase;
@@ -16,8 +15,8 @@ import org.chromium.content.browser.test.NativeLibraryTestBase;
 public class ClientManagerTest extends NativeLibraryTestBase {
     private static final String URL = "https://www.android.com";
     private ClientManager mClientManager;
-    private ICustomTabsCallback mCallback = new CustomTabsTestUtils.DummyCallback();
-    private IBinder mSession = mCallback.asBinder();
+    private CustomTabsSessionToken mSession =
+            CustomTabsSessionToken.createDummySessionTokenForTesting();
     private int mUid = Process.myUid();
 
     @Override
@@ -53,7 +52,7 @@ public class ClientManagerTest extends NativeLibraryTestBase {
 
     @SmallTest
     public void testValidSessionNoWarmup() {
-        mClientManager.newSession(mCallback, mUid, null);
+        mClientManager.newSession(mSession, mUid, null);
         assertEquals(ClientManager.SESSION_NO_WARMUP_NOT_CALLED,
                 mClientManager.getWarmupState(mSession));
     }
@@ -61,7 +60,7 @@ public class ClientManagerTest extends NativeLibraryTestBase {
     @SmallTest
     public void testValidSessionOtherWarmup() {
         mClientManager.recordUidHasCalledWarmup(mUid + 1);
-        mClientManager.newSession(mCallback, mUid, null);
+        mClientManager.newSession(mSession, mUid, null);
         assertEquals(ClientManager.SESSION_NO_WARMUP_ALREADY_CALLED,
                 mClientManager.getWarmupState(mSession));
     }
@@ -69,25 +68,24 @@ public class ClientManagerTest extends NativeLibraryTestBase {
     @SmallTest
     public void testValidSessionWarmup() {
         mClientManager.recordUidHasCalledWarmup(mUid);
-        mClientManager.newSession(mCallback, mUid, null);
+        mClientManager.newSession(mSession, mUid, null);
         assertEquals(ClientManager.SESSION_WARMUP, mClientManager.getWarmupState(mSession));
     }
 
     @SmallTest
     public void testValidSessionWarmupSeveralCalls() {
         mClientManager.recordUidHasCalledWarmup(mUid);
-        mClientManager.newSession(mCallback, mUid, null);
+        mClientManager.newSession(mSession, mUid, null);
         assertEquals(ClientManager.SESSION_WARMUP, mClientManager.getWarmupState(mSession));
 
-        ICustomTabsCallback callback = new CustomTabsTestUtils.DummyCallback();
-        IBinder session = callback.asBinder();
-        mClientManager.newSession(callback, mUid, null);
-        assertEquals(ClientManager.SESSION_WARMUP, mClientManager.getWarmupState(session));
+        CustomTabsSessionToken token = CustomTabsSessionToken.createDummySessionTokenForTesting();
+        mClientManager.newSession(token, mUid, null);
+        assertEquals(ClientManager.SESSION_WARMUP, mClientManager.getWarmupState(token));
     }
 
     @SmallTest
     public void testPredictionOutcomeSuccess() {
-        assertTrue(mClientManager.newSession(mCallback, mUid, null));
+        assertTrue(mClientManager.newSession(mSession, mUid, null));
         assertTrue(mClientManager.updateStatsAndReturnWhetherAllowed(mSession, mUid, URL));
         assertEquals(
                 ClientManager.GOOD_PREDICTION, mClientManager.getPredictionOutcome(mSession, URL));
@@ -95,7 +93,7 @@ public class ClientManagerTest extends NativeLibraryTestBase {
 
     @SmallTest
     public void testPredictionOutcomeNoPrediction() {
-        assertTrue(mClientManager.newSession(mCallback, mUid, null));
+        assertTrue(mClientManager.newSession(mSession, mUid, null));
         mClientManager.recordUidHasCalledWarmup(mUid);
         assertEquals(
                 ClientManager.NO_PREDICTION, mClientManager.getPredictionOutcome(mSession, URL));
@@ -103,7 +101,7 @@ public class ClientManagerTest extends NativeLibraryTestBase {
 
     @SmallTest
     public void testPredictionOutcomeBadPrediction() {
-        assertTrue(mClientManager.newSession(mCallback, mUid, null));
+        assertTrue(mClientManager.newSession(mSession, mUid, null));
         assertTrue(mClientManager.updateStatsAndReturnWhetherAllowed(mSession, mUid, URL));
         assertEquals(
                 ClientManager.BAD_PREDICTION,
@@ -112,7 +110,7 @@ public class ClientManagerTest extends NativeLibraryTestBase {
 
     @SmallTest
     public void testPredictionOutcomeIgnoreFragment() {
-        assertTrue(mClientManager.newSession(mCallback, mUid, null));
+        assertTrue(mClientManager.newSession(mSession, mUid, null));
         assertTrue(mClientManager.updateStatsAndReturnWhetherAllowed(mSession, mUid, URL));
         mClientManager.setIgnoreFragmentsForSession(mSession, true);
         assertEquals(