chrome/browser/extensions/extension_icon_source_apitest.cc - Issue 11753009: Simplify ExecuteJavaScript* functions.

Unified Diff: chrome/browser/extensions/extension_icon_source_apitest.cc

Issue 11753009: Simplify ExecuteJavaScript* functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update prerender_browsertest.cc. Created 7 years, 12 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chrome/browser/extensions/extension_dom_clipboard_apitest.cc ('k') | chrome/browser/extensions/extension_incognito_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_icon_source_apitest.cc

diff --git a/chrome/browser/extensions/extension_icon_source_apitest.cc b/chrome/browser/extensions/extension_icon_source_apitest.cc

index e5d4ff0b509b71d917ee6b83228e48d8fda84e4b..24b5df037573ca7e2bef46bbdc960dd5f49bfad8 100644

--- a/chrome/browser/extensions/extension_icon_source_apitest.cc

+++ b/chrome/browser/extensions/extension_icon_source_apitest.cc

@@ -34,9 +34,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) {

ui_test_utils::NavigateToURL(

browser(),

GURL("chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/index.html"));

- ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(

- chrome::GetActiveWebContents(browser())->GetRenderViewHost(),

- "",

+ ASSERT_TRUE(content::ExecuteScriptAndExtractString(

+ chrome::GetActiveWebContents(browser()),

"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Loaded");

@@ -46,9 +45,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) {

ui_test_utils::NavigateToURL(

browser(),

GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html"));

- ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(

- chrome::GetActiveWebContents(browser())->GetRenderViewHost(),

- "",

+ ASSERT_TRUE(content::ExecuteScriptAndExtractString(

+ chrome::GetActiveWebContents(browser()),

"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Not Loaded");

@@ -67,9 +65,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) {

Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(

browser()->profile(),

GURL("chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/index.html"));

- ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(

- chrome::GetActiveWebContents(otr_browser)->GetRenderViewHost(),

- "",

+ ASSERT_TRUE(content::ExecuteScriptAndExtractString(

+ chrome::GetActiveWebContents(otr_browser),

"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Loaded");

@@ -79,9 +76,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) {

ui_test_utils::OpenURLOffTheRecord(

browser()->profile(),

GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html"));

- ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(

- chrome::GetActiveWebContents(otr_browser)->GetRenderViewHost(),

- "",

+ ASSERT_TRUE(content::ExecuteScriptAndExtractString(

+ chrome::GetActiveWebContents(otr_browser),

"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Not Loaded");