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/content_settings | |
| 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/content_settings')
| -rw-r--r-- | chrome/browser/content_settings/content_settings_browsertest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index 013cc39..c2ff3e2 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc @@ -381,7 +381,8 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, LoadAllBlockedPlugins) { ASSERT_TRUE(content::ExecuteJavaScript( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", L"window.inject()")); + "", + "window.inject()")); EXPECT_EQ(expected_title2, title_watcher2.WaitAndGetTitle()); } @@ -397,7 +398,8 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, NoCallbackAtLoad) { // Inject the callback function into the HTML page generated by the browser. ASSERT_TRUE(content::ExecuteJavaScript( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", L"CallOnStartup = function() { document.title = \"OK\"; }")); + "", + "CallOnStartup = function() { document.title = \"OK\"; }")); string16 expected_title(ASCIIToUTF16("OK")); content::TitleWatcher title_watcher( |