chrome/browser/browser_browsertest.cc - Issue 6312154: Remove wstring from RVH's run Javascript command....

Unified Diff: chrome/browser/browser_browsertest.cc

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 11 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

Download patch

« no previous file with comments | « chrome/browser/automation/testing_automation_provider_win.cc ('k') | chrome/browser/browser_signin.cc » ('j') | chrome/test/webdriver/automation.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browser_browsertest.cc

===================================================================

--- chrome/browser/browser_browsertest.cc (revision 73855)

+++ chrome/browser/browser_browsertest.cc (working copy)

@@ -47,13 +47,13 @@

namespace {

-const std::string BEFORE_UNLOAD_HTML =

+const char* kBeforeUnloadHTML =

"<html><head><title>beforeunload</title></head><body>"

"<script>window.onbeforeunload=function(e){return 'foo'}</script>"

"</body></html>";

-const std::wstring OPEN_NEW_BEFOREUNLOAD_PAGE =

- L"w=window.open(); w.onbeforeunload=function(e){return 'foo'};";

+const char* kOpenNewBeforeUnloadPage =

+ "w=window.open(); w.onbeforeunload=function(e){return 'foo'};";

const FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html");

const FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html");

@@ -211,8 +211,9 @@

EXPECT_EQ(0, browser()->selected_index());

TabContents* second_tab = browser()->GetTabContentsAt(1);

ASSERT_TRUE(second_tab);

- second_tab->render_view_host()->ExecuteJavascriptInWebFrame(L"",

- L"alert('Activate!');");

+ second_tab->render_view_host()->ExecuteJavascriptInWebFrame(

+ string16(),

+ ASCIIToUTF16("alert('Activate!');"));

AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();

alert->CloseModalDialog();

EXPECT_EQ(2, browser()->tab_count());

@@ -246,7 +247,7 @@

// Test for crbug.com/22004. Reloading a page with a before unload handler and

// then canceling the dialog should not leave the throbber spinning.

IN_PROC_BROWSER_TEST_F(BrowserTest, ReloadThenCancelBeforeUnload) {

- GURL url("data:text/html," + BEFORE_UNLOAD_HTML);

+ GURL url(std::string("data:text/html,") + kBeforeUnloadHTML);

ui_test_utils::NavigateToURL(browser(), url);

// Navigate to another page, but click cancel in the dialog. Make sure that

@@ -258,7 +259,8 @@

// Clear the beforeunload handler so the test can easily exit.

browser()->GetSelectedTabContents()->render_view_host()->

- ExecuteJavascriptInWebFrame(L"", L"onbeforeunload=null;");

+ ExecuteJavascriptInWebFrame(string16(),

+ ASCIIToUTF16("onbeforeunload=null;"));

}

// Crashy on mac. http://crbug.com/38522

@@ -274,13 +276,15 @@

// two beforeunload dialogs shown.

IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_SingleBeforeUnloadAfterWindowClose) {

browser()->GetSelectedTabContents()->render_view_host()->

- ExecuteJavascriptInWebFrame(L"", OPEN_NEW_BEFOREUNLOAD_PAGE);

+ ExecuteJavascriptInWebFrame(string16(),

+ ASCIIToUTF16(kOpenNewBeforeUnloadPage));

// Close the new window with JavaScript, which should show a single

// beforeunload dialog. Then show another alert, to make it easy to verify

// that a second beforeunload dialog isn't shown.

browser()->GetTabContentsAt(0)->render_view_host()->

- ExecuteJavascriptInWebFrame(L"", L"w.close(); alert('bar');");

+ ExecuteJavascriptInWebFrame(string16(),

+ ASCIIToUTF16("w.close(); alert('bar');"));

AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();

alert->native_dialog()->AcceptAppModalDialog();

« no previous file with comments | « chrome/browser/automation/testing_automation_provider_win.cc ('k') | chrome/browser/browser_signin.cc » ('j') | chrome/test/webdriver/automation.cc » ('J')