Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabContentHandler.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabContentHandler.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabContentHandler.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabContentHandler.java
deleted file mode 100644
index 3ea598eba78ab1196f2473da3a2f30a1caed367f..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabContentHandler.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// 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 org.chromium.content_public.browser.LoadUrlParams;
-
-/**
- * Interface to handle custom tab calls whenever the session id matched.
- * TODO(yusufo): Add a way to handle mayLaunchUrl as well.
- */
-public interface CustomTabContentHandler {
-    /**
-     * Loads a new url inside the {@link CustomTabContentHandler}, and tracks
-     * its load time.
-     *
-     * @param params The params to use while loading the url.
-     * @param timestamp The intent arrival timestamp, as returned by
-     *                  {@link SystemClock#elapsedRealtime()}.
-     */
-    void loadUrlAndTrackFromTimestamp(LoadUrlParams params, long timestamp);
-
-    /**
-     * @return The session id this {@link CustomTabContentHandler} is associated with.
-     */
-    long getSessionId();
-}