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

content/test/layout_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 "content/test/layout_browsertest.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
@@ skipping 42 matching lines @@
   expected_result_path = expected_result_path.AppendASCII(test_case_file_name);
   expected_result_path = expected_result_path.InsertBeforeExtension(
       FILE_PATH_LITERAL("-expected"));
   expected_result_path =
       expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt"));
   return file_util::ReadFileToString(
       expected_result_path, expected_result_value);
 }
 
 void ScrapeResultFromBrowser(Browser* browser, std::string* actual_text) {
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
       chrome::GetActiveWebContents(browser)->GetRenderViewHost(),
       L"",
       L"window.domAutomationController.send(document.body.innerText);",
       actual_text));
 }
 
 static const std::string preamble =
       "\n<script>\n"
       "function LayoutTestController() {\n"
       "  this.wait_until_done_ = false;\n"
@@ skipping 179 matching lines @@
   ASSERT_TRUE(file_util::ReadFileToString(path_to_single_test, &test_html));
 
   size_t insertion_position = FindInsertPosition(test_html);
   test_html.insert(insertion_position, preamble);
   *test_path = our_layout_test_temp_dir_.Append(test_case_dir_);
   *test_path = test_path->AppendASCII(test_case_file_name);
   ASSERT_TRUE(file_util::WriteFile(*test_path,
                                    &test_html.at(0),
                                    static_cast<int>(test_html.size())));
 }