diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 17:19:42 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 17:19:42 +0000 |
| commit | 7d478cb0d1665ee5f19c62b1d3a755ef7465993c (patch) | |
| tree | c10ec3eca14f3536511979dcd62f70041168e546 /chrome/browser/extensions/api/extension_action | |
| parent | dad4c3e277bcb20ed0703a5ec55f2f8b4cd2aae9 (diff) | |
| download | chromium_src-7d478cb0d1665ee5f19c62b1d3a755ef7465993c.zip chromium_src-7d478cb0d1665ee5f19c62b1d3a755ef7465993c.tar.gz chromium_src-7d478cb0d1665ee5f19c62b1d3a755ef7465993c.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/extensions/api/extension_action')
| -rw-r--r-- | chrome/browser/extensions/api/extension_action/browser_action_apitest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc index bc4de42..3d2bbe2 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc @@ -23,6 +23,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "content/public/test/browser_test_utils.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" @@ -83,7 +84,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) { // Verify the command worked. WebContents* tab = chrome::GetActiveWebContents(browser()); bool result = false; - ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( + ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( tab->GetRenderViewHost(), L"", L"setInterval(function(){" L" if(document.body.bgColor == 'red'){" |