Portals: Re-enable PortalBrowserTest.ActivatePortalInShell on Android.

This CL fixes the test flakyness and enables the test on Android.

Bug: 892004
Change-Id: Ibc08897c300ce9704cebf861249b8c7f719cf474
Reviewed-on: https://chromium-review.googlesource.com/c/1313735
Commit-Queue: Lucas Gadani <lfg@chromium.org>
Reviewed-by: AJITH KUMAR V <ajith.v@samsung.com>
Reviewed-by: Pedro Amaral <amaralp@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605012}

content/browser/android/selection/selection_popup_controller.cc

@@ -49,6 +49,15 @@ SelectionPopupController::SelectionPopupController(
   wcva->set_selection_popup_controller(this);
 }
 
+SelectionPopupController::~SelectionPopupController() {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = java_obj_.get(env);
+  if (!obj.is_null()) {
+    Java_SelectionPopupControllerImpl_nativeSelectionPopupControllerDestroyed(
+        env, obj);
+  }
+}
+
 ScopedJavaLocalRef<jobject> SelectionPopupController::GetContext() const {
   JNIEnv* env = AttachCurrentThread();
 

content/browser/android/selection/selection_popup_controller.h

@@ -54,7 +54,7 @@ class SelectionPopupController : public RenderWidgetHostConnector {
                                 const gfx::PointF& extent);
 
  private:
-  ~SelectionPopupController() override {}
+  ~SelectionPopupController() override;
   base::android::ScopedJavaLocalRef<jobject> GetContext() const;
   RenderWidgetHostViewAndroid* rwhva_ = nullptr;
 

content/browser/portal/portal_browsertest.cc

@@ -344,13 +344,7 @@ IN_PROC_BROWSER_TEST_F(PortalBrowserTest, MAYBE_ActivatePortal) {
 }
 
 // Tests that a portal can be activated in content_shell.
-// Disabled due to flakiness on Android.  See https://crbug.com/892669.
-#if defined(OS_ANDROID)
-#define MAYBE_ActivatePortalInShell DISABLED_ActivatePortalInShell
-#else
-#define MAYBE_ActivatePortalInShell ActivatePortalInShell
-#endif
-IN_PROC_BROWSER_TEST_F(PortalBrowserTest, MAYBE_ActivatePortalInShell) {
+IN_PROC_BROWSER_TEST_F(PortalBrowserTest, ActivatePortalInShell) {
   EXPECT_TRUE(NavigateToURL(
       shell(), embedded_test_server()->GetURL("portal.test", "/title1.html")));
   WebContentsImpl* web_contents_impl =

content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java

@@ -1551,6 +1551,11 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
         return client == null ? null : client.getCustomTextClassifier();
     }
 
+    @CalledByNative
+    private void nativeSelectionPopupControllerDestroyed() {
+        mNativeSelectionPopupController = 0;
+    }
+
     private native long nativeInit(WebContents webContents);
     private native void nativeSetTextHandlesTemporarilyHidden(
             long nativeSelectionPopupController, boolean hidden);