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/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc
index 6ec1809..168b9e97 100644
--- a/chrome/browser/extensions/extension_nacl_browsertest.cc
+++ b/chrome/browser/extensions/extension_nacl_browsertest.cc
@@ -19,6 +19,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/plugin_service.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test_utils.h"
#include "webkit/plugins/webplugininfo.h"
using content::PluginService;
@@ -99,11 +100,11 @@
bool embedded_plugin_created = false;
bool content_handler_plugin_created = false;
WebContents* web_contents = chrome::GetActiveWebContents(browser());
- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
web_contents->GetRenderViewHost(), L"",
L"window.domAutomationController.send(EmbeddedPluginCreated());",
&embedded_plugin_created));
- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
web_contents->GetRenderViewHost(), L"",
L"window.domAutomationController.send(ContentHandlerPluginCreated());",
&content_handler_plugin_created));
