Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionHandler.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionHandler.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionHandler.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionHandler.java
deleted file mode 100644
index af1023ece004ea0030445012c268ba36a16b97ee..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionHandler.java
+++ /dev/null
@@ -1,46 +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.contextualsearch;
-
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchSelectionController.SelectionType;
-
-/**
- * Defines the interface between a {@link ContextualSearchSelectionController} and the code that
- * handles callbacks.
- */
-interface ContextualSearchSelectionHandler {
-    /**
-     * Handle a scroll event on the base page.
-     */
-    public void handleScroll();
-
-    /**
-     * Handle a valid tap gesture on the base page.
-     */
-    public void handleValidTap();
-
-    /**
-     * Handle an invalid tap gesture on the base page.
-     */
-    public void handleInvalidTap();
-
-    /**
-     * Handle a new selection of the given type, created at the given x,y position.
-     */
-    public void handleSelection(String selection, SelectionType type, float x, float y);
-
-    /**
-     * Handle a modification to the selection, done at the given x,y position.
-     * @param selection The new selection.
-     * @param x The x position of the adjustment.
-     * @param y The y position of the adjustment.
-     */
-    public void handleSelectionModification(String selection, float x, float y);
-
-    /**
-     * Handle a dismissal of the selection on the base page.
-     */
-    public void handleSelectionDismissal();
-}