Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused…

content/public/test/browser_test_utils.h

 // Copyright (c) 2012 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_TEST_BROWSER_TEST_UTILS_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_
 
 #include <vector>
 
 #include "base/callback_forward.h"
@@ skipping 17 matching lines @@
 // A collections of functions designed for use with content_browsertests and
 // browser_tests.
 // TO BE CLEAR: any function here must work against both binaries. If it only
 // works with browser_tests, it should be in chrome\test\base\ui_test_utils.h.
 // If it only works with content_browsertests, it should be in
 // content\test\content_browser_test_utils.h.
 
 namespace content {
 
 class MessageLoopRunner;
+class RenderViewHost;
 class WebContents;
 
 // Simulates clicking at the center of the given tab asynchronously.
 void SimulateMouseClick(WebContents* web_contents);
 
 // Simulates asynchronously a mouse enter/move/leave event.
 void SimulateMouseEvent(WebContents* web_contents,
                         WebKit::WebInputEvent::Type type,
                         const gfx::Point& point);
 
 // Sends a key press asynchronously.
 void SimulateKeyPress(WebContents* web_contents,
                       ui::KeyboardCode key,
                       bool control,
                       bool shift,
                       bool alt,
                       bool command);
 
+// Executes the passed |script| in the frame pointed to by |frame_xpath| (use
+// empty string for main frame).  The |script| should not invoke
+// domAutomationController.send(); otherwise, your test will hang or be flaky.
+// If you want to extract a result, use one of the below functions.
+// Returns true on success.
+bool ExecuteJavaScript(RenderViewHost* render_view_host,
+                       const std::wstring& frame_xpath,
+                       const std::wstring& script) WARN_UNUSED_RESULT;
+
+// The following methods executes the passed |script| in the frame pointed to by
+// |frame_xpath| (use empty string for main frame) and sets |result| to the
+// value returned by the script evaluation.
+// They return true on success, false if the script evaluation failed or did not
+// evaluate to the expected type.
+bool ExecuteJavaScriptAndExtractInt(RenderViewHost* render_view_host,
+                                    const std::wstring& frame_xpath,
+                                    const std::wstring& script,
+                                    int* result) WARN_UNUSED_RESULT;
+bool ExecuteJavaScriptAndExtractBool(RenderViewHost* render_view_host,
+                                     const std::wstring& frame_xpath,
+                                     const std::wstring& script,
+                                     bool* result) WARN_UNUSED_RESULT;
+bool ExecuteJavaScriptAndExtractString(
+    RenderViewHost* render_view_host,
+    const std::wstring& frame_xpath,
+    const std::wstring& script,
+    std::string* result) WARN_UNUSED_RESULT;
+
 // Watches title changes on a tab, blocking until an expected title is set.
 class TitleWatcher : public NotificationObserver {
  public:
   // |web_contents| must be non-NULL and needs to stay alive for the
   // entire lifetime of |this|. |expected_title| is the title that |this|
   // will wait for.
   TitleWatcher(WebContents* web_contents,
                const string16& expected_title);
   virtual ~TitleWatcher();
 
@@ skipping 21 matching lines @@
 
   bool expected_title_observed_;
   bool quit_loop_on_observation_;
 
   DISALLOW_COPY_AND_ASSIGN(TitleWatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_