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

content/browser/session_history_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 "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 416 matching lines @@
       browser(), GURL("javascript:void(frames[0].navigate())"));
   EXPECT_EQ("foo", GetTabTitle());
 
   GoBack();
   EXPECT_EQ("Default Title", GetTabTitle());
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=56267
 IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
   int length;
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(1, length);
 
   ui_test_utils::NavigateToURL(browser(), GetURL("title1.html"));
 
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 
   // Now test that history.length is updated when the navigation is committed.
   ui_test_utils::NavigateToURL(browser(), GetURL("record_length.html"));
 
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(3, length);
 
   GoBack();
   GoBack();
 
   // Ensure history.length is properly truncated.
   ui_test_utils::NavigateToURL(browser(), GetURL("title2.html"));
 
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 }