Merge java_staging/src into java/src.

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

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchObserver.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchObserver.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchObserver.java
deleted file mode 100644
index ea04689217a543cfdbec9383ec5b46d03cfac326..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchObserver.java
+++ /dev/null
@@ -1,31 +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.gsa.GSAContextDisplaySelection;
-
-import javax.annotation.Nullable;
-
-/**
- * An interface to be notified when contextual searches are performed or no longer active.
- */
-public interface ContextualSearchObserver {
-    /**
-     * Notifies that a contextual search was performed, and provides the selection context if
-     * the feature is fully enabled (and {@code null} otherwise).
-     * NOTE: this context data can be quite privacy-sensitive because it contains text from the
-     * page being viewed by the user, which may include sensitive or personal information.
-     * Clients must follow standard privacy policy before logging or transmitting this information.
-     * @param selectionContext The selection and context used for the Contextual Search, or
-     *        {@code null} if the feature has not yet been fully enabled.
-     */
-    void onShowContextualSearch(@Nullable GSAContextDisplaySelection selectionContext);
-
-    /**
-     * Notifies that a contextual search is no longer in effect, and the results are no longer
-     * available in the UX.
-     */
-    void onHideContextualSearch();
-}