Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl b/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl
deleted file mode 100644
index 7254281812124317fedfb2fe182b907dd8da525f..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl
+++ /dev/null
@@ -1,60 +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 android.os.Bundle;
-
-/**
- * Interface for communicating between a browser background service and another application.
- */
-interface ICustomTabsConnectionService {
-    /**
-     * Sets the callback triggered on an external navigation.
-     *
-     * Must be called right after the service connection, and must be called
-     * again if the service gets disconnected. Only one call to this method is
-     * allowed, following ones will return an error.
-     * Must be called before the VIEW intent is sent to the browser.
-     *
-     * @param callback Callback to be called, null if no callback is wanted.
-     * @return 0 for success.
-     */
-    long finishSetup(ICustomTabsConnectionCallback callback);
-
-    /**
-     * Warms up the browser process.
-     *
-     * Warmup is asynchronous, the return value indicates that the request has been accepted.
-     *
-     * @param flags Reserved for future use.
-     * @return 0 for success.
-     */
-    long warmup(long flags);
-
-    /**
-     * @return A negative number to signal an error, or a positive new session ID.
-     */
-    long newSession();
-
-    /**
-     * Tells the browser of a likely future navigation to a URL.
-     *
-     * The method {@link warmup} has to be called first.
-     * The most likely URL has to be specified first. Optionally, a list of
-     * other likely URLs can be provided. They are treated as less likely than
-     * the first one, and have to be sorted in decreasing priority order. These
-     * additional URLs may be ignored.
-     * All previous calls to this method will be deprioritized.
-     *
-     * @param sessionId As returned by {@link newSession}.
-     * @param url Most likely URL.
-     * @param extras Reserved for future use.
-     * @param otherLikelyBundles Other likely destinations, sorted in decreasing
-     *     likelihood order. Each Bundle has to provide a "url" String value.
-     * @return sessionId if it is known by the service, a number <0 to signal an error.
-     */
-    long mayLaunchUrl(
-            long sessionId, String url, in Bundle extras, in List<Bundle> otherLikelyBundles);
-}