Revert "Android: Move more methods to test-only targets"

This reverts commit 5b0f3e82.

Reason for revert: Causing VR browser test failures https://bugs.chromium.org/p/chromium/issues/detail?id=876375

Original change's description:
> Android: Move more methods to test-only targets
> 
> Moved new test-only methods added to WebContents/RenderFrameHost
> in https://crrev.com/c/1163831 to targets content*test_support.
> 
> Bug: 862153, 875742
> Change-Id: Id9be5f53b45e2b28861a35401bba71020cf5fc0f
> Reviewed-on: https://chromium-review.googlesource.com/1180824
> Reviewed-by: Bo <boliu@chromium.org>
> Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
> Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#584660}

TBR=mthiesse@chromium.org,boliu@chromium.org,jinsukkim@chromium.org

Change-Id: I6bb9126e3870e9381432f828e6e698bdd5b0aec9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 862153, 875742
Reviewed-on: https://chromium-review.googlesource.com/1183825Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584820}

chrome/android/javatests/src/org/chromium/chrome/browser/vr/XrTestFramework.java

@@ -15,10 +15,9 @@ import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestRule;
-import org.chromium.content.browser.test.RenderFrameHostTestExt;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
-import org.chromium.content.browser.test.util.WebContentsUtils;
+import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.WebContents;
 
 import java.lang.annotation.Retention;
@@ -346,12 +345,12 @@ public abstract class XrTestFramework {
 
     private static String runJavaScriptInFrameInternal(
             String js, int timeout, final WebContents webContents, boolean failOnTimeout) {
-        RenderFrameHostTestExt rfh = ThreadUtils.runOnUiThreadBlockingNoException(
-                () -> new RenderFrameHostTestExt(WebContentsUtils.getFocusedFrame(webContents)));
-        Assert.assertTrue("Did not get a focused frame", rfh != null);
+        final AtomicReference<RenderFrameHost> rfh = new AtomicReference<RenderFrameHost>();
+        ThreadUtils.runOnUiThreadBlocking(() -> { rfh.set(webContents.getFocusedFrame()); });
+        Assert.assertTrue("Did not get a focused frame", rfh.get() != null);
         final CountDownLatch latch = new CountDownLatch(1);
         final AtomicReference<String> result = new AtomicReference<String>();
-        rfh.executeJavaScriptForTests(js, (String r) -> {
+        rfh.get().executeJavaScriptForTests(js, (String r) -> {
             result.set(r);
             latch.countDown();
         });

content/public/android/java/src/org/chromium/content/browser/framehost/RenderFrameHostImpl.java

@@ -60,10 +60,6 @@ public class RenderFrameHostImpl implements RenderFrameHost {
         return mDelegate;
     }
 
-    public long getNativePtr() {
-        return mNativeRenderFrameHostAndroid;
-    }
-
     @Override
     public String getLastCommittedURL() {
         if (mNativeRenderFrameHostAndroid == 0) return null;
@@ -99,6 +95,11 @@ public class RenderFrameHostImpl implements RenderFrameHost {
         nativeNotifyUserActivation(mNativeRenderFrameHostAndroid);
     }
 
+    @Override
+    public void executeJavaScriptForTests(String script, Callback<String> callback) {
+        nativeExecuteJavaScriptForTests(mNativeRenderFrameHostAndroid, script, callback);
+    }
+
     /**
      * Return the AndroidOverlay routing token for this RenderFrameHostImpl.
      */
@@ -113,4 +114,6 @@ public class RenderFrameHostImpl implements RenderFrameHost {
     private native UnguessableToken nativeGetAndroidOverlayRoutingToken(
             long nativeRenderFrameHostAndroid);
     private native void nativeNotifyUserActivation(long nativeRenderFrameHostAndroid);
+    private native void nativeExecuteJavaScriptForTests(
+            long nativeRenderFrameHostAndroid, String script, Callback<String> callback);
 }

content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

@@ -341,6 +341,11 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
         return nativeGetMainFrame(mNativeWebContentsAndroid);
     }
 
+    @Override
+    public RenderFrameHost getFocusedFrame() {
+        return nativeGetFocusedFrame(mNativeWebContentsAndroid);
+    }
+
     @Override
     public String getTitle() {
         return nativeGetTitle(mNativeWebContentsAndroid);
@@ -895,6 +900,7 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
     private native void nativeSetTopLevelNativeWindow(
             long nativeWebContentsAndroid, WindowAndroid windowAndroid);
     private native RenderFrameHost nativeGetMainFrame(long nativeWebContentsAndroid);
+    private native RenderFrameHost nativeGetFocusedFrame(long nativeWebContentsAndroid);
     private native String nativeGetTitle(long nativeWebContentsAndroid);
     private native String nativeGetVisibleURL(long nativeWebContentsAndroid);
     private native String nativeGetEncoding(long nativeWebContentsAndroid);

content/public/android/java/src/org/chromium/content_public/browser/RenderFrameHost.java

@@ -39,6 +39,15 @@ public interface RenderFrameHost {
      */
     void notifyUserActivation();
 
+    /**
+     * Runs the given JavaScript in the RenderFrameHost.
+     *
+     * @param script A String containing the JavaScript to run.
+     * @param callback The Callback that will be called with the result of the JavaScript execution
+     *        serialized to a String using JSONStringValueSerializer.
+     */
+    void executeJavaScriptForTests(String script, Callback<String> callback);
+
     /**
      * Returns whether we're in incognito mode.
      *

content/public/android/java/src/org/chromium/content_public/browser/WebContents.java

@@ -130,6 +130,11 @@ public interface WebContents extends Parcelable {
      */
     RenderFrameHost getMainFrame();
 
+    /**
+     * @return The focused frame in this WebContents.
+     */
+    RenderFrameHost getFocusedFrame();
+
     /**
      * @return The title for the current visible page.
      */

content/public/test/android/BUILD.gn

@@ -34,7 +34,6 @@ android_library("content_java_test_support") {
     "javatests/src/org/chromium/content/browser/test/ContentJUnit4ClassRunner.java",
     "javatests/src/org/chromium/content/browser/test/InterstitialPageDelegateAndroid.java",
     "javatests/src/org/chromium/content/browser/test/NativeLibraryTestRule.java",
-    "javatests/src/org/chromium/content/browser/test/RenderFrameHostTestExt.java",
     "javatests/src/org/chromium/content/browser/test/mock/MockRenderFrameHost.java",
     "javatests/src/org/chromium/content/browser/test/mock/MockWebContents.java",
     "javatests/src/org/chromium/content/browser/test/util/ClickUtils.java",
@@ -63,7 +62,6 @@ generate_jni("content_test_jni") {
   jni_package = "content/public/test"
   sources = [
     "javatests/src/org/chromium/content/browser/test/InterstitialPageDelegateAndroid.java",
-    "javatests/src/org/chromium/content/browser/test/RenderFrameHostTestExt.java",
     "javatests/src/org/chromium/content/browser/test/util/DOMUtils.java",
     "javatests/src/org/chromium/content/browser/test/util/WebContentsUtils.java",
   ]
@@ -82,7 +80,6 @@ static_library("content_native_test_support") {
     "dom_utils.cc",
     "interstitial_page_delegate_android.cc",
     "interstitial_page_delegate_android.h",
-    "render_frame_host_test_ext.cc",
     "web_contents_utils.cc",
   ]
   deps = [

content/public/test/android/javatests/src/org/chromium/content/browser/test/RenderFrameHostTestExt.java

-// Copyright 2017 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.content.browser.test;
-
-import org.chromium.base.Callback;
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.content.browser.framehost.RenderFrameHostImpl;
-import org.chromium.content_public.browser.RenderFrameHost;
-
-/**
- * The Java wrapper around RenderFrameHost to allow executing javascript for tests.
- */
-@JNINamespace("content")
-public class RenderFrameHostTestExt {
-    private final long mNativeRenderFrameHost;
-
-    public RenderFrameHostTestExt(RenderFrameHost host) {
-        mNativeRenderFrameHost = ((RenderFrameHostImpl) host).getNativePtr();
-    }
-
-    /**
-     * Runs the given JavaScript in the RenderFrameHost.
-     *
-     * @param script A String containing the JavaScript to run.
-     * @param callback The Callback that will be called with the result of the JavaScript execution
-     *        serialized to a String using JSONStringValueSerializer.
-     */
-    public void executeJavaScriptForTests(String script, Callback<String> callback) {
-        nativeExecuteJavaScriptForTests(script, callback, mNativeRenderFrameHost);
-    }
-
-    private static native void nativeExecuteJavaScriptForTests(
-            String script, Callback<String> callback, long nativeRenderFrameHost);
-}

content/public/test/android/javatests/src/org/chromium/content/browser/test/mock/MockRenderFrameHost.java

@@ -28,6 +28,9 @@ public class MockRenderFrameHost implements RenderFrameHost {
     @Override
     public void notifyUserActivation() {}
 
+    @Override
+    public void executeJavaScriptForTests(String script, Callback<String> callback) {}
+
     @Override
     public boolean isIncognito() {
         return false;

content/public/test/android/javatests/src/org/chromium/content/browser/test/mock/MockWebContents.java

@@ -75,6 +75,11 @@ public class MockWebContents implements WebContents {
         return renderFrameHost;
     }
 
+    @Override
+    public RenderFrameHost getFocusedFrame() {
+        return renderFrameHost;
+    }
+
     @Override
     public String getTitle() {
         return null;

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/WebContentsUtils.java

@@ -5,12 +5,10 @@
 package org.chromium.content.browser.test.util;
 
 import org.chromium.base.annotations.JNINamespace;
-import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.WebContents;
 
 /**
  * Collection of test-only WebContents utilities.
- * TODO(jinsukkim): Move test utilities to content_public.
  */
 @JNINamespace("content")
 public class WebContentsUtils {
@@ -24,15 +22,6 @@ public class WebContentsUtils {
         nativeReportAllFrameSubmissions(webContents, enabled);
     }
 
-    /**
-     * Gets the currently focused {@link RenderFrameHost} instance for a given {@link WebContents}.
-     * @param webContents The WebContents in use.
-     */
-    public static RenderFrameHost getFocusedFrame(final WebContents webContents) {
-        return nativeGetFocusedFrame(webContents);
-    }
-
     private static native void nativeReportAllFrameSubmissions(
             WebContents webContents, boolean enabled);
-    private static native RenderFrameHost nativeGetFocusedFrame(WebContents webContents);
 }

content/public/test/android/render_frame_host_test_ext.cc

-// Copyright 2018 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.
-
-#include "base/android/callback_android.h"
-#include "base/android/jni_string.h"
-#include "base/json/json_string_value_serializer.h"
-#include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/web_contents.h"
-#include "jni/RenderFrameHostTestExt_jni.h"
-
-using base::android::JavaParamRef;
-using base::android::JavaRef;
-using base::android::ScopedJavaLocalRef;
-
-namespace content {
-
-namespace {
-
-void OnExecuteJavaScriptResult(const JavaRef<jobject>& jcallback,
-                               const base::Value* value) {
-  std::string result;
-  JSONStringValueSerializer serializer(&result);
-  bool value_serialized = serializer.SerializeAndOmitBinaryValues(*value);
-  DCHECK(value_serialized);
-  base::android::RunStringCallbackAndroid(jcallback, result);
-}
-
-}  // namespace
-
-void JNI_RenderFrameHostTestExt_ExecuteJavaScriptForTests(
-    JNIEnv* env,
-    const JavaParamRef<jclass>& clazz,
-    const JavaParamRef<jstring>& jscript,
-    const JavaParamRef<jobject>& jcallback,
-    jlong render_frame_host_ptr) {
-  base::string16 script(ConvertJavaStringToUTF16(env, jscript));
-  auto callback = base::BindRepeating(
-      &OnExecuteJavaScriptResult,
-      base::android::ScopedJavaGlobalRef<jobject>(env, jcallback));
-  RenderFrameHost* render_frame_host =
-      reinterpret_cast<RenderFrameHost*>(render_frame_host_ptr);
-  render_frame_host->ExecuteJavaScriptForTests(script, callback);
-}
-
-}  // namespace content

content/public/test/android/web_contents_utils.cc

@@ -4,7 +4,6 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
-#include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/public/browser/render_frame_metadata_provider.h"
 #include "content/public/browser/render_view_host.h"
@@ -12,7 +11,6 @@
 #include "jni/WebContentsUtils_jni.h"
 
 using base::android::JavaParamRef;
-using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
@@ -30,13 +28,4 @@ void JNI_WebContentsUtils_ReportAllFrameSubmissions(
   provider->ReportAllFrameSubmissionsForTesting(enabled);
 }
 
-ScopedJavaLocalRef<jobject> JNI_WebContentsUtils_GetFocusedFrame(
-    JNIEnv* env,
-    const JavaParamRef<jclass>& clazz,
-    const JavaParamRef<jobject>& jweb_contents) {
-  WebContents* web_contents = WebContents::FromJavaWebContents(jweb_contents);
-  return static_cast<RenderFrameHostImpl*>(web_contents->GetFocusedFrame())
-      ->GetJavaRenderFrameHost();
-}
-
 }  // namespace content