diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-02 22:44:13 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-02 22:44:13 +0000 |
| commit | 06bc5d9a46ad798452b317fc47be8acd5ff041c5 (patch) | |
| tree | fe194e49cf0ea3f31a88b60821abb82c4fe6a853 /chrome/browser/extensions/extension_icon_source_apitest.cc | |
| parent | 78e2370448246f03b6f795b105746bf82ba5f4f4 (diff) | |
| download | chromium_src-06bc5d9a46ad798452b317fc47be8acd5ff041c5.zip chromium_src-06bc5d9a46ad798452b317fc47be8acd5ff041c5.tar.gz chromium_src-06bc5d9a46ad798452b317fc47be8acd5ff041c5.tar.bz2 | |
Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc}
to take std::string (UTF-8) instead of std::wstring. This seems to help
simplify callsites considerably.
TBR=jam@chromium.org
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11728003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_icon_source_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_icon_source_apitest.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_icon_source_apitest.cc b/chrome/browser/extensions/extension_icon_source_apitest.cc index 91bdf3b..e5d4ff0 100644 --- a/chrome/browser/extensions/extension_icon_source_apitest.cc +++ b/chrome/browser/extensions/extension_icon_source_apitest.cc @@ -35,8 +35,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) { browser(), GURL("chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/index.html")); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Loaded"); @@ -46,8 +47,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) { browser(), GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html")); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Not Loaded"); } @@ -66,8 +68,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) { browser()->profile(), GURL("chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/index.html")); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(otr_browser)->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", + chrome::GetActiveWebContents(otr_browser)->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Loaded"); @@ -77,8 +80,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) { browser()->profile(), GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html")); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(otr_browser)->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", + chrome::GetActiveWebContents(otr_browser)->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Not Loaded"); } |