Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused by content_browsertests.
BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10795090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148132 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc
index 6ca7f9f0..bef3c76 100644
--- a/chrome/browser/extensions/chrome_app_api_browsertest.cc
+++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc
@@ -19,6 +19,7 @@
#include "chrome/common/extensions/manifest.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test_utils.h"
#include "googleurl/src/gurl.h"
#include "net/base/mock_host_resolver.h"
@@ -32,7 +33,7 @@
L"window.domAutomationController.send(window.chrome.app.isInstalled);";
bool result;
CHECK(
- ui_test_utils::ExecuteJavaScriptAndExtractBool(
+ content::ExecuteJavaScriptAndExtractBool(
chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
frame_xpath, get_app_is_installed, &result));
return result;
@@ -45,7 +46,7 @@
L"function(s) { window.domAutomationController.send(s); });";
std::string result;
CHECK(
- ui_test_utils::ExecuteJavaScriptAndExtractString(
+ content::ExecuteJavaScriptAndExtractString(
chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
frame_xpath, get_app_install_state, &result));
return result;
@@ -58,7 +59,7 @@
L"window.chrome.app.runningState());";
std::string result;
CHECK(
- ui_test_utils::ExecuteJavaScriptAndExtractString(
+ content::ExecuteJavaScriptAndExtractString(
chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
frame_xpath, get_app_install_state, &result));
return result;
@@ -112,7 +113,7 @@
L" JSON.stringify(window.chrome.app.getDetails()));";
std::string result;
ASSERT_TRUE(
- ui_test_utils::ExecuteJavaScriptAndExtractString(
+ content::ExecuteJavaScriptAndExtractString(
chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
L"", get_app_details, &result));
EXPECT_EQ("null", result);
@@ -125,7 +126,7 @@
// chrome.app.getDetails().
ui_test_utils::NavigateToURL(browser(), app_url);
ASSERT_TRUE(
- ui_test_utils::ExecuteJavaScriptAndExtractString(
+ content::ExecuteJavaScriptAndExtractString(
chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
L"", get_app_details, &result));
scoped_ptr<DictionaryValue> app_details(
@@ -138,7 +139,7 @@
// Try to change app.isInstalled. Should silently fail, so
// that isInstalled should have the initial value.
ASSERT_TRUE(
- ui_test_utils::ExecuteJavaScriptAndExtractString(
+ content::ExecuteJavaScriptAndExtractString(
chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
L"",
L"window.domAutomationController.send("
@@ -189,7 +190,7 @@
L"window.domAutomationController.send(window.testUnsuccessfulAccess())";
bool result = false;
ASSERT_TRUE(
- ui_test_utils::ExecuteJavaScriptAndExtractBool(
+ content::ExecuteJavaScriptAndExtractBool(
chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
L"", test_unsuccessful_access, &result));
EXPECT_TRUE(result);
@@ -202,7 +203,7 @@
L" JSON.stringify(chrome.app.getDetailsForFrame(frames[0])))";
std::string json;
ASSERT_TRUE(
- ui_test_utils::ExecuteJavaScriptAndExtractString(
+ content::ExecuteJavaScriptAndExtractString(
chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
L"", get_details_for_frame, &json));
