Use third_party/custom_tabs_client as the src for customtabs library

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.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.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
-import android.os.IBinder;
 import android.os.SystemClock;
 import android.os.TransactionTooLargeException;
 import android.support.customtabs.CustomTabsCallback;
+import android.support.customtabs.CustomTabsSessionToken;
 import android.text.TextUtils;
 import android.view.ContextMenu;
 import android.view.Menu;
 
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.UrlUtilities;
@@ skipping 15 matching lines @@
 import org.chromium.ui.base.WindowAndroid;
 
 import java.util.concurrent.TimeUnit;
 
 /**
  * A chrome tab that is only used as a custom tab.
  */
 public class CustomTab extends ChromeTab {
     private static class CustomTabObserver extends EmptyTabObserver {
         private CustomTabsConnection mCustomTabsConnection;
-        private IBinder mSession;
+        private CustomTabsSessionToken mSession;
         private long mIntentReceivedTimestamp;
         private long mPageLoadStartedTimestamp;
 
         private static final int STATE_RESET = 0;
         private static final int STATE_WAITING_LOAD_START = 1;
         private static final int STATE_WAITING_LOAD_FINISH = 2;
         private int mCurrentState;
 
-        public CustomTabObserver(CustomTabsConnection customTabsConnection, IBinder session) {
+        public CustomTabObserver(
+                CustomTabsConnection customTabsConnection, CustomTabsSessionToken session) {
             mCustomTabsConnection = customTabsConnection;
             mSession = session;
             resetPageLoadTracking();
         }
 
         /**
          * Tracks the next page load, with timestamp as the origin of time.
          */
         public void trackNextPageLoadFromTimestamp(long timestamp) {
             mIntentReceivedTimestamp = timestamp;
@@ skipping 82 matching lines @@
             };
 
     private CustomTabObserver mTabObserver;
     private final boolean mEnableUrlBarHiding;
 
     /**
      * Construct an CustomTab. Note that url and referrer given here is only used to retrieve a
      * prerendered web contents if it exists. It might load a prerendered {@link WebContents} for
      * the URL, if {@link CustomTabsConnectionService} has successfully warmed up for the url.
      */
-    public CustomTab(ChromeActivity activity, WindowAndroid windowAndroid, IBinder session,
-            String url, String referrer, int parentTabId, boolean enableUrlBarHiding) {
+    public CustomTab(ChromeActivity activity, WindowAndroid windowAndroid,
+            CustomTabsSessionToken session, String url, String referrer,
+            int parentTabId, boolean enableUrlBarHiding) {
         super(TabIdManager.getInstance().generateValidId(Tab.INVALID_TAB_ID), activity, false,
                 windowAndroid, TabLaunchType.FROM_EXTERNAL_APP, parentTabId, null, null);
         mEnableUrlBarHiding = enableUrlBarHiding;
         CustomTabsConnection customTabsConnection =
                 CustomTabsConnection.getInstance(activity.getApplication());
         WebContents webContents = customTabsConnection.takePrerenderedUrl(session, url, referrer);
         if (webContents == null) {
             webContents = WebContentsFactory.createWebContents(isIncognito(), false);
         }
         initialize(webContents, activity.getTabContentManager(), false);
@@ skipping 155 matching lines @@
             // See http://crbug.com/369574.
             if (e.getCause() instanceof TransactionTooLargeException) {
                 Log.e(TAG, "Could not resolve Activity for intent " + intent.toString(), e);
             } else {
                 throw e;
             }
         }
     }
 
 }