Add ExecuteJavaScriptForTest and make all tests use it

content/public/browser/render_frame_host.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_RENDER_FRAME_HOST_H_
 #define CONTENT_PUBLIC_BROWSER_RENDER_FRAME_HOST_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
@@ skipping 17 matching lines @@
 class SiteInstance;
 
 // The interface provides a communication conduit with a frame in the renderer.
 class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
                                        public IPC::Sender {
  public:
   // Returns the RenderFrameHost given its ID and the ID of its render process.
   // Returns nullptr if the IDs do not correspond to a live RenderFrameHost.
   static RenderFrameHost* FromID(int render_process_id, int render_frame_id);
 
+  // Globally allows for injecting JavaScript into the main world. This feature
+  // is present only to support Android WebView and must not be used in other
+  // configurations.
+  static void AllowInjectingJavaScriptForAndroidWebView();

[jochen (gone - plz use gerrit), 2015/07/16 04:53:17]

Richard & John, ptal esp. at this method

There is no compile-time way to differentiate between Android WebView and
regular Android builds, however, the webview exposes an evaluateJavascript API
to embedders, so we can't restrict the call.

[Torne, 2015/07/16 12:41:57]

This seems reasonable to me.

+
   ~RenderFrameHost() override {}
 
   // Returns the route id for this frame.
   virtual int GetRoutingID() = 0;
 
   // Returns the SiteInstance grouping all RenderFrameHosts that have script
   // access to this RenderFrameHost, and must therefore live in the same
   // process.
   virtual SiteInstance* GetSiteInstance() = 0;
 
@@ skipping 19 matching lines @@
 
   // Returns the associated widget's native view.
   virtual gfx::NativeView GetNativeView() = 0;
 
   // Adds |message| to the DevTools console.
   virtual void AddMessageToConsole(ConsoleMessageLevel level,
                                    const std::string& message) = 0;
 
   // Runs some JavaScript in this frame's context. If a callback is provided, it
   // will be used to return the result, when the result is available.
+  // This API can only be called on chrome:// or chrome-devtools:// URLs.
   typedef base::Callback<void(const base::Value*)> JavaScriptResultCallback;
   virtual void ExecuteJavaScript(const base::string16& javascript) = 0;
   virtual void ExecuteJavaScript(const base::string16& javascript,
                                  const JavaScriptResultCallback& callback) = 0;
+
+  // Runs some JavaScript in an isolated world of top of this frame's context.
   virtual void ExecuteJavaScriptInIsolatedWorld(
       const base::string16& javascript,
       const JavaScriptResultCallback& callback,
       int world_id) = 0;
 
-  // ONLY FOR TESTS: Same as above but adds a fake UserGestureIndicator around
-  // execution. (crbug.com/408426)
+  // ONLY FOR TESTS: Same as above but without restrictions. Optionally, adds a
+  // fake UserGestureIndicator around execution. (crbug.com/408426)
+  virtual void ExecuteJavaScriptForTests(const base::string16& javascript) = 0;
+  virtual void ExecuteJavaScriptForTests(
+      const base::string16& javascript,
+      const JavaScriptResultCallback& callback) = 0;
   virtual void ExecuteJavaScriptWithUserGestureForTests(
       const base::string16& javascript) = 0;
 
   // Accessibility actions - these send a message to the RenderFrame
   // to trigger an action on an accessibility object.
   virtual void AccessibilitySetFocus(int acc_obj_id) = 0;
   virtual void AccessibilityDoDefaultAction(int acc_obj_id) = 0;
   virtual void AccessibilityScrollToMakeVisible(
       int acc_obj_id, const gfx::Rect& subfocus) = 0;
   virtual void AccessibilityShowContextMenu(int acc_obj_id) = 0;
@@ skipping 32 matching lines @@
 
  private:
   // This interface should only be implemented inside content.
   friend class RenderFrameHostImpl;
   RenderFrameHost() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_RENDER_FRAME_HOST_H_