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

chrome/browser/autofill/autofill_browsertest.cc

 // 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.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
@@ skipping 113 matching lines @@
 
     // AddProfile is asynchronous. Wait for it to finish before continuing the
     // tests.
     observer.Wait();
     personal_data_manager->RemoveObserver(&observer);
   }
 
   void ExpectFieldValue(const std::wstring& field_name,
                         const std::string& expected_value) {
     std::string value;
-    ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
+    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
         chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
         L"window.domAutomationController.send("
         L"document.getElementById('" + field_name + L"').value);", &value));
     EXPECT_EQ(expected_value, value);
   }
 
   RenderViewHost* render_view_host() {
     return chrome::GetActiveWebContents(browser())->GetRenderViewHost();
   }
 
@@ skipping 36 matching lines @@
     fetcher->SetResponseString(script);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
   }
 
   void FocusFirstNameField() {
     LOG(WARNING) << "Clicking on the tab.";
     content::SimulateMouseClick(chrome::GetActiveWebContents(browser()));
 
     LOG(WARNING) << "Focusing the first name field.";
     bool result = false;
-    ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
         render_view_host(), L"",
         L"if (document.readyState === 'complete')"
         L"  document.getElementById('firstname').focus();"
         L"else"
         L"  domAutomationController.send(false);",
         &result));
     ASSERT_TRUE(result);
   }
 
   void ExpectFilledTestForm() {
@@ skipping 149 matching lines @@
   // The form should be filled.
   ExpectFilledTestForm();
 
   // The change event should have already fired for unfocused fields, both of
   // <input> and of <select> type. However, it should not yet have fired for the
   // focused field.
   bool focused_fired = false;
   bool unfocused_fired = false;
   bool changed_select_fired = false;
   bool unchanged_select_fired = false;
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       render_view_host(), L"",
       L"domAutomationController.send(focused_fired);", &focused_fired));
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       render_view_host(), L"",
       L"domAutomationController.send(unfocused_fired);", &unfocused_fired));
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       render_view_host(), L"",
       L"domAutomationController.send(changed_select_fired);",
       &changed_select_fired));
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       render_view_host(), L"",
       L"domAutomationController.send(unchanged_select_fired);",
       &unchanged_select_fired));
   EXPECT_FALSE(focused_fired);
   EXPECT_TRUE(unfocused_fired);
   EXPECT_TRUE(changed_select_fired);
   EXPECT_FALSE(unchanged_select_fired);
 
   // Unfocus the first name field. Its change event should fire.
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       render_view_host(), L"",
       L"document.getElementById('firstname').blur();"
       L"domAutomationController.send(focused_fired);", &focused_fired));
   EXPECT_TRUE(focused_fired);
 }
 
 // Test that we can autofill forms distinguished only by their |id| attribute.
 IN_PROC_BROWSER_TEST_F(AutofillTest, AutofillFormsDistinguishedById) {
   CreateTestProfile();
 
@@ skipping 194 matching lines @@
            ""
            "  for (var i = 0; i < elements.length; i++) {"
            "    var name = elements[i][0];"
            "    var label = elements[i][1];"
            "    AddElement(name, label);"
            "  }"
            "};"
            "</script>")));
 
   // Dynamically construct the form.
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(render_view_host(), L"",
-                                               L"BuildForm();"));
+  ASSERT_TRUE(content::ExecuteJavaScript(render_view_host(), L"",
+                                         L"BuildForm();"));
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that form filling works after reloading the current page.
 // This test brought to you by http://crbug.com/69204
 #if defined(OS_MACOSX)
 // Sometimes times out on Mac: http://crbug.com/81451
 // Currently enabled for logging.
@@ skipping 84 matching lines @@
   // Pass fake google.translate lib as the translate script.
   SimulateURLFetch(true);
 
   content::WindowedNotificationObserver translation_observer(
       chrome::NOTIFICATION_PAGE_TRANSLATED,
       content::NotificationService::AllSources());
 
   // Simulate translation to kick onTranslateElementLoad.
   // But right now, the call stucks here.
   // Once click the text field, it starts again.
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
+  ASSERT_TRUE(content::ExecuteJavaScript(
       render_view_host(), L"",
       L"cr.googleTranslate.onTranslateElementLoad();"));
 
   // Simulate the render notifying the translation has been done.
   translation_observer.Wait();
 
   TryBasicFormFill();
 }