Revert "[TTS] reland mojo-ify ShowUnhandleTapUIIfNeeded."

This reverts commit ba4d1c4.

Reason for revert: Broke the N5 compile.

Original change's description:
> [TTS] reland mojo-ify ShowUnhandleTapUIIfNeeded.
> 
> Replaces the whole call chain for ShowUnhandledTapUIIfNeeded
> between Blink and Chrome/WebView with Mojo messaging.
> 
> Removes the Blink WebTappedInfo class in favor of a new UnhandledTapInfo
> that sends a Mojo construct of the same name to the Browser which
> has a service installed via a RenderHostFrame observer.
> 
> All functionality should remain unchanged.
> 
> NEW CODE:
> The CSTabHelper now creates an UnhandledTapWebContentsObserver that
> connects the Mojo service via UnhandledTapNotifierImpl.  That Impl
> calls back through Java to the CSTabHelper to the CSManager to notify
> that a Tap has occurred.  The CSTabHelper ignores these notifications
> when CS is disabled.
> 
> The mojo message is only sent to the browser if the tap is unhandled
> and the other required conditions are met.
> 
> UPDATED TESTS:
> Test notification is now done through mojo messaging, so we now only
> know if the tap was unhandled, not whether the page changed or other
> details about why the tap was unhandled.
> 
> Updated the test page by adding nodes that do not trigger, and removed
> the mousemove handler since it's unrelated to tap handling.
> 
> BUG=754862
> 
> TBR=dcheng@chromium, yfriedman@chromium.org, kinuko@chromium.org
> 
> Original CL:
> 
> Reviewed-on: https://chromium-review.googlesource.com/841544
> Reviewed-by: Yoichi Osato <yoichio@chromium.org>
> Reviewed-by: Theresa <twellington@chromium.org>
> Reviewed-by: Daniel Cheng <dcheng@chromium.org>
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
> Change-Id: I824837419cd4116b26b32170009e7a7c3308d109
> Reviewed-on: https://chromium-review.googlesource.com/952679
> Commit-Queue: Donn Denman <donnd@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#541569}

TBR=dcheng@chromium.org,kinuko@chromium.org,yfriedman@chromium.org,donnd@chromium.org,yoichio@chromium.org,twellington@chromium.org

Change-Id: I25de406ee1c18aa1468d23dcafc81d4930f5717f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 754862
Reviewed-on: https://chromium-review.googlesource.com/953369
Reviewed-by: Donn Denman <donnd@chromium.org>
Commit-Queue: Donn Denman <donnd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541586}

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

@@ -1292,6 +1292,13 @@ public void onSelectionEvent(int eventType, float posXPix, float posYPix) {
             }
         }
 
+        @Override
+        public void showUnhandledTapUIIfNeeded(final int x, final int y) {
+            if (!isOverlayVideoMode()) {
+                mSelectionController.handleShowUnhandledTapUIIfNeeded(x, y);
+            }
+        }
+
         @Override
         public void selectWordAroundCaretAck(boolean didSelect, int startAdjust, int endAdjust) {
             if (mSelectWordAroundCaretCounter > 0) mSelectWordAroundCaretCounter--;
@@ -1320,13 +1327,6 @@ public boolean requestSelectionPopupUpdates(boolean shouldSuggest) {
         public void cancelAllRequests() {}
     }
 
-    /** Shows the Unhandled Tap UI.  Called by {@link ContextualSearchTabHelper}. */
-    void onShowUnhandledTapUIIfNeeded(int x, int y) {
-        if (!isOverlayVideoMode()) {
-            mSelectionController.handleShowUnhandledTapUIIfNeeded(x, y);
-        }
-    }
-
     /**
      * @return Whether the display is in a full-screen video overlay mode.
      */

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java

@@ -30,9 +30,6 @@ public class ContextualSearchTabHelper
     /** The Tab that this helper tracks. */
     private final Tab mTab;
 
-    // Device scale factor.
-    private final float mPxToDp;
-
     /** Notification handler for Contextual Search events. */
     private TemplateUrlServiceObserver mTemplateUrlObserver;
 
@@ -76,11 +73,6 @@ private ContextualSearchTabHelper(Tab tab) {
         if (NetworkChangeNotifier.isInitialized()) {
             NetworkChangeNotifier.addConnectionTypeObserver(this);
         }
-        float scaleFactor = 1.f;
-        if (tab != null && tab.getActivity() != null && tab.getActivity().getResources() != null) {
-            scaleFactor /= tab.getActivity().getResources().getDisplayMetrics().density;
-        }
-        mPxToDp = scaleFactor;
     }
 
     // ============================================================================================
@@ -227,7 +219,6 @@ private void addContextualSearchHooks(WebContents webContents) {
                             contextualSearchManager.getContextualSearchSelectionClient()));
             contextualSearchManager.suppressContextualSearchForSmartSelection(
                     mSelectionClientManager.isSmartSelectionEnabledInChrome());
-            nativeInstallUnhandledTapNotifierIfNeeded(mNativeHelper, webContents, mPxToDp);
         }
     }
 
@@ -312,20 +303,6 @@ void onContextualSearchPrefChanged() {
         }
     }
 
-    /**
-     * Notifies this helper to show the Unhandled Tap UI due to a tap at the given pixel
-     * coordinates.
-     */
-    @CalledByNative
-    void onShowUnhandledTapUIIfNeeded(int x, int y) {
-        // Only notify the manager if we currently have a valid listener.
-        if (mGestureStateListener != null && getContextualSearchManager(mTab) != null) {
-            getContextualSearchManager(mTab).onShowUnhandledTapUIIfNeeded(x, y);
-        }
-    }
-
     private native long nativeInit(Profile profile);
-    private native void nativeInstallUnhandledTapNotifierIfNeeded(
-            long nativeContextualSearchTabHelper, WebContents webContents, float pxToDpScaleFactor);
     private native void nativeDestroy(long nativeContextualSearchTabHelper);
 }

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java

@@ -161,6 +161,12 @@ public void onSelectionEvent(int eventType, float posXPix, float posYPix) {
             mContextualSearchSelectionClient.onSelectionEvent(eventType, posXPix, posYPix);
         }
 
+        @Override
+        public void showUnhandledTapUIIfNeeded(int x, int y) {
+            mSmartSelectionClient.showUnhandledTapUIIfNeeded(x, y);
+            mContextualSearchSelectionClient.showUnhandledTapUIIfNeeded(x, y);
+        }
+
         @Override
         public void selectWordAroundCaretAck(boolean didSelect, int startAdjust, int endAdjust) {
             mSmartSelectionClient.selectWordAroundCaretAck(didSelect, startAdjust, endAdjust);

chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java

@@ -200,7 +200,7 @@ private void mockTapText(String text) {
             @Override
             public void run() {
                 mContextualSearchManager.getGestureStateListener().onTouchDown();
-                mContextualSearchManager.onShowUnhandledTapUIIfNeeded(0, 0);
+                mContextualSearchClient.showUnhandledTapUIIfNeeded(0, 0);
             }
         });
     }
@@ -212,7 +212,7 @@ private void mockTapEmptySpace() {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mContextualSearchManager.onShowUnhandledTapUIIfNeeded(0, 0);
+                mContextualSearchClient.showUnhandledTapUIIfNeeded(0, 0);
                 mContextualSearchClient.onSelectionEvent(
                         SelectionEventType.SELECTION_HANDLES_CLEARED, 0, 0);
             }

chrome/android/junit/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManagerTest.java

@@ -49,6 +49,9 @@ public boolean requestSelectionPopupUpdates(boolean shouldSuggest) {
         @Override
         public void onSelectionEvent(int eventType, float posXPix, float posYPix) {}
 
+        @Override
+        public void showUnhandledTapUIIfNeeded(int x, int y) {}
+
         @Override
         public void selectWordAroundCaretAck(boolean didSelect, int startAdjust, int endAdjust) {}
 

chrome/browser/BUILD.gn

@@ -1931,10 +1931,6 @@ jumbo_split_static_library("browser") {
       "android/contextualsearch/ctr_suppression.h",
       "android/contextualsearch/resolved_search_term.cc",
       "android/contextualsearch/resolved_search_term.h",
-      "android/contextualsearch/unhandled_tap_notifier_impl.cc",
-      "android/contextualsearch/unhandled_tap_notifier_impl.h",
-      "android/contextualsearch/unhandled_tap_web_contents_observer.cc",
-      "android/contextualsearch/unhandled_tap_web_contents_observer.h",
       "android/cookies/cookies_fetcher_util.cc",
       "android/crash/pure_java_exception_handler.cc",
       "android/crash/pure_java_exception_handler.h",

chrome/browser/android/DEPS

@@ -15,7 +15,6 @@ include_rules = [
   "+sandbox/sandbox_features.h",
   "+third_party/gvr-android-sdk",
   "+third_party/WebKit/public/platform/media_download_in_product_help.mojom.h",
-  "+third_party/WebKit/public/platform/unhandled_tap_notifier.mojom.h",
 ]
 
 specific_include_rules = {

chrome/browser/android/contextualsearch/contextual_search_manager.cc

@@ -14,6 +14,7 @@
 #include "base/time/time.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_delegate.h"
 #include "chrome/browser/android/contextualsearch/resolved_search_term.h"
+#include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "components/contextual_search/browser/contextual_search_js_api_service_impl.h"

chrome/browser/android/contextualsearch/contextual_search_tab_helper.cc

@@ -6,13 +6,10 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "build/build_config.h"
-#include "chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_change_registrar.h"
-#include "content/public/browser/web_contents.h"
 #include "jni/ContextualSearchTabHelper_jni.h"
 
 using base::android::JavaParamRef;
@@ -27,9 +24,8 @@ ContextualSearchTabHelper::ContextualSearchTabHelper(JNIEnv* env,
   pref_change_registrar_->Init(profile->GetPrefs());
   pref_change_registrar_->Add(
       prefs::kContextualSearchEnabled,
-      base::BindRepeating(
-          &ContextualSearchTabHelper::OnContextualSearchPrefChanged,
-          weak_factory_.GetWeakPtr()));
+      base::Bind(&ContextualSearchTabHelper::OnContextualSearchPrefChanged,
+                 weak_factory_.GetWeakPtr()));
 }
 
 ContextualSearchTabHelper::~ContextualSearchTabHelper() {
@@ -42,33 +38,6 @@ void ContextualSearchTabHelper::OnContextualSearchPrefChanged() {
   Java_ContextualSearchTabHelper_onContextualSearchPrefChanged(env, jobj);
 }
 
-void ContextualSearchTabHelper::OnShowUnhandledTapUIIfNeeded(int x_px,
-                                                             int y_px) {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> jobj = weak_java_ref_.get(env);
-  Java_ContextualSearchTabHelper_onShowUnhandledTapUIIfNeeded(env, jobj, x_px,
-                                                              y_px);
-}
-
-void ContextualSearchTabHelper::InstallUnhandledTapNotifierIfNeeded(
-    JNIEnv* env,
-    jobject obj,
-    const JavaParamRef<jobject>& j_base_web_contents,
-    jfloat device_scale_factor) {
-  DCHECK(j_base_web_contents);
-  content::WebContents* base_web_contents =
-      content::WebContents::FromJavaWebContents(j_base_web_contents);
-  DCHECK(base_web_contents);
-  if (!unhandled_tap_web_contents_observer_) {
-    unhandled_tap_web_contents_observer_.reset(
-        new contextual_search::UnhandledTapWebContentsObserver(
-            base_web_contents, device_scale_factor,
-            base::BindRepeating(
-                &ContextualSearchTabHelper::OnShowUnhandledTapUIIfNeeded,
-                weak_factory_.GetWeakPtr())));
-  }
-}
-
 void ContextualSearchTabHelper::Destroy(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj) {
   delete this;

chrome/browser/android/contextualsearch/contextual_search_tab_helper.h

@@ -15,42 +15,17 @@
 
 class Profile;
 
-namespace contextual_search {
-class UnhandledTapWebContentsObserver;
-}
-
 class ContextualSearchTabHelper {
  public:
   ContextualSearchTabHelper(JNIEnv* env, jobject obj, Profile* profile);
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
 
-  // Installs the UnhandledTapNotifier Mojo handler if needed.
-  // The |j_base_web_contents| is a java WebContents of the base page tab.
-  // The |device_scale_factor| is the ratio of pixels to dips.
-  void InstallUnhandledTapNotifierIfNeeded(
-      JNIEnv* env,
-      jobject obj,
-      const base::android::JavaParamRef<jobject>& j_base_web_contents,
-      jfloat device_scale_factor);
-
  private:
   ~ContextualSearchTabHelper();
-
-  // Methods that call back to Java.
-  // Call when the preferences change.
   void OnContextualSearchPrefChanged();
-  // Call when an unhandled tap needs to show the UI for a tap at the given
-  // position.
-  void OnShowUnhandledTapUIIfNeeded(int x_px, int y_px);
 
   JavaObjectWeakGlobalRef weak_java_ref_;
   std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
-
-  // The unhandled tap WebContentsObserver for the current tab.
-  // Installs a mojo handler for ShowUnhandledTapUIIfNeeded.
-  std::unique_ptr<contextual_search::UnhandledTapWebContentsObserver>
-      unhandled_tap_web_contents_observer_;
-
   base::WeakPtrFactory<ContextualSearchTabHelper> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(ContextualSearchTabHelper);
 };