diff options
72 files changed, 1214 insertions, 995 deletions
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 73f54ad..ab3cc2c 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -218,7 +218,7 @@ class AutofillTest : public InProcessBrowserTest { WindowedPersonalDataManagerObserver observer(browser()); ASSERT_TRUE( - content::ExecuteJavaScript(render_view_host(), L"", ASCIIToWide(js))); + content::ExecuteJavaScript(render_view_host(), "", js)); observer.Wait(); } @@ -240,7 +240,7 @@ class AutofillTest : public InProcessBrowserTest { void PopulateForm(const std::string& field_id) { std::string js("document.getElementById('" + field_id + "').focus();"); ASSERT_TRUE( - content::ExecuteJavaScript(render_view_host(), L"", ASCIIToWide(js))); + content::ExecuteJavaScript(render_view_host(), "", js)); SendKeyAndWait(ui::VKEY_DOWN, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS); @@ -289,13 +289,15 @@ class AutofillTest : public InProcessBrowserTest { return lines.size(); } - void ExpectFieldValue(const std::wstring& field_name, + void ExpectFieldValue(const std::string& field_name, const std::string& expected_value) { std::string value; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(" - L"document.getElementById('" + field_name + L"').value);", &value)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(" + " document.getElementById('" + field_name + "').value);", + &value)); EXPECT_EQ(expected_value, value); } @@ -351,25 +353,26 @@ class AutofillTest : public InProcessBrowserTest { LOG(WARNING) << "Focusing the first name field."; bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - render_view_host(), L"", - L"if (document.readyState === 'complete')" - L" document.getElementById('firstname').focus();" - L"else" - L" domAutomationController.send(false);", + render_view_host(), + "", + "if (document.readyState === 'complete')" + " document.getElementById('firstname').focus();" + "else" + " domAutomationController.send(false);", &result)); ASSERT_TRUE(result); } void ExpectFilledTestForm() { - ExpectFieldValue(L"firstname", "Milton"); - ExpectFieldValue(L"lastname", "Waddams"); - ExpectFieldValue(L"address1", "4120 Freidrich Lane"); - ExpectFieldValue(L"address2", "Basement"); - ExpectFieldValue(L"city", "Austin"); - ExpectFieldValue(L"state", "TX"); - ExpectFieldValue(L"zip", "78744"); - ExpectFieldValue(L"country", "US"); - ExpectFieldValue(L"phone", "5125551234"); + ExpectFieldValue("firstname", "Milton"); + ExpectFieldValue("lastname", "Waddams"); + ExpectFieldValue("address1", "4120 Freidrich Lane"); + ExpectFieldValue("address2", "Basement"); + ExpectFieldValue("city", "Austin"); + ExpectFieldValue("state", "TX"); + ExpectFieldValue("zip", "78744"); + ExpectFieldValue("country", "US"); + ExpectFieldValue("phone", "5125551234"); } void SendKeyAndWait(ui::KeyboardCode key, int notification_type) { @@ -396,15 +399,15 @@ class AutofillTest : public InProcessBrowserTest { ui::VKEY_DOWN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA); // The previewed values should not be accessible to JavaScript. - ExpectFieldValue(L"firstname", "M"); - ExpectFieldValue(L"lastname", ""); - ExpectFieldValue(L"address1", ""); - ExpectFieldValue(L"address2", ""); - ExpectFieldValue(L"city", ""); - ExpectFieldValue(L"state", ""); - ExpectFieldValue(L"zip", ""); - ExpectFieldValue(L"country", ""); - ExpectFieldValue(L"phone", ""); + ExpectFieldValue("firstname", "M"); + ExpectFieldValue("lastname", ""); + ExpectFieldValue("address1", ""); + ExpectFieldValue("address2", ""); + ExpectFieldValue("city", ""); + ExpectFieldValue("state", ""); + ExpectFieldValue("zip", ""); + ExpectFieldValue("country", ""); + ExpectFieldValue("phone", ""); // TODO(isherman): It would be nice to test that the previewed values are // displayed: http://crbug.com/57220 @@ -537,18 +540,24 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_OnChangeAfterAutofill) { bool changed_select_fired = false; bool unchanged_select_fired = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - render_view_host(), L"", - L"domAutomationController.send(focused_fired);", &focused_fired)); + render_view_host(), + "", + "domAutomationController.send(focused_fired);", + &focused_fired)); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - render_view_host(), L"", - L"domAutomationController.send(unfocused_fired);", &unfocused_fired)); + render_view_host(), + "", + "domAutomationController.send(unfocused_fired);", + &unfocused_fired)); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - render_view_host(), L"", - L"domAutomationController.send(changed_select_fired);", + render_view_host(), + "", + "domAutomationController.send(changed_select_fired);", &changed_select_fired)); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - render_view_host(), L"", - L"domAutomationController.send(unchanged_select_fired);", + render_view_host(), + "", + "domAutomationController.send(unchanged_select_fired);", &unchanged_select_fired)); EXPECT_FALSE(focused_fired); EXPECT_TRUE(unfocused_fired); @@ -557,9 +566,10 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_OnChangeAfterAutofill) { // Unfocus the first name field. Its change event should fire. ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - render_view_host(), L"", - L"document.getElementById('firstname').blur();" - L"domAutomationController.send(focused_fired);", &focused_fired)); + render_view_host(), + "", + "document.getElementById('firstname').blur();" + "domAutomationController.send(focused_fired);", &focused_fired)); EXPECT_TRUE(focused_fired); } @@ -632,7 +642,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_AutofillFormWithRepeatedField) { // Invoke Autofill. TryBasicFormFill(); - ExpectFieldValue(L"state_freeform", ""); + ExpectFieldValue("state_freeform", ""); } // http://crbug.com/150084 @@ -770,8 +780,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_DynamicFormFill) { "</script>"))); // Dynamically construct the form. - ASSERT_TRUE(content::ExecuteJavaScript(render_view_host(), L"", - L"BuildForm();")); + ASSERT_TRUE(content::ExecuteJavaScript(render_view_host(), "", + "BuildForm();")); // Invoke Autofill. TryBasicFormFill(); @@ -870,8 +880,9 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_AutofillAfterTranslate) { // But right now, the call stucks here. // Once click the text field, it starts again. ASSERT_TRUE(content::ExecuteJavaScript( - render_view_host(), L"", - L"cr.googleTranslate.onTranslateElementLoad();")); + render_view_host(), + "", + "cr.googleTranslate.onTranslateElementLoad();")); // Simulate the render notifying the translation has been done. translation_observer.Wait(); @@ -1182,23 +1193,23 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_ComparePhoneNumbers) { ui_test_utils::NavigateToURL(browser(), url); PopulateForm("NAME_FIRST"); - ExpectFieldValue(L"NAME_FIRST", "Bob"); - ExpectFieldValue(L"NAME_LAST", "Smith"); - ExpectFieldValue(L"ADDRESS_HOME_LINE1", "1234 H St."); - ExpectFieldValue(L"ADDRESS_HOME_CITY", "San Jose"); - ExpectFieldValue(L"ADDRESS_HOME_STATE", "CA"); - ExpectFieldValue(L"ADDRESS_HOME_ZIP", "95110"); - ExpectFieldValue(L"PHONE_HOME_WHOLE_NUMBER", "14085554567"); - ExpectFieldValue(L"PHONE_HOME_CITY_CODE-1", "408"); - ExpectFieldValue(L"PHONE_HOME_CITY_CODE-2", "408"); - ExpectFieldValue(L"PHONE_HOME_NUMBER", "5554567"); - ExpectFieldValue(L"PHONE_HOME_NUMBER_3-1", "555"); - ExpectFieldValue(L"PHONE_HOME_NUMBER_3-2", "555"); - ExpectFieldValue(L"PHONE_HOME_NUMBER_4-1", "4567"); - ExpectFieldValue(L"PHONE_HOME_NUMBER_4-2", "4567"); - ExpectFieldValue(L"PHONE_HOME_EXT-1", ""); - ExpectFieldValue(L"PHONE_HOME_EXT-2", ""); - ExpectFieldValue(L"PHONE_HOME_COUNTRY_CODE-1", "1"); + ExpectFieldValue("NAME_FIRST", "Bob"); + ExpectFieldValue("NAME_LAST", "Smith"); + ExpectFieldValue("ADDRESS_HOME_LINE1", "1234 H St."); + ExpectFieldValue("ADDRESS_HOME_CITY", "San Jose"); + ExpectFieldValue("ADDRESS_HOME_STATE", "CA"); + ExpectFieldValue("ADDRESS_HOME_ZIP", "95110"); + ExpectFieldValue("PHONE_HOME_WHOLE_NUMBER", "14085554567"); + ExpectFieldValue("PHONE_HOME_CITY_CODE-1", "408"); + ExpectFieldValue("PHONE_HOME_CITY_CODE-2", "408"); + ExpectFieldValue("PHONE_HOME_NUMBER", "5554567"); + ExpectFieldValue("PHONE_HOME_NUMBER_3-1", "555"); + ExpectFieldValue("PHONE_HOME_NUMBER_3-2", "555"); + ExpectFieldValue("PHONE_HOME_NUMBER_4-1", "4567"); + ExpectFieldValue("PHONE_HOME_NUMBER_4-2", "4567"); + ExpectFieldValue("PHONE_HOME_EXT-1", ""); + ExpectFieldValue("PHONE_HOME_EXT-2", ""); + ExpectFieldValue("PHONE_HOME_COUNTRY_CODE-1", "1"); } // Test profile is saved if phone number is valid in selected country. @@ -1335,8 +1346,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_NoAutofillForReadOnlyFields) { ui_test_utils::NavigateToURL(browser(), url); PopulateForm("firstname"); - ExpectFieldValue(L"email", ""); - ExpectFieldValue(L"address", addr_line1); + ExpectFieldValue("email", ""); + ExpectFieldValue("address", addr_line1); } // http://crbug.com/150084 @@ -1360,20 +1371,21 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_FormFillableOnReset) { PopulateForm("NAME_FIRST"); ASSERT_TRUE(content::ExecuteJavaScript( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"document.getElementById('testform').reset()")); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "document.getElementById('testform').reset()")); PopulateForm("NAME_FIRST"); - ExpectFieldValue(L"NAME_FIRST", "Milton"); - ExpectFieldValue(L"NAME_LAST", "Waddams"); - ExpectFieldValue(L"EMAIL_ADDRESS", "red.swingline@initech.com"); - ExpectFieldValue(L"ADDRESS_HOME_LINE1", "4120 Freidrich Lane"); - ExpectFieldValue(L"ADDRESS_HOME_CITY", "Austin"); - ExpectFieldValue(L"ADDRESS_HOME_STATE", "Texas"); - ExpectFieldValue(L"ADDRESS_HOME_ZIP", "78744"); - ExpectFieldValue(L"ADDRESS_HOME_COUNTRY", "United States"); - ExpectFieldValue(L"PHONE_HOME_WHOLE_NUMBER", "5125551234"); + ExpectFieldValue("NAME_FIRST", "Milton"); + ExpectFieldValue("NAME_LAST", "Waddams"); + ExpectFieldValue("EMAIL_ADDRESS", "red.swingline@initech.com"); + ExpectFieldValue("ADDRESS_HOME_LINE1", "4120 Freidrich Lane"); + ExpectFieldValue("ADDRESS_HOME_CITY", "Austin"); + ExpectFieldValue("ADDRESS_HOME_STATE", "Texas"); + ExpectFieldValue("ADDRESS_HOME_ZIP", "78744"); + ExpectFieldValue("ADDRESS_HOME_COUNTRY", "United States"); + ExpectFieldValue("PHONE_HOME_WHOLE_NUMBER", "5125551234"); } // http://crbug.com/150084 @@ -1395,7 +1407,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_DistinguishMiddleInitialWithinName) { ui_test_utils::NavigateToURL(browser(), url); PopulateForm("NAME_FIRST"); - ExpectFieldValue(L"NAME_MIDDLE", "C"); + ExpectFieldValue("NAME_MIDDLE", "C"); } // http://crbug.com/150084 @@ -1426,7 +1438,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, ui_test_utils::NavigateToURL(browser(), url); PopulateForm("NAME_FIRST"); - ExpectFieldValue(L"EMAIL_CONFIRM", email); + ExpectFieldValue("EMAIL_CONFIRM", email); // TODO(isherman): verify entire form. } @@ -1511,8 +1523,9 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_FormFillLatencyAfterSubmit) { &chrome::GetActiveWebContents(browser())->GetController())); ASSERT_TRUE(content::ExecuteJavaScript( - render_view_host(), L"", - ASCIIToWide("document.getElementById('testform').submit();"))); + render_view_host(), + "", + "document.getElementById('testform').submit();")); // This will ensure the test didn't hang. load_stop_observer.Wait(); } @@ -1543,8 +1556,9 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_DisableAutocompleteWhileFilling) { // Now that the popup with suggestions is showing, disable autocomplete for // the active field. ASSERT_TRUE(content::ExecuteJavaScript( - render_view_host(), L"", - L"document.querySelector('input').autocomplete = 'off';")); + render_view_host(), + "", + "document.querySelector('input').autocomplete = 'off';")); // Press the down arrow to select the suggestion and attempt to preview the // autofilled form. @@ -1555,10 +1569,11 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_DisableAutocompleteWhileFilling) { // IPC that's easy to wait for. Chrome shouldn't crash. bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - render_view_host(), L"", - L"var city = document.getElementById('city');" - L"city.onfocus = function() { domAutomationController.send(true); };" - L"city.focus()", + render_view_host(), + "", + "var city = document.getElementById('city');" + "city.onfocus = function() { domAutomationController.send(true); };" + "city.focus()", &result)); ASSERT_TRUE(result); SendKeyAndWait( diff --git a/chrome/browser/automation/automation_misc_browsertest.cc b/chrome/browser/automation/automation_misc_browsertest.cc index a211eaf7..9056332 100644 --- a/chrome/browser/automation/automation_misc_browsertest.cc +++ b/chrome/browser/automation/automation_misc_browsertest.cc @@ -75,13 +75,13 @@ IN_PROC_BROWSER_TEST_F(AutomationMiscBrowserTest, ProcessMouseEvent) { chrome::GetActiveWebContents(browser())->GetRenderViewHost(); ASSERT_TRUE(content::ExecuteJavaScript( view, - L"", - L"window.didClick = false;" - L"document.body.innerHTML =" - L" '<a style=\\'position:absolute; left:0; top:0\\'>link</a>';" - L"document.querySelector('a').addEventListener('click', function() {" - L" window.didClick = true;" - L"}, true);")); + "", + "window.didClick = false;" + "document.body.innerHTML =" + " '<a style=\\'position:absolute; left:0; top:0\\'>link</a>';" + "document.querySelector('a').addEventListener('click', function() {" + " window.didClick = true;" + "}, true);")); AutomationMouseEvent automation_event; automation_event.location_script_chain.push_back( ScriptEvaluationRequest("{'x': 5, 'y': 10}", "")); @@ -100,8 +100,8 @@ IN_PROC_BROWSER_TEST_F(AutomationMiscBrowserTest, ProcessMouseEvent) { bool did_click = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( view, - L"", - L"window.domAutomationController.send(window.didClick);", + "", + "window.domAutomationController.send(window.didClick);", &did_click)); EXPECT_TRUE(did_click); } diff --git a/chrome/browser/automation/automation_tab_helper_browsertest.cc b/chrome/browser/automation/automation_tab_helper_browsertest.cc index 084f9e7e7..d630a49 100644 --- a/chrome/browser/automation/automation_tab_helper_browsertest.cc +++ b/chrome/browser/automation/automation_tab_helper_browsertest.cc @@ -93,7 +93,7 @@ class AutomationTabHelperBrowserTest : public InProcessBrowserTest { chrome::GetActiveWebContents(browser())->GetRenderViewHost(); if (wait_for_response) { ASSERT_TRUE(content::ExecuteJavaScript( - host, L"", ASCIIToWide(script))); + host, "", script)); } else { script += "window.domAutomationController.setAutomationId(0);" "window.domAutomationController.send(0);"; diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index dab20b0..4b37d6c 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -35,24 +35,24 @@ using content::RenderViewHost; namespace { const char kTestingPage[] = "files/keyevents_test.html"; -const wchar_t kSuppressEventJS[] = - L"window.domAutomationController.send(setDefaultAction('%ls', %ls));"; -const wchar_t kGetResultJS[] = - L"window.domAutomationController.send(keyEventResult[%d]);"; -const wchar_t kGetResultLengthJS[] = - L"window.domAutomationController.send(keyEventResult.length);"; -const wchar_t kGetFocusedElementJS[] = - L"window.domAutomationController.send(focusedElement);"; -const wchar_t kSetFocusedElementJS[] = - L"window.domAutomationController.send(setFocusedElement('%ls'));"; -const wchar_t kGetTextBoxValueJS[] = - L"window.domAutomationController.send(" - L"document.getElementById('%ls').value);"; -const wchar_t kSetTextBoxValueJS[] = - L"window.domAutomationController.send(" - L"document.getElementById('%ls').value = '%ls');"; -const wchar_t kStartTestJS[] = - L"window.domAutomationController.send(startTest(%d));"; +const char kSuppressEventJS[] = + "window.domAutomationController.send(setDefaultAction('%ls', %ls));"; +const char kGetResultJS[] = + "window.domAutomationController.send(keyEventResult[%d]);"; +const char kGetResultLengthJS[] = + "window.domAutomationController.send(keyEventResult.length);"; +const char kGetFocusedElementJS[] = + "window.domAutomationController.send(focusedElement);"; +const char kSetFocusedElementJS[] = + "window.domAutomationController.send(setFocusedElement('%ls'));"; +const char kGetTextBoxValueJS[] = + "window.domAutomationController.send(" + " document.getElementById('%ls').value);"; +const char kSetTextBoxValueJS[] = + "window.domAutomationController.send(" + " document.getElementById('%ls').value = '%ls');"; +const char kStartTestJS[] = + "window.domAutomationController.send(startTest(%d));"; // Maximum lenght of the result array in KeyEventTestData structure. const size_t kMaxResultLength = 10; @@ -148,7 +148,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { bool actual; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), - L"", + "", base::StringPrintf(kSuppressEventJS, type, GetBoolString(!suppress)), &actual)); ASSERT_EQ(!suppress, actual); @@ -174,7 +174,9 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt( chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), - L"", kGetResultLengthJS, length)); + "", + kGetResultLengthJS, + length)); } void CheckResult(int tab_index, int length, const char* const result[]) { @@ -186,7 +188,9 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { std::string actual; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), - L"", base::StringPrintf(kGetResultJS, i), &actual)); + "", + base::StringPrintf(kGetResultJS, i), + &actual)); // If more events were received than expected, then the additional events // must be keyup events. @@ -202,7 +206,9 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { std::string actual; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), - L"", kGetFocusedElementJS, &actual)); + "", + kGetFocusedElementJS, + &actual)); ASSERT_EQ(WideToUTF8(focused), actual); } @@ -211,7 +217,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { bool actual; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), - L"", + "", base::StringPrintf(kSetFocusedElementJS, focused), &actual)); ASSERT_TRUE(actual); @@ -223,7 +229,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { std::string actual; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), - L"", + "", base::StringPrintf(kGetTextBoxValueJS, id), &actual)); ASSERT_EQ(WideToUTF8(value), actual); @@ -235,7 +241,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { std::string actual; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), - L"", + "", base::StringPrintf(kSetTextBoxValueJS, id, value), &actual)); ASSERT_EQ(WideToUTF8(value), actual); @@ -246,7 +252,9 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { bool actual; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), - L"", base::StringPrintf(kStartTestJS, result_length), &actual)); + "", + base::StringPrintf(kStartTestJS, result_length), + &actual)); ASSERT_TRUE(actual); } diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc index a97316d..3d34b75 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc @@ -43,12 +43,14 @@ class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest { BrowserThread::IO, FROM_HERE, base::Bind(&SetUrlRequestMock, path)); } - void RunScriptAndCheckResult(const std::wstring& script, + void RunScriptAndCheckResult(const std::string& script, const std::string& result) { std::string data; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - script, &data)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + script, + &data)); ASSERT_EQ(data, result); } @@ -101,16 +103,16 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Database) { FilePath().AppendASCII("simple_database.html"))); ui_test_utils::NavigateToURL(browser(), url); - RunScriptAndCheckResult(L"createTable()", "done"); - RunScriptAndCheckResult(L"insertRecord('text')", "done"); - RunScriptAndCheckResult(L"getRecords()", "text"); + RunScriptAndCheckResult("createTable()", "done"); + RunScriptAndCheckResult("insertRecord('text')", "done"); + RunScriptAndCheckResult("getRecords()", "text"); RemoveAndWait(BrowsingDataRemover::REMOVE_SITE_DATA); ui_test_utils::NavigateToURL(browser(), url); - RunScriptAndCheckResult(L"createTable()", "done"); - RunScriptAndCheckResult(L"insertRecord('text2')", "done"); - RunScriptAndCheckResult(L"getRecords()", "text2"); + RunScriptAndCheckResult("createTable()", "done"); + RunScriptAndCheckResult("insertRecord('text2')", "done"); + RunScriptAndCheckResult("getRecords()", "text2"); } // Profile::ClearNetworkingHistorySince should be exercised here too see whether diff --git a/chrome/browser/chrome_switches_browsertest.cc b/chrome/browser/chrome_switches_browsertest.cc index 8399eda..371d3124 100644 --- a/chrome/browser/chrome_switches_browsertest.cc +++ b/chrome/browser/chrome_switches_browsertest.cc @@ -41,8 +41,8 @@ IN_PROC_BROWSER_TEST_F(HostRulesTest, TestMap) { std::string html; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(document.body.outerHTML);", + "", + "window.domAutomationController.send(document.body.outerHTML);", &html)); EXPECT_STREQ("<body></body>", html.c_str()); 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( diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index 6a73eca..0f40d9e 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -100,18 +100,17 @@ void RunTestFunction(DevToolsWindow* window, const char* test_name) { ASSERT_TRUE( content::ExecuteJavaScriptAndExtractString( window->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(" - L"'' + (window.uiTests && (typeof uiTests.runTest)));", + "", + "window.domAutomationController.send(" + " '' + (window.uiTests && (typeof uiTests.runTest)));", &result)); if (result == "function") { ASSERT_TRUE( content::ExecuteJavaScriptAndExtractString( window->GetRenderViewHost(), - L"", - UTF8ToWide(base::StringPrintf("uiTests.runTest('%s')", - test_name)), + "", + base::StringPrintf("uiTests.runTest('%s')", test_name), &result)); EXPECT_EQ("[OK]", result); } else { @@ -533,9 +532,9 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) { ASSERT_TRUE( content::ExecuteJavaScriptAndExtractString( window_->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(" - L"'' + (window.uiTests && (typeof uiTests.runTest)));", + "", + "window.domAutomationController.send(" + " '' + (window.uiTests && (typeof uiTests.runTest)));", &result)); ASSERT_EQ("function", result) << "DevTools front-end is broken."; CloseDevToolsWindow(); diff --git a/chrome/browser/do_not_track_browsertest.cc b/chrome/browser/do_not_track_browsertest.cc index 1da7ef3..a133f8e 100644 --- a/chrome/browser/do_not_track_browsertest.cc +++ b/chrome/browser/do_not_track_browsertest.cc @@ -67,8 +67,8 @@ IN_PROC_BROWSER_TEST_F(DoNotTrackTest, DOMProperty) { std::string do_not_track; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - std::wstring(), - L"window.domAutomationController.send(navigator.doNotTrack)", + "", + "window.domAutomationController.send(navigator.doNotTrack)", &do_not_track)); EXPECT_EQ("1", do_not_track); @@ -78,9 +78,9 @@ IN_PROC_BROWSER_TEST_F(DoNotTrackTest, DOMProperty) { EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - std::wstring(), - L"window.domAutomationController.send(" - L"navigator.doNotTrack === null ? '0' : '1')", + "", + "window.domAutomationController.send(" + " navigator.doNotTrack === null ? '0' : '1')", &do_not_track)); EXPECT_EQ("0", do_not_track); } diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 22eebc0..5333bac 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -998,8 +998,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadResourceThrottleCancels) { bool download_assempted; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(startDownload());", + "", + "window.domAutomationController.send(startDownload());", &download_assempted)); ASSERT_TRUE(download_assempted); observer.WaitForObservation( @@ -1427,8 +1427,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, ChromeURLAfterDownload) { bool webui_responded = false; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( contents->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(window.webui_responded_);", + "", + "window.domAutomationController.send(window.webui_responded_);", &webui_responded)); EXPECT_TRUE(webui_responded); } @@ -1447,9 +1447,9 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, BrowserCloseAfterDownload) { bool result = false; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( contents->GetRenderViewHost(), - L"", - L"window.onunload = function() { var do_nothing = 0; }; " - L"window.domAutomationController.send(true);", + "", + "window.onunload = function() { var do_nothing = 0; }; " + "window.domAutomationController.send(true);", &result)); EXPECT_TRUE(result); diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc index 1ffb3ca..6b01236 100644 --- a/chrome/browser/extensions/api/management/management_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_browsertest.cc @@ -56,7 +56,7 @@ class ExtensionManagementTest : public ExtensionBrowserTest { std::string version_from_bg; bool exec = content::ExecuteJavaScriptAndExtractString( - ext_host->render_view_host(), L"", L"version()", &version_from_bg); + ext_host->render_view_host(), "", "version()", &version_from_bg); EXPECT_TRUE(exec); if (!exec) return false; diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc index cf0d3ba..ada42b5 100644 --- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc @@ -192,8 +192,9 @@ void ExtensionWebRequestApiTest::RunPermissionTest( std::string body; WebContents* tab = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - tab->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.body.textContent)", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.body.textContent)", &body)); EXPECT_EQ(expected_content_regular_window, body); @@ -213,8 +214,9 @@ void ExtensionWebRequestApiTest::RunPermissionTest( body.clear(); WebContents* otr_tab = chrome::GetActiveWebContents(otr_browser); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - otr_tab->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.body.textContent)", + otr_tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.body.textContent)", &body)); EXPECT_EQ(exptected_content_incognito_window, body); } diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index d85b04c..241ad9d 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -225,8 +225,9 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) { chrome::GetWebContentsAt(browser(), 6)->GetRenderProcessHost()); bool windowOpenerValid = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - chrome::GetWebContentsAt(browser(), 6)->GetRenderViewHost(), L"", - L"window.domAutomationController.send(window.opener != null)", + chrome::GetWebContentsAt(browser(), 6)->GetRenderViewHost(), + "", + "window.domAutomationController.send(window.opener != null)", &windowOpenerValid)); ASSERT_TRUE(windowOpenerValid); @@ -435,7 +436,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) { content::Source<NavigationController>( &chrome::GetActiveWebContents(browser())->GetController())); ASSERT_TRUE(content::ExecuteJavaScript(contents->GetRenderViewHost(), - L"", L"location.reload();")); + "", "location.reload();")); js_reload_observer.Wait(); EXPECT_TRUE(process_map->Contains( contents->GetRenderProcessHost()->GetID())); @@ -447,7 +448,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) { content::Source<NavigationController>( &chrome::GetActiveWebContents(browser())->GetController())); ASSERT_TRUE(content::ExecuteJavaScript(contents->GetRenderViewHost(), - L"", L"location = location;")); + "", "location = location;")); js_reload_observer2.Wait(); EXPECT_FALSE(process_map->Contains( contents->GetRenderProcessHost()->GetID())); @@ -556,8 +557,9 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromExtension) { // App has loaded, and chrome.app.isInstalled should be true. bool is_installed = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(chrome.app.isInstalled)", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(chrome.app.isInstalled)", &is_installed)); ASSERT_TRUE(is_installed); } @@ -625,8 +627,9 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) { contents->GetRenderProcessHost()->GetID())); bool is_installed = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(chrome.app.isInstalled)", + contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(chrome.app.isInstalled)", &is_installed)); ASSERT_TRUE(is_installed); @@ -639,8 +642,9 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) { chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(chrome.app.isInstalled)", + contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(chrome.app.isInstalled)", &is_installed)); ASSERT_TRUE(is_installed); } diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc index bef3c76..36c9ec8 100644 --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc @@ -27,41 +27,41 @@ using extensions::Extension; class ChromeAppAPITest : public ExtensionBrowserTest { protected: - bool IsAppInstalled() { return IsAppInstalled(L""); } - bool IsAppInstalled(const std::wstring& frame_xpath) { - std::wstring get_app_is_installed = - L"window.domAutomationController.send(window.chrome.app.isInstalled);"; + bool IsAppInstalled() { return IsAppInstalled(""); } + bool IsAppInstalled(const char* frame_xpath) { + const char kGetAppIsInstalled[] = + "window.domAutomationController.send(window.chrome.app.isInstalled);"; bool result; CHECK( content::ExecuteJavaScriptAndExtractBool( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - frame_xpath, get_app_is_installed, &result)); + frame_xpath, kGetAppIsInstalled, &result)); return result; } - std::string InstallState() { return InstallState(L""); } - std::string InstallState(const std::wstring& frame_xpath) { - std::wstring get_app_install_state = - L"window.chrome.app.installState(" - L"function(s) { window.domAutomationController.send(s); });"; + std::string InstallState() { return InstallState(""); } + std::string InstallState(const char* frame_xpath) { + const char kGetAppInstallState[] = + "window.chrome.app.installState(" + " function(s) { window.domAutomationController.send(s); });"; std::string result; CHECK( content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - frame_xpath, get_app_install_state, &result)); + frame_xpath, kGetAppInstallState, &result)); return result; } - std::string RunningState() { return RunningState(L""); } - std::string RunningState(const std::wstring& frame_xpath) { - std::wstring get_app_install_state = - L"window.domAutomationController.send(" - L"window.chrome.app.runningState());"; + std::string RunningState() { return RunningState(""); } + std::string RunningState(const char* frame_xpath) { + const char kGetAppRunningState[] = + "window.domAutomationController.send(" + " window.chrome.app.runningState());"; std::string result; CHECK( content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - frame_xpath, get_app_install_state, &result)); + frame_xpath, kGetAppRunningState, &result)); return result; } @@ -108,14 +108,16 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) { EXPECT_FALSE(IsAppInstalled()); // Test that a non-app page returns null for chrome.app.getDetails(). - std::wstring get_app_details = - L"window.domAutomationController.send(" - L" JSON.stringify(window.chrome.app.getDetails()));"; + const char kGetAppDetails[] = + "window.domAutomationController.send(" + " JSON.stringify(window.chrome.app.getDetails()));"; std::string result; ASSERT_TRUE( content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", get_app_details, &result)); + "", + kGetAppDetails, + &result)); EXPECT_EQ("null", result); // Check that an app page has chrome.app.isInstalled = true. @@ -128,7 +130,9 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) { ASSERT_TRUE( content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", get_app_details, &result)); + "", + kGetAppDetails, + &result)); scoped_ptr<DictionaryValue> app_details( static_cast<DictionaryValue*>(base::JSONReader::Read(result))); // extension->manifest() does not contain the id. @@ -141,19 +145,19 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) { ASSERT_TRUE( content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(" - L" function() {" - L" var value = window.chrome.app.isInstalled;" - L" window.chrome.app.isInstalled = !value;" - L" if (window.chrome.app.isInstalled == value) {" - L" return 'true';" - L" } else {" - L" return 'false';" - L" }" - L" }()" - L");", - &result)); + "", + "window.domAutomationController.send(" + " function() {" + " var value = window.chrome.app.isInstalled;" + " window.chrome.app.isInstalled = !value;" + " if (window.chrome.app.isInstalled == value) {" + " return 'true';" + " } else {" + " return 'false';" + " }" + " }()" + ");", + &result)); // Should not be able to alter window.chrome.app.isInstalled from javascript"; EXPECT_EQ("true", result); @@ -186,26 +190,30 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, GetDetailsForFrame) { // Test that normal pages (even apps) cannot use getDetailsForFrame(). ui_test_utils::NavigateToURL(browser(), app_url); - std::wstring test_unsuccessful_access = - L"window.domAutomationController.send(window.testUnsuccessfulAccess())"; + const char kTestUnsuccessfulAccess[] = + "window.domAutomationController.send(window.testUnsuccessfulAccess())"; bool result = false; ASSERT_TRUE( content::ExecuteJavaScriptAndExtractBool( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", test_unsuccessful_access, &result)); + "", + kTestUnsuccessfulAccess, + &result)); EXPECT_TRUE(result); // Test that checkout can use getDetailsForFrame() and that it works // correctly. ui_test_utils::NavigateToURL(browser(), checkout_url); - std::wstring get_details_for_frame = - L"window.domAutomationController.send(" - L" JSON.stringify(chrome.app.getDetailsForFrame(frames[0])))"; + const char kGetDetailsForFrame[] = + "window.domAutomationController.send(" + " JSON.stringify(chrome.app.getDetailsForFrame(frames[0])))"; std::string json; ASSERT_TRUE( content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", get_details_for_frame, &json)); + "", + kGetDetailsForFrame, + &json)); scoped_ptr<DictionaryValue> app_details( static_cast<DictionaryValue*>(base::JSONReader::Read(json))); @@ -276,9 +284,9 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningState) { EXPECT_EQ("cannot_run", RunningState()); EXPECT_FALSE(IsAppInstalled()); - EXPECT_EQ("installed", InstallState(L"//html/iframe[1]")); - EXPECT_EQ("cannot_run", RunningState(L"//html/iframe[1]")); - EXPECT_FALSE(IsAppInstalled(L"//html/iframe[1]")); + EXPECT_EQ("installed", InstallState("//html/iframe[1]")); + EXPECT_EQ("cannot_run", RunningState("//html/iframe[1]")); + EXPECT_FALSE(IsAppInstalled("//html/iframe[1]")); } @@ -304,7 +312,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningStateFrame) { // within an app. ui_test_utils::NavigateToURL(browser(), app_url); - EXPECT_EQ("not_installed", InstallState(L"//html/iframe[1]")); - EXPECT_EQ("cannot_run", RunningState(L"//html/iframe[1]")); - EXPECT_FALSE(IsAppInstalled(L"//html/iframe[1]")); + EXPECT_EQ("not_installed", InstallState("//html/iframe[1]")); + EXPECT_EQ("cannot_run", RunningState("//html/iframe[1]")); + EXPECT_FALSE(IsAppInstalled("//html/iframe[1]")); } diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index 0d1c8500..1adc67d 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.cc @@ -124,10 +124,11 @@ IN_PROC_BROWSER_TEST_F( // And check that its styles were affected by the styles that just got loaded. bool styles_injected; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(" - L"document.defaultView.getComputedStyle(document.body, null)." - L"getPropertyValue('background-color') == 'rgb(255, 0, 0)')", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(" + " document.defaultView.getComputedStyle(document.body, null)." + " getPropertyValue('background-color') == 'rgb(255, 0, 0)')", &styles_injected)); ASSERT_TRUE(styles_injected); } diff --git a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc index fd8239d..c451f23 100644 --- a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc +++ b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc @@ -28,7 +28,8 @@ IN_PROC_BROWSER_TEST_F(CalculatorBrowserTest, Model) { bool success; bool executed = content::ExecuteJavaScriptAndExtractBool( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", L"window.domAutomationController.send(window.runTests().success)", + "", + "window.domAutomationController.send(window.runTests().success)", &success); ASSERT_TRUE(executed); diff --git a/chrome/browser/extensions/extension_bindings_apitest.cc b/chrome/browser/extensions/extension_bindings_apitest.cc index 1d5428c..75d2aeb 100644 --- a/chrome/browser/extensions/extension_bindings_apitest.cc +++ b/chrome/browser/extensions/extension_bindings_apitest.cc @@ -32,6 +32,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, LastError) { bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - host->render_view_host(), L"", L"testLastError()", &result)); + host->render_view_host(), "", "testLastError()", &result)); EXPECT_TRUE(result); } diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index f53505a..7c772f4 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -553,8 +553,9 @@ void ExtensionBrowserTest::OpenWindow(content::WebContents* contents, content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); ASSERT_TRUE(content::ExecuteJavaScript( - contents->GetRenderViewHost(), L"", - L"window.open('" + UTF8ToWide(url.spec()) + L"');")); + contents->GetRenderViewHost(), + "", + "window.open('" + url.spec() + "');")); // The above window.open call is not user-initiated, so it will create // a popup window instead of a new tab in current window. @@ -581,11 +582,12 @@ void ExtensionBrowserTest::NavigateInRenderer(content::WebContents* contents, content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - contents->GetRenderViewHost(), L"", - L"window.addEventListener('unload', function() {" - L" window.domAutomationController.send(true);" - L"}, false);" - L"window.location = '" + UTF8ToWide(url.spec()) + L"';", + contents->GetRenderViewHost(), + "", + "window.addEventListener('unload', function() {" + " window.domAutomationController.send(true);" + "}, false);" + "window.location = '" + url.spec() + "';", &result)); ASSERT_TRUE(result); observer.Wait(); diff --git a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc index 345e5a3..da8aa3c 100644 --- a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc +++ b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc @@ -22,7 +22,7 @@ class ClipboardApiTest : public ExtensionApiTest { bool ExecutePasteInSelectedTab(bool* result); private: - bool ExecuteScriptInSelectedTab(const std::wstring& script, bool* result); + bool ExecuteScriptInSelectedTab(const std::string& script, bool* result); }; bool ClipboardApiTest::LoadHostedApp(const std::string& app_name, @@ -54,22 +54,22 @@ bool ClipboardApiTest::LoadHostedApp(const std::string& app_name, } bool ClipboardApiTest::ExecuteCopyInSelectedTab(bool* result) { - const wchar_t kScript[] = - L"window.domAutomationController.send(document.execCommand('copy'))"; + const char kScript[] = + "window.domAutomationController.send(document.execCommand('copy'))"; return ExecuteScriptInSelectedTab(kScript, result); } bool ClipboardApiTest::ExecutePasteInSelectedTab(bool* result) { - const wchar_t kScript[] = - L"window.domAutomationController.send(document.execCommand('paste'))"; + const char kScript[] = + "window.domAutomationController.send(document.execCommand('paste'))"; return ExecuteScriptInSelectedTab(kScript, result); } -bool ClipboardApiTest::ExecuteScriptInSelectedTab(const std::wstring& script, +bool ClipboardApiTest::ExecuteScriptInSelectedTab(const std::string& script, bool* result) { if (!content::ExecuteJavaScriptAndExtractBool( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", + "", script, result)) { message_ = "Failed to execute script in selected tab."; 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"); } diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc index 694c3c6..df2b400 100644 --- a/chrome/browser/extensions/extension_incognito_apitest.cc +++ b/chrome/browser/extensions/extension_incognito_apitest.cc @@ -37,8 +37,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoNoScript) { // Verify the script didn't run. bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title == 'Unmodified')", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title == 'Unmodified')", &result)); EXPECT_TRUE(result); } @@ -72,8 +73,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoYesScript) { // Verify the script ran. bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title == 'modified')", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title == 'modified')", &result)); EXPECT_TRUE(result); } diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc index fd04a81..32ed8a0 100644 --- a/chrome/browser/extensions/extension_keybinding_apitest.cc +++ b/chrome/browser/extensions/extension_keybinding_apitest.cc @@ -90,10 +90,11 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, Basic) { // Verify the command worked. bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", - L"setInterval(function(){" - L" if(document.body.bgColor == 'red'){" - L" window.domAutomationController.send(true)}}, 100)", + tab->GetRenderViewHost(), + "", + "setInterval(function(){" + " if(document.body.bgColor == 'red'){" + " window.domAutomationController.send(true)}}, 100)", &result)); ASSERT_TRUE(result); @@ -103,10 +104,11 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, Basic) { result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", - L"setInterval(function(){" - L" if(document.body.bgColor == 'blue'){" - L" window.domAutomationController.send(true)}}, 100)", + tab->GetRenderViewHost(), + "", + "setInterval(function(){" + " if(document.body.bgColor == 'blue'){" + " window.domAutomationController.send(true)}}, 100)", &result)); ASSERT_TRUE(result); } @@ -150,10 +152,11 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_PageAction) { WebContents* tab = chrome::GetActiveWebContents(browser()); bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", - L"setInterval(function(){" - L" if(document.body.bgColor == 'red'){" - L" window.domAutomationController.send(true)}}, 100)", + tab->GetRenderViewHost(), + "", + "setInterval(function(){" + " if(document.body.bgColor == 'red'){" + " window.domAutomationController.send(true)}}, 100)", &result)); ASSERT_TRUE(result); } diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index 3e910ac..2939278 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -103,12 +103,14 @@ class NaClExtensionTest : public ExtensionBrowserTest { bool content_handler_plugin_created = false; WebContents* web_contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - web_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(EmbeddedPluginCreated());", + web_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(EmbeddedPluginCreated());", &embedded_plugin_created)); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - web_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(ContentHandlerPluginCreated());", + web_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(ContentHandlerPluginCreated());", &content_handler_plugin_created)); EXPECT_EQ(should_create, embedded_plugin_created); diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc index cb4c481..3c63403 100644 --- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc +++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc @@ -51,9 +51,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { browser(), web_resource.ReplaceComponents(make_host_a_com)); std::string result; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", - &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", + &result)); EXPECT_EQ(result, "Loaded"); // A web host that loads a non-existent extension. @@ -63,9 +64,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { "non_existent_extension.html")); ui_test_utils::NavigateToURL(browser(), non_existent_extension); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", - &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", + &result)); EXPECT_EQ(result, "Image failed to load"); // A data URL. Data URLs should always be able to load chrome-extension:// @@ -77,8 +79,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { ui_test_utils::NavigateToURL(browser(), GURL(std::string("data:text/html;charset=utf-8,") + file_source)); 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"); @@ -93,8 +96,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { browser(), GURL("chrome-extension://pbkkcbgdkliohhfaeefcijaghglkahja/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"); } @@ -157,9 +161,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, "web_accessible/accessible_resource.html")); ui_test_utils::NavigateToURL(browser(), accessible_resource); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", - &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", + &result)); EXPECT_EQ("Loaded", result); GURL xhr_accessible_resource( @@ -169,9 +174,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, ui_test_utils::NavigateToURL( browser(), xhr_accessible_resource); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", - &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", + &result)); EXPECT_EQ("XHR completed with status: 200", result); GURL xhr_inaccessible_resource( @@ -181,9 +187,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, ui_test_utils::NavigateToURL( browser(), xhr_inaccessible_resource); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", - &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", + &result)); EXPECT_EQ("XHR failed to load resource", result); GURL nonaccessible_resource( @@ -192,9 +199,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, "web_accessible/nonaccessible_resource.html")); ui_test_utils::NavigateToURL(browser(), nonaccessible_resource); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", - &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", + &result)); EXPECT_EQ("Image failed to load", result); GURL nonexistent_resource( @@ -203,9 +211,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, "web_accessible/nonexistent_resource.html")); ui_test_utils::NavigateToURL(browser(), nonexistent_resource); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", - &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", + &result)); EXPECT_EQ("Image failed to load", result); GURL nonaccessible_cer_resource( @@ -214,9 +223,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, "web_accessible/nonaccessible_chrome_resource_scheme.html")); ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", - &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", + &result)); EXPECT_EQ("Loading CER:// failed.", result); GURL newtab_page("chrome://newtab"); @@ -228,9 +238,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( browser(), accessible_newtab_override, 2); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", - &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", + &result)); EXPECT_EQ("New Tab Page Loaded Successfully", result); } @@ -248,9 +259,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, "web_accessible/accessible_resource_with_csp.html")); ui_test_utils::NavigateToURL(browser(), accessible_resource_with_csp); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", - &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title)", + &result)); EXPECT_EQ("Loaded", result); } diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index 52b4680..ce09e05 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -127,17 +127,19 @@ class ExtensionStartupTestBase : public InProcessBrowserTest { bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(" - L"document.defaultView.getComputedStyle(document.body, null)." - L"getPropertyValue('background-color') == 'rgb(245, 245, 220)')", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(" + "document.defaultView.getComputedStyle(document.body, null)." + "getPropertyValue('background-color') == 'rgb(245, 245, 220)')", &result)); EXPECT_EQ(expect_css, result); result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title == 'Modified')", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "window.domAutomationController.send(document.title == 'Modified')", &result)); EXPECT_EQ(expect_script, result); } diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc index de74087..04460e3 100644 --- a/chrome/browser/extensions/isolated_app_browsertest.cc +++ b/chrome/browser/extensions/isolated_app_browsertest.cc @@ -30,10 +30,9 @@ using content::RenderViewHost; namespace { -std::wstring WrapForJavascriptAndExtract( - const wchar_t* javascript_expression) { - return std::wstring(L"window.domAutomationController.send(") + - javascript_expression + L")"; +std::string WrapForJavascriptAndExtract(const char* javascript_expression) { + return std::string("window.domAutomationController.send(") + + javascript_expression + ")"; } class IsolatedAppTest : public ExtensionBrowserTest { @@ -127,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) { std::string script = base::StringPrintf( "document.location.href=\"%s\";", base_url.Resolve("app2/main.html").spec().c_str()); - EXPECT_TRUE(ExecuteJavaScript(rvh, L"", ASCIIToWide(script))); + EXPECT_TRUE(ExecuteJavaScript(rvh, "", script)); observer1.Wait(); // This kind of navigation should not replace previous navigation entry. @@ -183,25 +182,26 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CookieIsolation) { RenderViewHost* app2_rvh = tab1->GetRenderViewHost(); RenderViewHost* non_app_rvh = tab2->GetRenderViewHost(); ASSERT_TRUE(ExecuteJavaScript( - app1_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app1');")); + app1_rvh, "", "window.localStorage.setItem('testdata', 'ls_app1');")); ASSERT_TRUE(ExecuteJavaScript( - app2_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app2');")); + app2_rvh, "", "window.localStorage.setItem('testdata', 'ls_app2');")); ASSERT_TRUE(ExecuteJavaScript( - non_app_rvh, L"", - L"window.localStorage.setItem('testdata', 'ls_normal');")); + non_app_rvh, + "", + "window.localStorage.setItem('testdata', 'ls_normal');")); - const std::wstring& kRetrieveLocalStorage = + const std::string& kRetrieveLocalStorage = WrapForJavascriptAndExtract( - L"window.localStorage.getItem('testdata') || 'badval'"); + "window.localStorage.getItem('testdata') || 'badval'"); std::string result; ASSERT_TRUE(ExecuteJavaScriptAndExtractString( - app1_rvh, L"", kRetrieveLocalStorage.c_str(), &result)); + app1_rvh, "", kRetrieveLocalStorage.c_str(), &result)); EXPECT_EQ("ls_app1", result); ASSERT_TRUE(ExecuteJavaScriptAndExtractString( - app2_rvh, L"", kRetrieveLocalStorage.c_str(), &result)); + app2_rvh, "", kRetrieveLocalStorage.c_str(), &result)); EXPECT_EQ("ls_app2", result); ASSERT_TRUE(ExecuteJavaScriptAndExtractString( - non_app_rvh, L"", kRetrieveLocalStorage.c_str(), &result)); + non_app_rvh, "", kRetrieveLocalStorage.c_str(), &result)); EXPECT_EQ("ls_normal", result); // Check that each tab sees its own cookie. @@ -288,24 +288,25 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_NoCookieIsolationWithoutApp) { RenderViewHost* non_app_rvh = chrome::GetWebContentsAt(browser(), 2)->GetRenderViewHost(); ASSERT_TRUE(ExecuteJavaScript( - app1_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app1');")); + app1_rvh, "", "window.localStorage.setItem('testdata', 'ls_app1');")); ASSERT_TRUE(ExecuteJavaScript( - app2_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app2');")); + app2_rvh, "", "window.localStorage.setItem('testdata', 'ls_app2');")); ASSERT_TRUE(ExecuteJavaScript( - non_app_rvh, L"", - L"window.localStorage.setItem('testdata', 'ls_normal');")); + non_app_rvh, + "", + "window.localStorage.setItem('testdata', 'ls_normal');")); - const std::wstring& kRetrieveLocalStorage = - WrapForJavascriptAndExtract(L"window.localStorage.getItem('testdata')"); + const std::string& kRetrieveLocalStorage = + WrapForJavascriptAndExtract("window.localStorage.getItem('testdata')"); std::string result; ASSERT_TRUE(ExecuteJavaScriptAndExtractString( - app1_rvh, L"", kRetrieveLocalStorage.c_str(), &result)); + app1_rvh, "", kRetrieveLocalStorage.c_str(), &result)); EXPECT_EQ("ls_normal", result); ASSERT_TRUE(ExecuteJavaScriptAndExtractString( - app2_rvh, L"", kRetrieveLocalStorage.c_str(), &result)); + app2_rvh, "", kRetrieveLocalStorage.c_str(), &result)); EXPECT_EQ("ls_normal", result); ASSERT_TRUE(ExecuteJavaScriptAndExtractString( - non_app_rvh, L"", kRetrieveLocalStorage.c_str(), &result)); + non_app_rvh, "", kRetrieveLocalStorage.c_str(), &result)); EXPECT_EQ("ls_normal", result); } @@ -455,37 +456,37 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_SessionStorage) { CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); ASSERT_TRUE(ExecuteJavaScript( chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(), - L"", - L"window.sessionStorage.setItem('testdata', 'ss_app1');")); + "", + "window.sessionStorage.setItem('testdata', 'ss_app1');")); ui_test_utils::NavigateToURLWithDisposition( browser(), base_url.Resolve("app2/main.html"), CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); ASSERT_TRUE(ExecuteJavaScript( chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(), - L"", - L"window.sessionStorage.setItem('testdata', 'ss_app2');")); + "", + "window.sessionStorage.setItem('testdata', 'ss_app2');")); ui_test_utils::NavigateToURLWithDisposition( browser(), base_url.Resolve("non_app/main.html"), CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); ASSERT_TRUE(ExecuteJavaScript( chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(), - L"", - L"window.sessionStorage.setItem('testdata', 'ss_normal');")); + "", + "window.sessionStorage.setItem('testdata', 'ss_normal');")); // Now, ensure that the sessionStorage is correctly partitioned, and persists // when we navigate around all over the dang place. - const std::wstring& kRetrieveSessionStorage = + const std::string& kRetrieveSessionStorage = WrapForJavascriptAndExtract( - L"window.sessionStorage.getItem('testdata') || 'badval'"); + "window.sessionStorage.getItem('testdata') || 'badval'"); std::string result; ui_test_utils::NavigateToURLWithDisposition( browser(), base_url.Resolve("app1/main.html"), CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); ASSERT_TRUE(ExecuteJavaScriptAndExtractString( chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(), - L"", kRetrieveSessionStorage.c_str(), &result)); + "", kRetrieveSessionStorage.c_str(), &result)); EXPECT_EQ("ss_app1", result); ui_test_utils::NavigateToURLWithDisposition( @@ -493,7 +494,7 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_SessionStorage) { CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); ASSERT_TRUE(ExecuteJavaScriptAndExtractString( chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(), - L"", kRetrieveSessionStorage.c_str(), &result)); + "", kRetrieveSessionStorage.c_str(), &result)); EXPECT_EQ("ss_app2", result); ui_test_utils::NavigateToURLWithDisposition( @@ -501,6 +502,6 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_SessionStorage) { CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); ASSERT_TRUE(ExecuteJavaScriptAndExtractString( chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(), - L"", kRetrieveSessionStorage.c_str(), &result)); + "", kRetrieveSessionStorage.c_str(), &result)); EXPECT_EQ("ss_normal", result); } diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index f505316..db0c2a9 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -256,7 +256,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, WaitForRequest) { // Abort the request. bool result = false; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( - host->render_view_host(), std::wstring(), L"abortRequest()", &result)); + host->render_view_host(), "", "abortRequest()", &result)); EXPECT_TRUE(result); page_complete.Wait(); diff --git a/chrome/browser/extensions/options_page_apitest.cc b/chrome/browser/extensions/options_page_apitest.cc index 1a69328..a62f03c 100644 --- a/chrome/browser/extensions/options_page_apitest.cc +++ b/chrome/browser/extensions/options_page_apitest.cc @@ -16,13 +16,13 @@ using extensions::Extension; // Used to simulate a click on the first button named 'Options'. -static const wchar_t* jscript_click_option_button = - L"(function() { " - L" var button = document.evaluate(\"//button[text()='Options']\"," - L" document, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE," - L" null).snapshotItem(0);" - L" button.click();" - L"})();"; +static const char kScriptClickOptionButton[] = + "(function() { " + " var button = document.evaluate(\"//button[text()='Options']\"," + " document, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE," + " null).snapshotItem(0);" + " button.click();" + "})();"; // Test that an extension with an options page makes an 'Options' button appear // on chrome://extensions, and that clicking the button opens a new tab with the @@ -41,8 +41,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_OptionsPage) { ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIExtensionsURL)); TabStripModel* tab_strip = browser()->tab_strip_model(); ASSERT_TRUE(content::ExecuteJavaScript( - tab_strip->GetActiveWebContents()->GetRenderViewHost(), L"", - jscript_click_option_button)); + tab_strip->GetActiveWebContents()->GetRenderViewHost(), + "", + kScriptClickOptionButton)); // If the options page hasn't already come up, wait for it. if (tab_strip->count() == 1) { diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index 163e942..7ea3847 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -48,7 +48,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { // With no extensions, the plugin should not be loaded. bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); + tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); EXPECT_FALSE(result); ExtensionService* service = extensions::ExtensionSystem::Get( @@ -60,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { EXPECT_EQ(size_before + 1, service->extensions()->size()); // Now the plugin should be in the cache. ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); + tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); // We don't allow extension plugins to run on ChromeOS. #if defined(OS_CHROMEOS) EXPECT_FALSE(result); @@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { // Now the plugin should be unloaded, and the page should be broken. ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); + tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); EXPECT_FALSE(result); // If we reload the extension and page, it should work again. @@ -91,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { observer.Wait(); } ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); + tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); // We don't allow extension plugins to run on ChromeOS. #if defined(OS_CHROMEOS) EXPECT_FALSE(result); @@ -125,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) { WebContents* tab = chrome::GetActiveWebContents(browser()); bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); + tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); // We don't allow extension plugins to run on ChromeOS. #if defined(OS_CHROMEOS) EXPECT_FALSE(result); @@ -142,7 +142,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) { browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); + tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); // We don't allow extension plugins to run on ChromeOS. #if defined(OS_CHROMEOS) EXPECT_FALSE(result); @@ -154,6 +154,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) { ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(extension_dir.AppendASCII("test.html"))); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); + tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); EXPECT_FALSE(result); } diff --git a/chrome/browser/extensions/subscribe_page_action_browsertest.cc b/chrome/browser/extensions/subscribe_page_action_browsertest.cc index 396a322..a1f6204 100644 --- a/chrome/browser/extensions/subscribe_page_action_browsertest.cc +++ b/chrome/browser/extensions/subscribe_page_action_browsertest.cc @@ -17,47 +17,47 @@ using extensions::Extension; namespace { -const std::string kSubscribePage = "/subscribe.html"; -const std::string kFeedPageMultiRel = "files/feeds/feed_multi_rel.html"; -const std::string kValidFeedNoLinks = "files/feeds/feed_nolinks.xml"; -const std::string kValidFeed0 = "files/feeds/feed_script.xml"; -const std::string kValidFeed1 = "files/feeds/feed1.xml"; -const std::string kValidFeed2 = "files/feeds/feed2.xml"; -const std::string kValidFeed3 = "files/feeds/feed3.xml"; -const std::string kValidFeed4 = "files/feeds/feed4.xml"; -const std::string kValidFeed5 = "files/feeds/feed5.xml"; -const std::string kValidFeed6 = "files/feeds/feed6.xml"; -const std::string kInvalidFeed1 = "files/feeds/feed_invalid1.xml"; -const std::string kInvalidFeed2 = "files/feeds/feed_invalid2.xml"; +const char kSubscribePage[] = "/subscribe.html"; +const char kFeedPageMultiRel[] = "files/feeds/feed_multi_rel.html"; +const char kValidFeedNoLinks[] = "files/feeds/feed_nolinks.xml"; +const char kValidFeed0[] = "files/feeds/feed_script.xml"; +const char kValidFeed1[] = "files/feeds/feed1.xml"; +const char kValidFeed2[] = "files/feeds/feed2.xml"; +const char kValidFeed3[] = "files/feeds/feed3.xml"; +const char kValidFeed4[] = "files/feeds/feed4.xml"; +const char kValidFeed5[] = "files/feeds/feed5.xml"; +const char kValidFeed6[] = "files/feeds/feed6.xml"; +const char kInvalidFeed1[] = "files/feeds/feed_invalid1.xml"; +const char kInvalidFeed2[] = "files/feeds/feed_invalid2.xml"; // We need a triple encoded string to prove that we are not decoding twice in // subscribe.js because one layer is also stripped off when subscribe.js passes // it to the XMLHttpRequest object. -const std::string kFeedTripleEncoded = "files/feeds/url%25255Fdecoding.html"; - -static const wchar_t* jscript_feed_title = - L"window.domAutomationController.send(" - L" document.getElementById('title') ? " - L" document.getElementById('title').textContent : " - L" \"element 'title' not found\"" - L");"; -static const wchar_t* jscript_anchor = - L"window.domAutomationController.send(" - L" document.getElementById('anchor_0') ? " - L" document.getElementById('anchor_0').textContent : " - L" \"element 'anchor_0' not found\"" - L");"; -static const wchar_t* jscript_desc = - L"window.domAutomationController.send(" - L" document.getElementById('desc_0') ? " - L" document.getElementById('desc_0').textContent : " - L" \"element 'desc_0' not found\"" - L");"; -static const wchar_t* jscript_error = - L"window.domAutomationController.send(" - L" document.getElementById('error') ? " - L" document.getElementById('error').textContent : " - L" \"No error\"" - L");"; +const char kFeedTripleEncoded[] = "files/feeds/url%25255Fdecoding.html"; + +static const char kScriptFeedTitle[] = + "window.domAutomationController.send(" + " document.getElementById('title') ? " + " document.getElementById('title').textContent : " + " \"element 'title' not found\"" + ");"; +static const char kScriptAnchor[] = + "window.domAutomationController.send(" + " document.getElementById('anchor_0') ? " + " document.getElementById('anchor_0').textContent : " + " \"element 'anchor_0' not found\"" + ");"; +static const char kScriptDesc[] = + "window.domAutomationController.send(" + " document.getElementById('desc_0') ? " + " document.getElementById('desc_0').textContent : " + " \"element 'desc_0' not found\"" + ");"; +static const char kScriptError[] = + "window.domAutomationController.send(" + " document.getElementById('error') ? " + " document.getElementById('error').textContent : " + " \"No error\"" + ");"; GURL GetFeedUrl(net::TestServer* server, const std::string& feed_page, bool direct_url, std::string extension_id) { @@ -77,8 +77,8 @@ GURL GetFeedUrl(net::TestServer* server, const std::string& feed_page, } bool ValidatePageElement(WebContents* tab, - const std::wstring& frame, - const std::wstring& javascript, + const std::string& frame, + const std::string& javascript, const std::string& expected_value) { std::string returned_value; std::string error; @@ -86,7 +86,8 @@ bool ValidatePageElement(WebContents* tab, if (!content::ExecuteJavaScriptAndExtractString( tab->GetRenderViewHost(), frame, - javascript, &returned_value)) + javascript, + &returned_value)) return false; EXPECT_STREQ(expected_value.c_str(), returned_value.c_str()); @@ -116,20 +117,20 @@ void NavigateToFeedAndValidate(net::TestServer* server, WebContents* tab = chrome::GetActiveWebContents(browser); ASSERT_TRUE(ValidatePageElement(tab, - L"", - jscript_feed_title, + "", + kScriptFeedTitle, expected_feed_title)); ASSERT_TRUE(ValidatePageElement(tab, - L"//html/body/div/iframe[1]", - jscript_anchor, + "//html/body/div/iframe[1]", + kScriptAnchor, expected_item_title)); ASSERT_TRUE(ValidatePageElement(tab, - L"//html/body/div/iframe[1]", - jscript_desc, + "//html/body/div/iframe[1]", + kScriptDesc, expected_item_desc)); ASSERT_TRUE(ValidatePageElement(tab, - L"//html/body/div/iframe[1]", - jscript_error, + "//html/body/div/iframe[1]", + kScriptError, expected_error)); } diff --git a/chrome/browser/extensions/web_contents_browsertest.cc b/chrome/browser/extensions/web_contents_browsertest.cc index 87d6cf8..04b4357 100644 --- a/chrome/browser/extensions/web_contents_browsertest.cc +++ b/chrome/browser/extensions/web_contents_browsertest.cc @@ -22,8 +22,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WebContents) { bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"testTabsAPI()", &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "testTabsAPI()", + &result)); EXPECT_TRUE(result); // There was a bug where we would crash if we navigated to a page in the same @@ -34,7 +36,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WebContents) { GURL("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/page.html")); result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"testTabsAPI()", &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "testTabsAPI()", + &result)); EXPECT_TRUE(result); } diff --git a/chrome/browser/extensions/web_view_browsertest.cc b/chrome/browser/extensions/web_view_browsertest.cc index 158fc3e..cf39575 100644 --- a/chrome/browser/extensions/web_view_browsertest.cc +++ b/chrome/browser/extensions/web_view_browsertest.cc @@ -193,14 +193,13 @@ class WebViewTest : public extensions::PlatformAppBrowserTest { void ExecuteScriptWaitForTitle(content::WebContents* web_contents, const char* script, const char* title) { - std::wstring js_script = ASCIIToWide(script); string16 expected_title(ASCIIToUTF16(title)); string16 error_title(ASCIIToUTF16("error")); content::TitleWatcher title_watcher(web_contents, expected_title); title_watcher.AlsoWaitForTitle(error_title); EXPECT_TRUE(content::ExecuteJavaScript(web_contents->GetRenderViewHost(), - std::wstring(), js_script)); + "", script)); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); } }; @@ -220,14 +219,14 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, ShimSrcAttribute) { // storage isolation is enforced. IN_PROC_BROWSER_TEST_F(WebViewTest, CookieIsolation) { ASSERT_TRUE(StartTestServer()); - const std::wstring kExpire = - L"var expire = new Date(Date.now() + 24 * 60 * 60 * 1000);"; - std::wstring cookie_script1(kExpire); + const std::string kExpire = + "var expire = new Date(Date.now() + 24 * 60 * 60 * 1000);"; + std::string cookie_script1(kExpire); cookie_script1.append( - L"document.cookie = 'guest1=true; path=/; expires=' + expire + ';';"); - std::wstring cookie_script2(kExpire); + "document.cookie = 'guest1=true; path=/; expires=' + expire + ';';"); + std::string cookie_script2(kExpire); cookie_script2.append( - L"document.cookie = 'guest2=true; path=/; expires=' + expire + ';';"); + "document.cookie = 'guest2=true; path=/; expires=' + expire + ';';"); GURL::Replacements replace_host; std::string host_str("localhost"); // Must stay in scope with replace_host. @@ -250,9 +249,9 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, CookieIsolation) { &named_partition_contents2, NULL, NULL, NULL); EXPECT_TRUE(content::ExecuteJavaScript( - cookie_contents1->GetRenderViewHost(), std::wstring(), cookie_script1)); + cookie_contents1->GetRenderViewHost(), "", cookie_script1)); EXPECT_TRUE(content::ExecuteJavaScript( - cookie_contents2->GetRenderViewHost(), std::wstring(), cookie_script2)); + cookie_contents2->GetRenderViewHost(), "", cookie_script2)); int cookie_size; std::string cookie_value; @@ -288,17 +287,17 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, CookieIsolation) { // but persistent ones maintain state for cookies and HTML5 storage. IN_PROC_BROWSER_TEST_F(WebViewTest, PRE_StoragePersistence) { ASSERT_TRUE(StartTestServer()); - const std::wstring kExpire = - L"var expire = new Date(Date.now() + 24 * 60 * 60 * 1000);"; - std::wstring cookie_script1(kExpire); + const std::string kExpire = + "var expire = new Date(Date.now() + 24 * 60 * 60 * 1000);"; + std::string cookie_script1(kExpire); cookie_script1.append( - L"document.cookie = 'inmemory=true; path=/; expires=' + expire + ';';"); - std::wstring cookie_script2(kExpire); + "document.cookie = 'inmemory=true; path=/; expires=' + expire + ';';"); + std::string cookie_script2(kExpire); cookie_script2.append( - L"document.cookie = 'persist1=true; path=/; expires=' + expire + ';';"); - std::wstring cookie_script3(kExpire); + "document.cookie = 'persist1=true; path=/; expires=' + expire + ';';"); + std::string cookie_script3(kExpire); cookie_script3.append( - L"document.cookie = 'persist2=true; path=/; expires=' + expire + ';';"); + "document.cookie = 'persist2=true; path=/; expires=' + expire + ';';"); // We don't care where the main browser is on this test. GURL blank_url("about:blank"); @@ -322,20 +321,24 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, PRE_StoragePersistence) { // Set the inmemory=true cookie for tags with inmemory partitions. EXPECT_TRUE(content::ExecuteJavaScript( - cookie_contents1->GetRenderViewHost(), std::wstring(), + cookie_contents1->GetRenderViewHost(), + "", cookie_script1)); EXPECT_TRUE(content::ExecuteJavaScript( - named_partition_contents1->GetRenderViewHost(), std::wstring(), + named_partition_contents1->GetRenderViewHost(), + "", cookie_script1)); // For the two different persistent storage partitions, set the // two different cookies so we can check that they aren't comingled below. EXPECT_TRUE(content::ExecuteJavaScript( - persistent_partition_contents1->GetRenderViewHost(), std::wstring(), + persistent_partition_contents1->GetRenderViewHost(), + "", cookie_script2)); EXPECT_TRUE(content::ExecuteJavaScript( - persistent_partition_contents3->GetRenderViewHost(), std::wstring(), + persistent_partition_contents3->GetRenderViewHost(), + "", cookie_script3)); int cookie_size; @@ -444,10 +447,10 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, DOMStorageIsolation) { GURL regular_url = test_server()->GetURL("files/title1.html"); std::string output; - std::wstring get_local_storage(L"window.domAutomationController.send(" - L"window.localStorage.getItem('foo') || 'badval')"); - std::wstring get_session_storage(L"window.domAutomationController.send(" - L"window.sessionStorage.getItem('bar') || 'badval')"); + std::string get_local_storage("window.domAutomationController.send(" + "window.localStorage.getItem('foo') || 'badval')"); + std::string get_session_storage("window.domAutomationController.send(" + "window.sessionStorage.getItem('bar') || 'badval')"); content::WebContents* default_tag_contents1; content::WebContents* default_tag_contents2; @@ -461,65 +464,87 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, DOMStorageIsolation) { // Initialize the storage for the first of the two tags that share a storage // partition. EXPECT_TRUE(content::ExecuteJavaScript( - storage_contents1->GetRenderViewHost(), std::wstring(), - L"initDomStorage('page1')")); + storage_contents1->GetRenderViewHost(), + "", + "initDomStorage('page1')")); // Let's test that the expected values are present in the first tag, as they // will be overwritten once we call the initDomStorage on the second tag. EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - storage_contents1->GetRenderViewHost(), std::wstring(), - get_local_storage.c_str(), &output)); + storage_contents1->GetRenderViewHost(), + "", + get_local_storage.c_str(), + &output)); EXPECT_STREQ("local-page1", output.c_str()); EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - storage_contents1->GetRenderViewHost(), std::wstring(), - get_session_storage.c_str(), &output)); + storage_contents1->GetRenderViewHost(), + "", + get_session_storage.c_str(), + &output)); EXPECT_STREQ("session-page1", output.c_str()); // Now, init the storage in the second tag in the same storage partition, // which will overwrite the shared localStorage. EXPECT_TRUE(content::ExecuteJavaScript( - storage_contents2->GetRenderViewHost(), std::wstring(), - L"initDomStorage('page2')")); + storage_contents2->GetRenderViewHost(), + "", + "initDomStorage('page2')")); // The localStorage value now should reflect the one written through the // second tag. EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - storage_contents1->GetRenderViewHost(), std::wstring(), - get_local_storage.c_str(), &output)); + storage_contents1->GetRenderViewHost(), + "", + get_local_storage.c_str(), + &output)); EXPECT_STREQ("local-page2", output.c_str()); EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - storage_contents2->GetRenderViewHost(), std::wstring(), - get_local_storage.c_str(), &output)); + storage_contents2->GetRenderViewHost(), + "", + get_local_storage.c_str(), + &output)); EXPECT_STREQ("local-page2", output.c_str()); // Session storage is not shared though, as each webview tag has separate // instance, even if they are in the same storage partition. EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - storage_contents1->GetRenderViewHost(), std::wstring(), - get_session_storage.c_str(), &output)); + storage_contents1->GetRenderViewHost(), + "", + get_session_storage.c_str(), + &output)); EXPECT_STREQ("session-page1", output.c_str()); EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - storage_contents2->GetRenderViewHost(), std::wstring(), - get_session_storage.c_str(), &output)); + storage_contents2->GetRenderViewHost(), + "", + get_session_storage.c_str(), + &output)); EXPECT_STREQ("session-page2", output.c_str()); // Also, let's check that the main browser and another tag that doesn't share // the same partition don't have those values stored. EXPECT_TRUE(ExecuteJavaScriptAndExtractString( chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(), - std::wstring(), get_local_storage.c_str(), &output)); + "", + get_local_storage.c_str(), + &output)); EXPECT_STREQ("badval", output.c_str()); EXPECT_TRUE(ExecuteJavaScriptAndExtractString( chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(), - std::wstring(), get_session_storage.c_str(), &output)); + "", + get_session_storage.c_str(), + &output)); EXPECT_STREQ("badval", output.c_str()); EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - default_tag_contents1->GetRenderViewHost(), std::wstring(), - get_local_storage.c_str(), &output)); + default_tag_contents1->GetRenderViewHost(), + "", + get_local_storage.c_str(), + &output)); EXPECT_STREQ("badval", output.c_str()); EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - default_tag_contents1->GetRenderViewHost(), std::wstring(), - get_session_storage.c_str(), &output)); + default_tag_contents1->GetRenderViewHost(), + "", + get_session_storage.c_str(), + &output)); EXPECT_STREQ("badval", output.c_str()); } @@ -548,11 +573,12 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, IndexedDBIsolation) { "readItemIDB complete"); std::string output; - std::wstring get_value( - L"window.domAutomationController.send(getValueIDB() || 'badval')"); + std::string get_value( + "window.domAutomationController.send(getValueIDB() || 'badval')"); EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - storage_contents1->GetRenderViewHost(), std::wstring(), + storage_contents1->GetRenderViewHost(), + "", get_value.c_str(), &output)); EXPECT_STREQ("page1", output.c_str()); @@ -564,7 +590,8 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, IndexedDBIsolation) { ExecuteScriptWaitForTitle(storage_contents2, "readItemIDB(7)", "readItemIDB complete"); EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - storage_contents2->GetRenderViewHost(), std::wstring(), + storage_contents2->GetRenderViewHost(), + "", get_value.c_str(), &output)); EXPECT_STREQ("page1", output.c_str()); @@ -574,22 +601,26 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, IndexedDBIsolation) { ExecuteScriptWaitForTitle(storage_contents2, "readItemIDB(7)", "readItemIDB complete"); EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - storage_contents2->GetRenderViewHost(), std::wstring(), + storage_contents2->GetRenderViewHost(), + "", get_value.c_str(), &output)); EXPECT_STREQ("page2", output.c_str()); // Reset the document title, otherwise the next call will not see a change and // will hang waiting for it. EXPECT_TRUE(content::ExecuteJavaScript( - storage_contents1->GetRenderViewHost(), std::wstring(), - L"document.title = 'foo'")); + storage_contents1->GetRenderViewHost(), + "", + "document.title = 'foo'")); // Read through the first tag to ensure we have the second value. ExecuteScriptWaitForTitle(storage_contents1, "readItemIDB(7)", "readItemIDB complete"); EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - storage_contents1->GetRenderViewHost(), std::wstring(), - get_value.c_str(), &output)); + storage_contents1->GetRenderViewHost(), + "", + get_value.c_str(), + &output)); EXPECT_STREQ("page2", output.c_str()); // Now, let's confirm there is no database in the main browser and another @@ -598,12 +629,12 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, IndexedDBIsolation) { // if it is not found. The two tags use database version 3, so we avoid // ambiguity. const char* script = - "indexedDB.open('isolation').onsuccess = function(e) {" - " if (e.target.result.version == 1)" - " document.title = 'db not found';" - " else " - " document.title = 'error';" - "}"; + "indexedDB.open('isolation').onsuccess = function(e) {" + " if (e.target.result.version == 1)" + " document.title = 'db not found';" + " else " + " document.title = 'error';" + "}"; ExecuteScriptWaitForTitle(chrome::GetWebContentsAt(browser(), 0), script, "db not found"); ExecuteScriptWaitForTitle(default_tag_contents1, script, "db not found"); diff --git a/chrome/browser/extensions/webstore_standalone_install_browsertest.cc b/chrome/browser/extensions/webstore_standalone_install_browsertest.cc index 70bbeca..4b7296a 100644 --- a/chrome/browser/extensions/webstore_standalone_install_browsertest.cc +++ b/chrome/browser/extensions/webstore_standalone_install_browsertest.cc @@ -85,8 +85,10 @@ class WebstoreStandaloneInstallTest : public InProcessBrowserTest { std::string script = StringPrintf("%s('%s')", test_function_name.c_str(), test_gallery_url_.c_str()); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - UTF8ToWide(script), &result)); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + script, + &result)); EXPECT_TRUE(result); } diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index ef3352a..f2d77fb 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -392,7 +392,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenExtension) { bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - newtab->GetRenderViewHost(), L"", L"testExtensionApi()", &result)); + newtab->GetRenderViewHost(), "", "testExtensionApi()", &result)); EXPECT_TRUE(result); } @@ -429,6 +429,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenNoPrivileges) { // Extension API should succeed. bool result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - newtab->GetRenderViewHost(), L"", L"testExtensionApi()", &result)); + newtab->GetRenderViewHost(), "", "testExtensionApi()", &result)); EXPECT_TRUE(result); } diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 40c5e7f..1269471 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -71,7 +71,9 @@ class IFrameLoader : public content::NotificationObserver { std::string iframe_src; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser)->GetRenderViewHost(), - L"", UTF8ToWide(script), &iframe_src)); + "", + script, + &iframe_src)); iframe_url_ = GURL(iframe_src); } @@ -134,12 +136,12 @@ class GeolocationNotificationObserver : public content::NotificationObserver { } void AddWatchAndWaitForNotification(content::RenderViewHost* render_view_host, - const std::wstring& iframe_xpath) { + const std::string& iframe_xpath) { LOG(WARNING) << "will add geolocation watch"; std::string script = "window.domAutomationController.setAutomationId(0);" "window.domAutomationController.send(geoStart());"; - render_view_host->ExecuteJavascriptInWebFrame(WideToUTF16Hack(iframe_xpath), + render_view_host->ExecuteJavascriptInWebFrame(UTF8ToUTF16(iframe_xpath), UTF8ToUTF16(script)); content::RunMessageLoop(); registrar_.RemoveAll(); @@ -329,7 +331,9 @@ class GeolocationBrowserTest : public InProcessBrowserTest { std::string result; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( web_contents->GetRenderViewHost(), - iframe_xpath_, UTF8ToWide(script), &result)); + iframe_xpath_, + script, + &result)); EXPECT_EQ(expected, result); } @@ -352,7 +356,7 @@ class GeolocationBrowserTest : public InProcessBrowserTest { std::string html_for_tests_; // This member defines the iframe (or top-level page, if empty) where the // javascript calls will run. - std::wstring iframe_xpath_; + std::string iframe_xpath_; // The current url for the top level page. GURL current_url_; // If not empty, the GURLs for the iframes loaded by LoadIFrames(). @@ -462,7 +466,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, LoadIFrames(2); LOG(WARNING) << "frames loaded"; - iframe_xpath_ = L"//iframe[@id='iframe_0']"; + iframe_xpath_ = "//iframe[@id='iframe_0']"; AddGeolocationWatch(true); SetInfobarResponse(iframe_urls_[0], true); CheckGeoposition(fake_latitude_, fake_longitude_); @@ -471,11 +475,11 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, // Test second iframe from a different origin with a cached geoposition will // create the infobar. - iframe_xpath_ = L"//iframe[@id='iframe_1']"; + iframe_xpath_ = "//iframe[@id='iframe_1']"; AddGeolocationWatch(true); // Back to the first frame, enable navigation and refresh geoposition. - iframe_xpath_ = L"//iframe[@id='iframe_0']"; + iframe_xpath_ = "//iframe[@id='iframe_0']"; CheckStringValueFromJavascript("1", "geoSetMaxNavigateCount(1)"); double fresh_position_latitude = 3.17; double fresh_position_longitude = 4.23; @@ -491,7 +495,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)"); // Now go ahead an authorize the second frame. - iframe_xpath_ = L"//iframe[@id='iframe_1']"; + iframe_xpath_ = "//iframe[@id='iframe_1']"; // Infobar was displayed, allow access and check there's no error code. SetInfobarResponse(iframe_urls_[1], true); LOG(WARNING) << "Checking position..."; @@ -505,7 +509,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES)); LoadIFrames(2); - iframe_xpath_ = L"//iframe[@id='iframe_0']"; + iframe_xpath_ = "//iframe[@id='iframe_0']"; AddGeolocationWatch(true); SetInfobarResponse(iframe_urls_[0], true); CheckGeoposition(fake_latitude_, fake_longitude_); @@ -526,7 +530,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)"); // Now go ahead an authorize the second frame. - iframe_xpath_ = L"//iframe[@id='iframe_1']"; + iframe_xpath_ = "//iframe[@id='iframe_1']"; AddGeolocationWatch(true); // WebKit will use its cache, but we also broadcast a position shortly // afterwards. We're only interested in the first navigation for the success @@ -542,7 +546,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, CancelPermissionForFrame) { LoadIFrames(2); LOG(WARNING) << "frames loaded"; - iframe_xpath_ = L"//iframe[@id='iframe_0']"; + iframe_xpath_ = "//iframe[@id='iframe_0']"; AddGeolocationWatch(true); SetInfobarResponse(iframe_urls_[0], true); CheckGeoposition(fake_latitude_, fake_longitude_); @@ -551,7 +555,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, CancelPermissionForFrame) { // Test second iframe from a different origin with a cached geoposition will // create the infobar. - iframe_xpath_ = L"//iframe[@id='iframe_1']"; + iframe_xpath_ = "//iframe[@id='iframe_1']"; AddGeolocationWatch(true); InfoBarService* infobar_service = InfoBarService::FromWebContents( @@ -582,17 +586,17 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DISABLED_NoInfoBarBeforeStart) { LOG(WARNING) << "frames loaded"; // Access navigator.geolocation, but ensure it won't request permission. - iframe_xpath_ = L"//iframe[@id='iframe_1']"; + iframe_xpath_ = "//iframe[@id='iframe_1']"; CheckStringValueFromJavascript("object", "geoAccessNavigatorGeolocation()"); - iframe_xpath_ = L"//iframe[@id='iframe_0']"; + iframe_xpath_ = "//iframe[@id='iframe_0']"; AddGeolocationWatch(true); SetInfobarResponse(iframe_urls_[0], true); CheckGeoposition(fake_latitude_, fake_longitude_); CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)"); // Permission should be requested after adding a watch. - iframe_xpath_ = L"//iframe[@id='iframe_1']"; + iframe_xpath_ = "//iframe[@id='iframe_1']"; AddGeolocationWatch(true); SetInfobarResponse(iframe_urls_[1], true); CheckGeoposition(fake_latitude_, fake_longitude_); @@ -610,7 +614,9 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) { std::string js_result; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(current_browser_)->GetRenderViewHost(), - L"", UTF8ToWide(script), &js_result)); + "", + script, + &js_result)); EXPECT_EQ(js_result, "ok"); // Send a position which both geolocation watches will receive. @@ -634,22 +640,22 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TabDestroyed) { ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES)); LoadIFrames(3); - iframe_xpath_ = L"//iframe[@id='iframe_0']"; + iframe_xpath_ = "//iframe[@id='iframe_0']"; AddGeolocationWatch(true); - iframe_xpath_ = L"//iframe[@id='iframe_1']"; + iframe_xpath_ = "//iframe[@id='iframe_1']"; AddGeolocationWatch(false); - iframe_xpath_ = L"//iframe[@id='iframe_2']"; + iframe_xpath_ = "//iframe[@id='iframe_2']"; AddGeolocationWatch(false); std::string script = - "window.domAutomationController.setAutomationId(0);" "window.domAutomationController.send(window.close());"; bool result = content::ExecuteJavaScript( - chrome::GetActiveWebContents(current_browser_)->GetRenderViewHost(), - L"", UTF8ToWide(script)); + chrome::GetActiveWebContents(current_browser_)->GetRenderViewHost(), + "", + script); EXPECT_EQ(result, true); } diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index 4eed8a4..340ace4 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -460,8 +460,8 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SubmitFormAddsTargetPage) { chrome::GetActiveWebContents(browser()), expected_title); ASSERT_TRUE(content::ExecuteJavaScript( web_contents->GetRenderViewHost(), - L"", - ASCIIToWide("document.getElementById('form').submit()"))); + "", + "document.getElementById('form').submit()")); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); std::vector<GURL> urls(GetHistoryContents()); diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc index 797688c..90ec7a3 100644 --- a/chrome/browser/instant/instant_browsertest.cc +++ b/chrome/browser/instant/instant_browsertest.cc @@ -105,8 +105,7 @@ class InstantTest : public InProcessBrowserTest { if (omnibox()->model()->has_focus()) { instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_VISIBLE, OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL); - } - else { + } else { browser()->window()->GetLocationBar()->FocusLocation(false); } } @@ -131,29 +130,30 @@ class InstantTest : public InProcessBrowserTest { observer.WaitUntilDesiredPreviewState(); } - std::wstring WrapScript(const std::string& script) const { - return UTF8ToWide("domAutomationController.send(" + script + ")"); + std::string WrapScript(const std::string& script) const { + return "domAutomationController.send(" + script + ")"; } bool GetBoolFromJS(content::RenderViewHost* rvh, const std::string& script, bool* result) WARN_UNUSED_RESULT { - return content::ExecuteJavaScriptAndExtractBool(rvh, std::wstring(), - WrapScript(script), result); + return content::ExecuteJavaScriptAndExtractBool(rvh, "", WrapScript(script), + result); } bool GetIntFromJS(content::RenderViewHost* rvh, const std::string& script, int* result) WARN_UNUSED_RESULT { - return content::ExecuteJavaScriptAndExtractInt(rvh, std::wstring(), - WrapScript(script), result); + return content::ExecuteJavaScriptAndExtractInt(rvh, "", WrapScript(script), + result); } bool GetStringFromJS(content::RenderViewHost* rvh, const std::string& script, std::string* result) WARN_UNUSED_RESULT { - return content::ExecuteJavaScriptAndExtractString( - rvh, std::wstring(), WrapScript(script), result); + return content::ExecuteJavaScriptAndExtractString(rvh, "", + WrapScript(script), + result); } bool UpdateSearchState(content::WebContents* contents) WARN_UNUSED_RESULT { @@ -170,8 +170,9 @@ class InstantTest : public InProcessBrowserTest { bool ExecuteScript(const std::string& script) WARN_UNUSED_RESULT { return content::ExecuteJavaScript( - instant()->GetPreviewContents()->GetRenderViewHost(), std::wstring(), - UTF8ToWide(script)); + instant()->GetPreviewContents()->GetRenderViewHost(), + "", + script); } bool CheckVisibilityIs(content::WebContents* contents, diff --git a/chrome/browser/loadtimes_extension_bindings_browsertest.cc b/chrome/browser/loadtimes_extension_bindings_browsertest.cc index 893ccdb..a53f5cf 100644 --- a/chrome/browser/loadtimes_extension_bindings_browsertest.cc +++ b/chrome/browser/loadtimes_extension_bindings_browsertest.cc @@ -21,20 +21,27 @@ class LoadtimesExtensionBindingsTest : public InProcessBrowserTest { content::RenderViewHost* rvh = chrome::GetActiveWebContents(browser())->GetRenderViewHost(); ASSERT_TRUE(content::ExecuteJavaScript( - rvh, L"", - L"window.before.firstPaintAfterLoadTime = 0;" - L"window.before.firstPaintTime = 0;" - L"window.after.firstPaintAfterLoadTime = 0;" - L"window.after.firstPaintTime = 0;")); + rvh, + "", + "window.before.firstPaintAfterLoadTime = 0;" + "window.before.firstPaintTime = 0;" + "window.after.firstPaintAfterLoadTime = 0;" + "window.after.firstPaintTime = 0;")); std::string before; std::string after; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - rvh, L"", L"window.domAutomationController.send(" - L"JSON.stringify(before))", &before)); + rvh, + "", + "window.domAutomationController.send(" + " JSON.stringify(before))", + &before)); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - rvh, L"", L"window.domAutomationController.send(" - L"JSON.stringify(after))", &after)); + rvh, + "", + "window.domAutomationController.send(" + " JSON.stringify(after))", + &after)); EXPECT_EQ(before, after); } }; @@ -47,11 +54,11 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest, content::RenderViewHost* rvh = chrome::GetActiveWebContents(browser())->GetRenderViewHost(); ASSERT_TRUE(content::ExecuteJavaScript( - rvh, L"", L"window.before = window.chrome.loadTimes()")); + rvh, "", "window.before = window.chrome.loadTimes()")); ASSERT_TRUE(content::ExecuteJavaScript( - rvh, L"", L"window.location.href = window.location + \"#\"")); + rvh, "", "window.location.href = window.location + \"#\"")); ASSERT_TRUE(content::ExecuteJavaScript( - rvh, L"", L"window.after = window.chrome.loadTimes()")); + rvh, "", "window.after = window.chrome.loadTimes()")); CompareBeforeAndAfter(); } @@ -64,9 +71,9 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest, content::RenderViewHost* rvh = chrome::GetActiveWebContents(browser())->GetRenderViewHost(); ASSERT_TRUE(content::ExecuteJavaScript( - rvh, L"", L"window.before = window.chrome.loadTimes()")); + rvh, "", "window.before = window.chrome.loadTimes()")); ui_test_utils::NavigateToURL(browser(), hash_url); ASSERT_TRUE(content::ExecuteJavaScript( - rvh, L"", L"window.after = window.chrome.loadTimes()")); + rvh, "", "window.after = window.chrome.loadTimes()")); CompareBeforeAndAfter(); } diff --git a/chrome/browser/net/load_timing_observer_browsertest.cc b/chrome/browser/net/load_timing_observer_browsertest.cc index d7be0c5..b97a706 100644 --- a/chrome/browser/net/load_timing_observer_browsertest.cc +++ b/chrome/browser/net/load_timing_observer_browsertest.cc @@ -29,14 +29,18 @@ IN_PROC_BROWSER_TEST_F(LoadTimingObserverTest, DISABLED_CacheHitAfterRedirect) { content::RenderViewHost* render_view_host = chrome::GetActiveWebContents(browser())->GetRenderViewHost(); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt( - render_view_host, L"", - L"window.domAutomationController.send(" - L"window.performance.timing.responseStart - " - L"window.performance.timing.navigationStart)", &response_start)); + render_view_host, + "", + "window.domAutomationController.send(" + " window.performance.timing.responseStart - " + " window.performance.timing.navigationStart)", + &response_start)); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt( - render_view_host, L"", - L"window.domAutomationController.send(" - L"window.performance.timing.responseEnd - " - L"window.performance.timing.navigationStart)", &response_end)); + render_view_host, + "", + "window.domAutomationController.send(" + " window.performance.timing.responseEnd - " + " window.performance.timing.navigationStart)", + &response_end)); EXPECT_LE(response_start, response_end); } diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc index 54fd621..f4c6471 100644 --- a/chrome/browser/notifications/notification_browsertest.cc +++ b/chrome/browser/notifications/notification_browsertest.cc @@ -274,8 +274,8 @@ std::string NotificationsTest::CreateNotification( std::string result; bool success = content::ExecuteJavaScriptAndExtractString( browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), - L"", - UTF8ToWide(script), + "", + script, &result); if (success && result != "-1" && wait_for_new_balloon) success = observer.Wait(); @@ -301,8 +301,8 @@ bool NotificationsTest::RequestPermissionAndWait(Browser* browser) { std::string result; bool success = content::ExecuteJavaScriptAndExtractString( browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), - L"", - L"requestPermission();", + "", + "requestPermission();", &result); if (!success || result != "1") return false; @@ -321,8 +321,8 @@ bool NotificationsTest::CancelNotification( std::string result; bool success = content::ExecuteJavaScriptAndExtractString( browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), - L"", - UTF8ToWide(script), + "", + script, &result); if (!success || result != "1") return false; @@ -414,8 +414,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestUserGestureInfobar) { bool result; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(request());", + "", + "window.domAutomationController.send(request());", &result)); EXPECT_TRUE(result); diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 06c5b0d..86cbac3 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -237,12 +237,12 @@ void CheckURLIsBlocked(Browser* browser, const char* spec) { bool result = false; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( contents->GetRenderViewHost(), - std::wstring(), - L"var hasError = false;" - L"var error = document.getElementById('errorDetails');" - L"if (error)" - L" hasError = error.textContent.indexOf('Error 138') == 0;" - L"domAutomationController.send(hasError);", + "", + "var hasError = false;" + "var error = document.getElementById('errorDetails');" + "if (error)" + " hasError = error.textContent.indexOf('Error 138') == 0;" + "domAutomationController.send(hasError);", &result)); EXPECT_TRUE(result); } @@ -291,10 +291,10 @@ bool IsWebGLEnabled(content::WebContents* contents) { bool result = false; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( contents->GetRenderViewHost(), - std::wstring(), - L"var canvas = document.createElement('canvas');" - L"var context = canvas.getContext('experimental-webgl');" - L"domAutomationController.send(context != null);", + "", + "var canvas = document.createElement('canvas');" + "var context = canvas.getContext('experimental-webgl');" + "domAutomationController.send(context != null);", &result)); return result; } @@ -462,24 +462,24 @@ class PolicyTest : public InProcessBrowserTest { bool result = false; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( web_contents->GetRenderViewHost(), - std::wstring(), - L"function btest_initCompleted(url) {" - L" var img = new Image();" - L" img.src = url;" - L" img.onload = function() {" - L" domAutomationController.send(img.width * img.height > 0);" - L" };" - L" img.onerror = function() {" - L" domAutomationController.send(false);" - L" };" - L"}" - L"function setupCurrentScreenshot(url) {" - L" btest_initCompleted(url);" - L"}" - L"var img = document.getElementById(" - L" 'current-screenshots-thumbnailDiv-0-image');" - L"if (img)" - L" btest_initCompleted(img.src);", + "", + "function btest_initCompleted(url) {" + " var img = new Image();" + " img.src = url;" + " img.onload = function() {" + " domAutomationController.send(img.width * img.height > 0);" + " };" + " img.onerror = function() {" + " domAutomationController.send(false);" + " };" + "}" + "function setupCurrentScreenshot(url) {" + " btest_initCompleted(url);" + "}" + "var img = document.getElementById(" + " 'current-screenshots-thumbnailDiv-0-image');" + "if (img)" + " btest_initCompleted(img.src);", &result)); EXPECT_EQ(enabled, result); @@ -1717,17 +1717,17 @@ IN_PROC_BROWSER_TEST_F(PolicyStatisticsCollectorTest, Startup) { std::string text; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( contents->GetRenderViewHost(), - std::wstring(), - L"var nodes = document.querySelectorAll('body > pre');" - L"var result = '';" - L"for (var i = 0; i < nodes.length; ++i) {" - L" var text = nodes[i].innerHTML;" - L" if (text.indexOf('Histogram: Enterprise.Policies') === 0) {" - L" result = text;" - L" break;" - L" }" - L"}" - L"domAutomationController.send(result);", + "", + "var nodes = document.querySelectorAll('body > pre');" + "var result = '';" + "for (var i = 0; i < nodes.length; ++i) {" + " var text = nodes[i].innerHTML;" + " if (text.indexOf('Histogram: Enterprise.Policies') === 0) {" + " result = text;" + " break;" + " }" + "}" + "domAutomationController.send(result);", &text)); ASSERT_FALSE(text.empty()); const std::string kExpectedLabel = diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc index b004e51..60e3105 100644 --- a/chrome/browser/policy/policy_prefs_browsertest.cc +++ b/chrome/browser/policy/policy_prefs_browsertest.cc @@ -81,8 +81,8 @@ class PrefMapping { const std::string& indicator_selector) : pref_(pref), is_local_state_(is_local_state), + indicator_test_setup_js_(indicator_test_setup_js), indicator_selector_(indicator_selector) { - indicator_test_setup_js_ = ASCIIToWide(indicator_test_setup_js); } ~PrefMapping() {} @@ -90,7 +90,7 @@ class PrefMapping { bool is_local_state() const { return is_local_state_; } - const std::wstring& indicator_test_setup_js() const { + const std::string& indicator_test_setup_js() const { return indicator_test_setup_js_; } @@ -108,7 +108,7 @@ class PrefMapping { private: std::string pref_; bool is_local_state_; - std::wstring indicator_test_setup_js_; + std::string indicator_test_setup_js_; std::string indicator_selector_; ScopedVector<IndicatorTestCase> indicator_test_cases_; @@ -311,7 +311,7 @@ void VerifyControlledSettingIndicators(Browser* browser, const std::string& value, const std::string& controlled_by, bool readonly) { - std::wstringstream javascript; + std::stringstream javascript; javascript << "var nodes = document.querySelectorAll(" << " 'span.controlled-setting-indicator" << selector.c_str() << "');" @@ -332,7 +332,7 @@ void VerifyControlledSettingIndicators(Browser* browser, // Retrieve the state of all controlled setting indicators matching the // |selector| as JSON. ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - contents->GetRenderViewHost(), L"", javascript.str(), &json)); + contents->GetRenderViewHost(), "", javascript.str(), &json)); scoped_ptr<base::Value> value_ptr(base::JSONReader::Read(json)); const base::ListValue* indicators = NULL; ASSERT_TRUE(value_ptr.get()); @@ -492,7 +492,8 @@ IN_PROC_BROWSER_TEST_P(PolicyPrefsTest, CheckPolicyIndicators) { ui_test_utils::NavigateToURL(browser(), GURL(kMainSettingsPage)); if (!(*pref_mapping)->indicator_test_setup_js().empty()) { ASSERT_TRUE(content::ExecuteJavaScript( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", (*pref_mapping)->indicator_test_setup_js())); } diff --git a/chrome/browser/popup_blocker_browsertest.cc b/chrome/browser/popup_blocker_browsertest.cc index 4dba5ef..8b931b5 100644 --- a/chrome/browser/popup_blocker_browsertest.cc +++ b/chrome/browser/popup_blocker_browsertest.cc @@ -54,7 +54,7 @@ class PopupBlockerBrowserTest : public InProcessBrowserTest { // Do a round trip to the renderer first to flush any in-flight IPCs to // create a to-be-blocked window. WebContents* tab = chrome::GetActiveWebContents(browser); - CHECK(content::ExecuteJavaScript(tab->GetRenderViewHost(), L"", L"")); + CHECK(content::ExecuteJavaScript(tab->GetRenderViewHost(), "", "")); BlockedContentTabHelper* blocked_content_tab_helper = BlockedContentTabHelper::FromWebContents(tab); std::vector<WebContents*> blocked_contents; diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 651e903..922d817 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -784,7 +784,8 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { bool original_prerender_page = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(), - L"", L"window.domAutomationController.send(IsOriginalPrerenderPage())", + "", + "window.domAutomationController.send(IsOriginalPrerenderPage())", &original_prerender_page)); EXPECT_TRUE(original_prerender_page); } @@ -803,8 +804,9 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { back_nav_observer.Wait(); bool js_result; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), L"", - L"window.domAutomationController.send(DidBackToOriginalPagePass())", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(DidBackToOriginalPagePass())", &js_result)); EXPECT_TRUE(js_result); } @@ -850,26 +852,28 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { bool DidReceivePrerenderStartEventForLinkNumber(int index) const { bool received_prerender_started; - std::wstring expression = base::StringPrintf( - L"window.domAutomationController.send(Boolean(" - L"receivedPrerenderStartEvents[%d]))", index); + std::string expression = base::StringPrintf( + "window.domAutomationController.send(Boolean(" + "receivedPrerenderStartEvents[%d]))", index); CHECK(content::ExecuteJavaScriptAndExtractBool( chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(), - L"", expression, + "", + expression, &received_prerender_started)); return received_prerender_started; } bool DidReceivePrerenderStopEventForLinkNumber(int index) const { bool received_prerender_stopped; - std::wstring expression = base::StringPrintf( - L"window.domAutomationController.send(Boolean(" - L"receivedPrerenderStopEvents[%d]))", index); + std::string expression = base::StringPrintf( + "window.domAutomationController.send(Boolean(" + "receivedPrerenderStopEvents[%d]))", index); CHECK(content::ExecuteJavaScriptAndExtractBool( chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(), - L"", expression, + "", + expression, &received_prerender_stopped)); return received_prerender_stopped; } @@ -1034,8 +1038,9 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { // Check if page behaves as expected while in prerendered state. bool prerender_test_result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - prerender_contents->GetRenderViewHostMutable(), L"", - L"window.domAutomationController.send(DidPrerenderPass())", + prerender_contents->GetRenderViewHostMutable(), + "", + "window.domAutomationController.send(DidPrerenderPass())", &prerender_test_result)); EXPECT_TRUE(prerender_test_result); } @@ -1092,8 +1097,9 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { bool display_test_result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - web_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(DidDisplayPass())", + web_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(DidDisplayPass())", &display_test_result)); EXPECT_TRUE(display_test_result); } @@ -1400,8 +1406,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) { WebContents* web_contents = chrome::GetActiveWebContents(browser()); bool display_test_result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - web_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(DidDisplayPass())", + web_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(DidDisplayPass())", &display_test_result)); EXPECT_TRUE(display_test_result); } @@ -2567,8 +2574,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithNaCl, WebContents* web_contents = chrome::GetActiveWebContents(browser()); bool display_test_result = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - web_contents->GetRenderViewHost(), L"", - L"DidDisplayReallyPass()", + web_contents->GetRenderViewHost(), + "", + "DidDisplayReallyPass()", &display_test_result)); ASSERT_TRUE(display_test_result); } diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index bf66efc..4c3b143 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -181,8 +181,9 @@ class SSLUITest : public InProcessBrowserTest { while (base::Time::Now() < timeToQuit) { bool workerFinished = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), std::wstring(), - L"window.domAutomationController.send(IsWorkerFinished());", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(IsWorkerFinished());", &workerFinished)); if (workerFinished) @@ -198,8 +199,9 @@ class SSLUITest : public InProcessBrowserTest { bool actuallyLoadedContent = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), std::wstring(), - L"window.domAutomationController.send(IsContentLoaded());", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(IsContentLoaded());", &actuallyLoadedContent)); EXPECT_EQ(expectLoaded, actuallyLoadedContent); } @@ -861,8 +863,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContents) { int img_width; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractInt( - tab->GetRenderViewHost(), std::wstring(), - L"window.domAutomationController.send(ImageWidth());", &img_width)); + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(ImageWidth());", + &img_width)); // In order to check that the image was not loaded, we check its width. // The actual image (Google logo) is 114 pixels wide, we assume the broken // image is less than 100. @@ -870,8 +874,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContents) { bool js_result = false; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), std::wstring(), - L"window.domAutomationController.send(IsFooSet());", &js_result)); + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(IsFooSet());", + &js_result)); EXPECT_FALSE(js_result); } @@ -895,7 +901,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentLoadedFromJS) { // Load the insecure image. bool js_result = false; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), std::wstring(), L"loadBadImage();", + tab->GetRenderViewHost(), + "", + "loadBadImage();", &js_result)); EXPECT_TRUE(js_result); @@ -1297,8 +1305,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) { content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>(&tab->GetController())); EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), std::wstring(), - L"window.domAutomationController.send(clickLink('goodHTTPSLink'));", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickLink('goodHTTPSLink'));", &success)); ASSERT_TRUE(success); observer.Wait(); @@ -1313,8 +1322,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) { content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>(&tab->GetController())); EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), std::wstring(), - L"window.domAutomationController.send(clickLink('badHTTPSLink'));", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickLink('badHTTPSLink'));", &success)); ASSERT_TRUE(success); observer.Wait(); @@ -1325,11 +1335,13 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) { // And the frame should be blocked. bool is_content_evil = true; - std::wstring content_frame_xpath(L"html/frameset/frame[2]"); - std::wstring is_evil_js(L"window.domAutomationController.send(" - L"document.getElementById('evilDiv') != null);"); + std::string content_frame_xpath("html/frameset/frame[2]"); + std::string is_evil_js("window.domAutomationController.send(" + "document.getElementById('evilDiv') != null);"); EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), content_frame_xpath, is_evil_js, + tab->GetRenderViewHost(), + content_frame_xpath, + is_evil_js, &is_content_evil)); EXPECT_FALSE(is_content_evil); @@ -1349,8 +1361,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) { content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>(&tab->GetController())); EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), std::wstring(), - L"window.domAutomationController.send(clickLink('HTTPLink'));", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickLink('HTTPLink'));", &success)); ASSERT_TRUE(success); observer.Wait(); @@ -1396,8 +1409,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadFrameNavigation) { content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>(&tab->GetController())); EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), std::wstring(), - L"window.domAutomationController.send(clickLink('goodHTTPSLink'));", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickLink('goodHTTPSLink'));", &success)); ASSERT_TRUE(success); observer.Wait(); @@ -1433,8 +1447,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) { content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>(&tab->GetController())); EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), std::wstring(), - L"window.domAutomationController.send(clickLink('goodHTTPSLink'));", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickLink('goodHTTPSLink'));", &success)); ASSERT_TRUE(success); observer.Wait(); @@ -1450,8 +1465,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) { content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>(&tab->GetController())); EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), std::wstring(), - L"window.domAutomationController.send(clickLink('badHTTPSLink'));", + tab->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickLink('badHTTPSLink'));", &success)); ASSERT_TRUE(success); observer.Wait(); @@ -1462,11 +1478,13 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) { // And the frame should have been blocked (see bug #2316). bool is_content_evil = true; - std::wstring content_frame_xpath(L"html/frameset/frame[2]"); - std::wstring is_evil_js(L"window.domAutomationController.send(" - L"document.getElementById('evilDiv') != null);"); + std::string content_frame_xpath("html/frameset/frame[2]"); + std::string is_evil_js("window.domAutomationController.send(" + "document.getElementById('evilDiv') != null);"); EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( - tab->GetRenderViewHost(), content_frame_xpath, is_evil_js, + tab->GetRenderViewHost(), + content_frame_xpath, + is_evil_js, &is_content_evil)); EXPECT_FALSE(is_content_evil); } diff --git a/chrome/browser/tab_contents/view_source_browsertest.cc b/chrome/browser/tab_contents/view_source_browsertest.cc index 38e753d..32021cd 100644 --- a/chrome/browser/tab_contents/view_source_browsertest.cc +++ b/chrome/browser/tab_contents/view_source_browsertest.cc @@ -107,9 +107,7 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, DISABLED_TestViewSourceReload) { chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(); ASSERT_TRUE( - content::ExecuteJavaScript(rvh, - L"", - L"window.location.reload();")); + content::ExecuteJavaScript(rvh, "", "window.location.reload();")); content::WindowedNotificationObserver observer2( content::NOTIFICATION_LOAD_STOP, diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index 698ff0c..f53588e 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc @@ -465,8 +465,9 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, focused_browser->window()->Activate(); ASSERT_TRUE(content::ExecuteJavaScript( - chrome::GetActiveWebContents(unfocused_browser)->GetRenderViewHost(), L"", - L"stealFocus();")); + chrome::GetActiveWebContents(unfocused_browser)->GetRenderViewHost(), + "", + "stealFocus();")); // Make sure the first browser is still active. EXPECT_TRUE(focused_browser->window()->IsActive()); @@ -484,8 +485,9 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) { chrome::FocusLocationBar(browser()); ASSERT_TRUE(content::ExecuteJavaScript( - chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", - L"stealFocus();")); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), + "", + "stealFocus();")); // Make sure the location bar is still focused. ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); @@ -531,8 +533,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { std::string actual; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(getFocusedElement());", + "", + "window.domAutomationController.send(getFocusedElement());", &actual)); ASSERT_STREQ(kExpElementIDs[j], actual.c_str()); @@ -604,8 +606,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { std::string actual; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(getFocusedElement());", + "", + "window.domAutomationController.send(getFocusedElement());", &actual)); ASSERT_STREQ(next_element, actual.c_str()); } @@ -662,8 +664,9 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { // Let's make sure the focus is on the expected element in the page. std::string actual; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - interstitial_page->render_view_host(), L"", - L"window.domAutomationController.send(getFocusedElement());", + interstitial_page->render_view_host(), + "", + "window.domAutomationController.send(getFocusedElement());", &actual)); ASSERT_STREQ(kExpElementIDs[j], actual.c_str()); @@ -722,8 +725,9 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { // Let's make sure the focus is on the expected element in the page. std::string actual; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - interstitial_page->render_view_host(), L"", - L"window.domAutomationController.send(getFocusedElement());", + interstitial_page->render_view_host(), + "", + "window.domAutomationController.send(getFocusedElement());", &actual)); ASSERT_STREQ(kExpElementIDs[6 - j], actual.c_str()); } diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index 59ae8f2..d30228f 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -471,8 +471,8 @@ bool FocusedOnPage(WebContents* web_contents, std::string* result) bool FocusedOnPage(WebContents* web_contents, std::string* result) { return content::ExecuteJavaScriptAndExtractString( web_contents->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(getFocusedElement());", + "", + "window.domAutomationController.send(getFocusedElement());", result); } @@ -516,8 +516,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageEndState) { // Move the selection to link 1, after searching. ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( web_contents->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(selectLink1());", + "", + "window.domAutomationController.send(selectLink1());", &result)); // End the find session. @@ -590,8 +590,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, std::string result; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( web_contents->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(selectLink1());", + "", + "window.domAutomationController.send(selectLink1());", &result)); // Do a find-next after the selection. This should move forward @@ -620,8 +620,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, std::string result; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( web_contents->GetRenderViewHost(), - std::wstring(), - L"window.domAutomationController.send(selectSpan());", + "", + "window.domAutomationController.send(selectSpan());", &result)); // Do a find-next after the selection. This should select the 2nd occurrence diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc index 61135e0..2cf9b77 100644 --- a/chrome/browser/ui/panels/panel_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browsertest.cc @@ -425,8 +425,8 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_AutoResize) { WaitForAutoResizeWider enlarge(panel); EXPECT_TRUE(content::ExecuteJavaScript( panel->GetWebContents()->GetRenderViewHost(), - std::wstring(), - L"changeSize(50);")); + "", + "changeSize(50);")); enlarge.Wait(); gfx::Rect bounds_on_grow = panel->GetBounds(); EXPECT_GT(bounds_on_grow.width(), initial_bounds.width()); @@ -436,8 +436,8 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_AutoResize) { WaitForAutoResizeNarrower shrink(panel); EXPECT_TRUE(content::ExecuteJavaScript( panel->GetWebContents()->GetRenderViewHost(), - std::wstring(), - L"changeSize(-30);")); + "", + "changeSize(-30);")); shrink.Wait(); gfx::Rect bounds_on_shrink = panel->GetBounds(); EXPECT_LT(bounds_on_shrink.width(), bounds_on_grow.width()); @@ -1566,9 +1566,9 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, WaitForAutoResizeWider enlarge(panel); EXPECT_TRUE(content::ExecuteJavaScript( panel->GetWebContents()->GetRenderViewHost(), - std::wstring(), - L"document.body.innerHTML =" - L"'<nobr>line of text and a <button>Button</button>';")); + "", + "document.body.innerHTML =" + " '<nobr>line of text and a <button>Button</button>';")); enlarge.Wait(); // The panel should have become larger in both dimensions (the minimums diff --git a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc index 85cbf74..310fddd 100644 --- a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc +++ b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc @@ -33,12 +33,16 @@ class BookmarksTest : public InProcessBrowserTest { GURL url; std::string out; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - tab->GetRenderViewHost(), L"", - L"domAutomationController.send(location.protocol)", &out)); + tab->GetRenderViewHost(), + "", + "domAutomationController.send(location.protocol)", + &out)); ASSERT_EQ("chrome-extension:", out); ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - tab->GetRenderViewHost(), L"", - L"domAutomationController.send(location.pathname)", &out)); + tab->GetRenderViewHost(), + "", + "domAutomationController.send(location.pathname)", + &out)); ASSERT_EQ("/main.html", out); } }; diff --git a/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc index 82bfa8f..3be9300 100644 --- a/chrome/browser/ui/webui/inspect_ui_browsertest.cc +++ b/chrome/browser/ui/webui/inspect_ui_browsertest.cc @@ -48,9 +48,9 @@ IN_PROC_BROWSER_TEST_F(InspectUITest, DISABLED_SharedWorkersList) { ASSERT_TRUE( content::ExecuteJavaScriptAndExtractString( web_contents->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(" - L"'' + document.body.textContent);", + "", + "window.domAutomationController.send(" + " '' + document.body.textContent);", &result)); ASSERT_TRUE(result.find(kSharedWorkerJs) != std::string::npos); ASSERT_TRUE(result.find(kSharedWorkerTestPage) != std::string::npos); diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc index 08faa20..d9af2ce 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc @@ -35,8 +35,8 @@ IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, ChromeInternalLoadsNTP) { bool empty_inner_html = false; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( browser()->tab_strip_model()->GetWebContentsAt(0)->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(document.body.innerHTML == '')", + "", + "window.domAutomationController.send(document.body.innerHTML == '')", &empty_inner_html)); ASSERT_FALSE(empty_inner_html); } diff --git a/chrome/browser/ui/webui/options/options_ui_browsertest.cc b/chrome/browser/ui/webui/options/options_ui_browsertest.cc index 13111a5..cb9027a 100644 --- a/chrome/browser/ui/webui/options/options_ui_browsertest.cc +++ b/chrome/browser/ui/webui/options/options_ui_browsertest.cc @@ -29,9 +29,10 @@ void OptionsBrowserTest::VerifyNavbar() { bool navbar_exist = false; EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", - L"domAutomationController.send(" - L"!!document.getElementById('navigation'))", &navbar_exist)); + "", + "domAutomationController.send(" + " !!document.getElementById('navigation'))", + &navbar_exist)); EXPECT_EQ(true, navbar_exist); } diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc index 3a51a60..eb3790a 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc @@ -81,84 +81,85 @@ void PreferencesBrowserTest::SetUpOnMainThread() { pref_change_registrar_.Init( PrefServiceBase::FromBrowserContext(browser()->profile())); pref_service_ = browser()->profile()->GetPrefs(); - ASSERT_TRUE(content::ExecuteJavaScript(render_view_host_, L"", - L"function TestEnv() {" - L" this.sentinelName_ = 'download.prompt_for_download';" - L" this.prefs_ = [];" - L" TestEnv.instance_ = this;" - L"}" - L"" - L"TestEnv.handleEvent = function(event) {" - L" var env = TestEnv.instance_;" - L" var name = event.type;" - L" env.removePrefListener_(name);" - L" if (name == TestEnv.sentinelName_)" - L" env.sentinelValue_ = event.value.value;" - L" else" - L" env.reply_[name] = event.value;" - L" if (env.fetching_ && !--env.fetching_ ||" - L" !env.fetching_ && name == env.sentinelName_) {" - L" env.removePrefListeners_();" - L" window.domAutomationController.send(JSON.stringify(env.reply_));" - L" delete env.reply_;" - L" }" - L"};" - L"" - L"TestEnv.prototype = {" - L" addPrefListener_: function(name) {" - L" Preferences.getInstance().addEventListener(name," - L" TestEnv.handleEvent);" - L" }," - L"" - L" addPrefListeners_: function() {" - L" for (var i in this.prefs_)" - L" this.addPrefListener_(this.prefs_[i]);" - L" }," - L"" - L" removePrefListener_: function(name) {" - L" Preferences.getInstance().removeEventListener(name," - L" TestEnv.handleEvent);" - L" }," - L"" - L" removePrefListeners_: function() {" - L" for (var i in this.prefs_)" - L" this.removePrefListener_(this.prefs_[i]);" - L" }," - L"" - L"" - L" addPref: function(name) {" - L" this.prefs_.push(name);" - L" }," - L"" - L" setupAndReply: function() {" - L" this.reply_ = {};" - L" Preferences.instance_ = new Preferences();" - L" this.addPref(this.sentinelName_);" - L" this.fetching_ = this.prefs_.length;" - L" this.addPrefListeners_();" - L" Preferences.getInstance().initialize();" - L" }," - L"" - L" runAndReply: function(test) {" - L" this.reply_ = {};" - L" this.addPrefListeners_();" - L" test();" - L" this.sentinelValue_ = !this.sentinelValue_;" - L" Preferences.setBooleanPref(this.sentinelName_, this.sentinelValue_," - L" true);" - L" }," - L"" - L" startObserving: function() {" - L" this.reply_ = {};" - L" this.addPrefListeners_();" - L" }," - L"" - L" finishObservingAndReply: function() {" - L" this.sentinelValue_ = !this.sentinelValue_;" - L" Preferences.setBooleanPref(this.sentinelName_, this.sentinelValue_," - L" true);" - L" }" - L"};")); + ASSERT_TRUE(content::ExecuteJavaScript(render_view_host_, + "", + "function TestEnv() {" + " this.sentinelName_ = 'download.prompt_for_download';" + " this.prefs_ = [];" + " TestEnv.instance_ = this;" + "}" + "" + "TestEnv.handleEvent = function(event) {" + " var env = TestEnv.instance_;" + " var name = event.type;" + " env.removePrefListener_(name);" + " if (name == TestEnv.sentinelName_)" + " env.sentinelValue_ = event.value.value;" + " else" + " env.reply_[name] = event.value;" + " if (env.fetching_ && !--env.fetching_ ||" + " !env.fetching_ && name == env.sentinelName_) {" + " env.removePrefListeners_();" + " window.domAutomationController.send(JSON.stringify(env.reply_));" + " delete env.reply_;" + " }" + "};" + "" + "TestEnv.prototype = {" + " addPrefListener_: function(name) {" + " Preferences.getInstance().addEventListener(name," + " TestEnv.handleEvent);" + " }," + "" + " addPrefListeners_: function() {" + " for (var i in this.prefs_)" + " this.addPrefListener_(this.prefs_[i]);" + " }," + "" + " removePrefListener_: function(name) {" + " Preferences.getInstance().removeEventListener(name," + " TestEnv.handleEvent);" + " }," + "" + " removePrefListeners_: function() {" + " for (var i in this.prefs_)" + " this.removePrefListener_(this.prefs_[i]);" + " }," + "" + "" + " addPref: function(name) {" + " this.prefs_.push(name);" + " }," + "" + " setupAndReply: function() {" + " this.reply_ = {};" + " Preferences.instance_ = new Preferences();" + " this.addPref(this.sentinelName_);" + " this.fetching_ = this.prefs_.length;" + " this.addPrefListeners_();" + " Preferences.getInstance().initialize();" + " }," + "" + " runAndReply: function(test) {" + " this.reply_ = {};" + " this.addPrefListeners_();" + " test();" + " this.sentinelValue_ = !this.sentinelValue_;" + " Preferences.setBooleanPref(this.sentinelName_, this.sentinelValue_," + " true);" + " }," + "" + " startObserving: function() {" + " this.reply_ = {};" + " this.addPrefListeners_();" + " }," + "" + " finishObservingAndReply: function() {" + " this.sentinelValue_ = !this.sentinelValue_;" + " Preferences.setBooleanPref(this.sentinelName_, this.sentinelValue_," + " true);" + " }" + "};")); } // Forwards notifications received when pref values change in the backend. @@ -303,7 +304,7 @@ void PreferencesBrowserTest::VerifyAndClearExpectations() { void PreferencesBrowserTest::SetupJavaScriptTestEnvironment( const std::vector<std::string>& pref_names, std::string* observed_json) const { - std::wstringstream javascript; + std::stringstream javascript; javascript << "var testEnv = new TestEnv();"; for (std::vector<std::string>::const_iterator name = pref_names.begin(); name != pref_names.end(); ++name) @@ -313,7 +314,7 @@ void PreferencesBrowserTest::SetupJavaScriptTestEnvironment( if (!observed_json) observed_json = &temp_observed_json; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - render_view_host_, L"", javascript.str(), observed_json)); + render_view_host_, "", javascript.str(), observed_json)); } void PreferencesBrowserTest::VerifySetPref(const std::string& name, @@ -329,7 +330,7 @@ void PreferencesBrowserTest::VerifySetPref(const std::string& name, std::string commit_json; base::JSONWriter::Write(value, &value_json); base::JSONWriter::Write(commit_ptr.get(), &commit_json); - std::wstringstream javascript; + std::stringstream javascript; javascript << "testEnv.runAndReply(function() {" << " Preferences.set" << type.c_str() << "Pref(" << " '" << name.c_str() << "'," @@ -337,7 +338,7 @@ void PreferencesBrowserTest::VerifySetPref(const std::string& name, << " " << commit_json.c_str() << ");});"; std::string observed_json; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - render_view_host_, L"", javascript.str(), &observed_json)); + render_view_host_, "", javascript.str(), &observed_json)); VerifyObservedPref(observed_json, name, value, "", false, !commit); VerifyAndClearExpectations(); } @@ -352,14 +353,14 @@ void PreferencesBrowserTest::VerifyClearPref(const std::string& name, scoped_ptr<base::Value> commit_ptr(new base::FundamentalValue(commit)); std::string commit_json; base::JSONWriter::Write(commit_ptr.get(), &commit_json); - std::wstringstream javascript; + std::stringstream javascript; javascript << "testEnv.runAndReply(function() {" << " Preferences.clearPref(" << " '" << name.c_str() << "'," << " " << commit_json.c_str() << ");});"; std::string observed_json; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - render_view_host_, L"", javascript.str(), &observed_json)); + render_view_host_, "", javascript.str(), &observed_json)); VerifyObservedPref(observed_json, name, value, "recommended", false, !commit); VerifyAndClearExpectations(); } @@ -367,13 +368,13 @@ void PreferencesBrowserTest::VerifyClearPref(const std::string& name, void PreferencesBrowserTest::VerifyCommit(const std::string& name, const base::Value* value, const std::string& controlledBy) { - std::wstringstream javascript; + std::stringstream javascript; javascript << "testEnv.runAndReply(function() {" << " Preferences.getInstance().commitPref(" << " '" << name.c_str() << "');});"; std::string observed_json; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - render_view_host_, L"", javascript.str(), &observed_json)); + render_view_host_, "", javascript.str(), &observed_json)); VerifyObservedPref(observed_json, name, value, controlledBy, false, false); } @@ -395,25 +396,27 @@ void PreferencesBrowserTest::VerifyRollback(const std::string& name, const base::Value* value, const std::string& controlledBy) { ExpectNoCommit(name); - std::wstringstream javascript; + std::stringstream javascript; javascript << "testEnv.runAndReply(function() {" << " Preferences.getInstance().rollbackPref(" << " '" << name.c_str() << "');});"; std::string observed_json; ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - render_view_host_, L"", javascript.str(), &observed_json)); + render_view_host_, "", javascript.str(), &observed_json)); VerifyObservedPref(observed_json, name, value, controlledBy, false, true); VerifyAndClearExpectations(); } void PreferencesBrowserTest::StartObserving() { ASSERT_TRUE(content::ExecuteJavaScript( - render_view_host_, L"", L"testEnv.startObserving();")); + render_view_host_, "", "testEnv.startObserving();")); } void PreferencesBrowserTest::FinishObserving(std::string* observed_json) { ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( - render_view_host_, L"", L"testEnv.finishObservingAndReply();", + render_view_host_, + "", + "testEnv.finishObservingAndReply();", observed_json)); } diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc index ad76e50..2df0d84 100644 --- a/chrome/test/base/tracing_browsertest.cc +++ b/chrome/test/base/tracing_browsertest.cc @@ -32,7 +32,7 @@ class TracingBrowserTest : public InProcessBrowserTest { content::RenderViewHost* rvh = chrome::GetActiveWebContents(browser())->GetRenderViewHost(); ASSERT_TRUE(rvh); - ASSERT_TRUE(content::ExecuteJavaScript(rvh, L"", L";")); + ASSERT_TRUE(content::ExecuteJavaScript(rvh, "", ";")); } }; diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 932cafa..3db0e50 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -564,11 +564,11 @@ class SnapshotTaker { bool TakeEntirePageSnapshot(RenderViewHost* rvh, SkBitmap* bitmap) WARN_UNUSED_RESULT { - const wchar_t* script = - L"window.domAutomationController.send(" - L" JSON.stringify([document.width, document.height]))"; + const char* script = + "window.domAutomationController.send(" + "JSON.stringify([document.width, document.height]))"; std::string json; - if (!content::ExecuteJavaScriptAndExtractString(rvh, L"", script, &json)) + if (!content::ExecuteJavaScriptAndExtractString(rvh, "", script, &json)) return false; // Parse the JSON. diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index 559eb5e..8b7eb55 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -178,14 +178,15 @@ class GpuPixelBrowserTest : public InProcessBrowserTest { gfx::Rect new_bounds = GetNewTabContainerBounds(tab_container_size); - std::wostringstream js_call; + std::ostringstream js_call; js_call << "preCallResizeInChromium("; js_call << new_bounds.width() << ", " << new_bounds.height(); js_call << ");"; ASSERT_TRUE(content::ExecuteJavaScript( chrome::GetActiveWebContents(browser())->GetRenderViewHost(), - L"", js_call.str())); + "", + js_call.str())); std::string message; ASSERT_TRUE(message_queue.WaitForMessage(&message)); diff --git a/content/browser/bookmarklet_browsertest.cc b/content/browser/bookmarklet_browsertest.cc index 761c642..81eda413 100644 --- a/content/browser/bookmarklet_browsertest.cc +++ b/content/browser/bookmarklet_browsertest.cc @@ -24,8 +24,8 @@ class BookmarkletTest : public ContentBrowserTest { std::string body_text; EXPECT_TRUE(ExecuteJavaScriptAndExtractString( shell()->web_contents()->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(document.body.innerText);", + "", + "window.domAutomationController.send(document.body.innerText);", &body_text)); return body_text; } diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc index b72818c..5dc3de4 100644 --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc @@ -274,9 +274,9 @@ class BrowserPluginHostTest : public ContentBrowserTest { // Executes the javascript synchronously and makes sure the returned value is // freed properly. - void ExecuteSyncJSFunction(RenderViewHost* rvh, const string16& jscript) { + void ExecuteSyncJSFunction(RenderViewHost* rvh, const std::string& jscript) { scoped_ptr<base::Value> value(rvh->ExecuteJavascriptAndGetValue( - string16(), jscript)); + string16(), UTF8ToUTF16(jscript))); } // This helper method does the following: @@ -302,15 +302,15 @@ class BrowserPluginHostTest : public ContentBrowserTest { // Allow the test to do some operations on the embedder before we perform // the first navigation of the guest. if (!embedder_code.empty()) - ExecuteSyncJSFunction(rvh, ASCIIToUTF16(embedder_code)); + ExecuteSyncJSFunction(rvh, embedder_code); if (!is_guest_data_url) { test_url = test_server()->GetURL(guest_url); - ExecuteSyncJSFunction(rvh, - ASCIIToUTF16(StringPrintf("SetSrc('%s');", test_url.spec().c_str()))); + ExecuteSyncJSFunction( + rvh, StringPrintf("SetSrc('%s');", test_url.spec().c_str())); } else { - ExecuteSyncJSFunction(rvh, - ASCIIToUTF16(StringPrintf("SetSrc('%s');", guest_url.c_str()))); + ExecuteSyncJSFunction( + rvh, StringPrintf("SetSrc('%s');", guest_url.c_str())); } // Wait to make sure embedder is created/attached to WebContents. @@ -366,8 +366,9 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, expected_title); // Hang the guest for a length of time. int spin_time = 10 * TestTimeouts::tiny_timeout().InMilliseconds(); - ExecuteSyncJSFunction(test_guest()->web_contents()->GetRenderViewHost(), - ASCIIToUTF16(StringPrintf("StartPauseMs(%d);", spin_time).c_str())); + ExecuteSyncJSFunction( + test_guest()->web_contents()->GetRenderViewHost(), + StringPrintf("StartPauseMs(%d);", spin_time).c_str()); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -510,8 +511,8 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, BrowserPluginVisibilityChanged) { // Hide the Browser Plugin. RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - "document.getElementById('plugin').style.visibility = 'hidden'")); + ExecuteSyncJSFunction( + rvh, "document.getElementById('plugin').style.visibility = 'hidden'"); // Make sure that the guest is hidden. test_guest()->WaitUntilHidden(); @@ -537,8 +538,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, ReloadGuest) { RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - "document.getElementById('plugin').reload()")); + ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').reload()"); test_guest()->WaitForReload(); } @@ -550,8 +550,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, StopGuest) { RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - "document.getElementById('plugin').stop()")); + ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').stop()"); test_guest()->WaitForStop(); } @@ -571,7 +570,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, AcceptTouchEvents) { RenderViewHostMessageObserver observer(rvh, ViewHostMsg_HasTouchEventHandlers::ID); ExecuteSyncJSFunction(test_guest()->web_contents()->GetRenderViewHost(), - ASCIIToUTF16("InstallTouchHandler();")); + "InstallTouchHandler();"); observer.WaitUntilMessageReceived(); EXPECT_TRUE(rvh->has_touch_handler()); @@ -579,7 +578,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, AcceptTouchEvents) { // listening for touch events. observer.ResetState(); ExecuteSyncJSFunction(test_guest()->web_contents()->GetRenderViewHost(), - ASCIIToUTF16("UninstallTouchHandler();")); + "UninstallTouchHandler();"); observer.WaitUntilMessageReceived(); EXPECT_FALSE(rvh->has_touch_handler()); } @@ -597,8 +596,9 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, Renavigate) { content::TitleWatcher title_watcher(test_guest()->web_contents(), expected_title); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16(StringPrintf("SetSrc('%s');", - GetHTMLForGuestWithTitle("P2").c_str()))); + ExecuteSyncJSFunction( + rvh, + StringPrintf("SetSrc('%s');", GetHTMLForGuestWithTitle("P2").c_str())); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -610,8 +610,9 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, Renavigate) { content::TitleWatcher title_watcher(test_guest()->web_contents(), expected_title); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16(StringPrintf("SetSrc('%s');", - GetHTMLForGuestWithTitle("P3").c_str()))); + ExecuteSyncJSFunction( + rvh, + StringPrintf("SetSrc('%s');", GetHTMLForGuestWithTitle("P3").c_str())); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -623,7 +624,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, Renavigate) { content::TitleWatcher title_watcher(test_guest()->web_contents(), expected_title); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16("Back();")); + ExecuteSyncJSFunction(rvh, "Back();"); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -646,7 +647,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, Renavigate) { content::TitleWatcher title_watcher(test_guest()->web_contents(), expected_title); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16("Forward();")); + ExecuteSyncJSFunction(rvh, "Forward();"); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -663,7 +664,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, Renavigate) { content::TitleWatcher title_watcher(test_guest()->web_contents(), expected_title); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16("Go(-2);")); + ExecuteSyncJSFunction(rvh, "Go(-2);"); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -691,8 +692,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, ReloadEmbedder) { content::TitleWatcher title_watcher(test_embedder()->web_contents(), expected_title); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16(StringPrintf("SetTitle('%s');", - "modified"))); + ExecuteSyncJSFunction(rvh, StringPrintf("SetTitle('%s');", "modified")); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -709,8 +709,9 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, ReloadEmbedder) { string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); - ExecuteSyncJSFunction(test_embedder()->web_contents()->GetRenderViewHost(), - ASCIIToUTF16(StringPrintf("SetSrc('%s');", kHTMLForGuest))); + ExecuteSyncJSFunction( + test_embedder()->web_contents()->GetRenderViewHost(), + StringPrintf("SetSrc('%s');", kHTMLForGuest)); const BrowserPluginEmbedder::ContainerInstanceMap& instance_map = test_embedder()->guest_web_contents_for_testing(); @@ -731,8 +732,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, TerminateGuest) { RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - "document.getElementById('plugin').terminate()")); + ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').terminate()"); // Expect the guest to crash. test_guest()->WaitForExit(); @@ -753,15 +753,15 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, BackAfterTerminateGuest) { content::TitleWatcher title_watcher(test_guest()->web_contents(), expected_title); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16(StringPrintf("SetSrc('%s');", - GetHTMLForGuestWithTitle("P2").c_str()))); + ExecuteSyncJSFunction( + rvh, + StringPrintf("SetSrc('%s');", GetHTMLForGuestWithTitle("P2").c_str())); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); } // Kill the guest. - ExecuteSyncJSFunction(rvh, - ASCIIToUTF16("document.getElementById('plugin').terminate()")); + ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').terminate()"); // Expect the guest to report that it crashed. test_guest()->WaitForExit(); @@ -771,7 +771,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, BackAfterTerminateGuest) { content::TitleWatcher title_watcher(test_guest()->web_contents(), expected_title); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16("Back();")); + ExecuteSyncJSFunction(rvh, "Back();"); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -792,8 +792,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadStart) { // Renavigate the guest to |kHTMLForGuest|. RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - StringPrintf("SetSrc('%s');", kHTMLForGuest))); + ExecuteSyncJSFunction(rvh, StringPrintf("SetSrc('%s');", kHTMLForGuest)); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -811,8 +810,8 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadAbort) { RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); GURL test_url = test_server()->GetURL("close-socket"); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - StringPrintf("SetSrc('%s');", test_url.spec().c_str()))); + ExecuteSyncJSFunction( + rvh, StringPrintf("SetSrc('%s');", test_url.spec().c_str())); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); } @@ -825,8 +824,8 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadAbort) { RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); GURL test_url("chrome://newtab"); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - StringPrintf("SetSrc('%s');", test_url.spec().c_str()))); + ExecuteSyncJSFunction( + rvh, StringPrintf("SetSrc('%s');", test_url.spec().c_str())); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); } @@ -839,8 +838,8 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadAbort) { RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); GURL test_url("file://foo"); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - StringPrintf("SetSrc('%s');", test_url.spec().c_str()))); + ExecuteSyncJSFunction( + rvh, StringPrintf("SetSrc('%s');", test_url.spec().c_str())); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); } @@ -859,8 +858,8 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadRedirect) { "server-redirect?files/title1.html")); RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - StringPrintf("SetSrc('%s');", redirect_url.spec().c_str()))); + ExecuteSyncJSFunction( + rvh, StringPrintf("SetSrc('%s');", redirect_url.spec().c_str())); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -949,8 +948,8 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, PostMessage) { // By the time we get here 'contentWindow' should be ready because the // guest has completed loading. - ExecuteSyncJSFunction(rvh, - ASCIIToUTF16(StringPrintf("PostMessage('%s, false');", kTesting))); + ExecuteSyncJSFunction( + rvh, StringPrintf("PostMessage('%s, false');", kTesting)); // The title will be updated to "main guest" at the last stage of the // process described above. @@ -975,8 +974,8 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, DISABLED_PostMessageToIFrame) { content::TitleWatcher title_watcher(test_embedder()->web_contents(), expected_title); - ExecuteSyncJSFunction(rvh, - ASCIIToUTF16(StringPrintf("PostMessage('%s, false');", kTesting))); + ExecuteSyncJSFunction( + rvh, StringPrintf("PostMessage('%s, false');", kTesting)); // The title will be updated to "main guest" at the last stage of the // process described above. @@ -991,17 +990,17 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, DISABLED_PostMessageToIFrame) { test_guest()->web_contents()->GetRenderViewHost()); GURL test_url = test_server()->GetURL( "files/browser_plugin_post_message_guest.html"); - ExecuteSyncJSFunction(guest_rvh, - ASCIIToUTF16(StringPrintf("CreateChildFrame('%s');", - test_url.spec().c_str()))); + ExecuteSyncJSFunction( + guest_rvh, + StringPrintf("CreateChildFrame('%s');", test_url.spec().c_str())); string16 actual_title = ready_watcher.WaitAndGetTitle(); EXPECT_EQ(ASCIIToUTF16("ready"), actual_title); content::TitleWatcher iframe_watcher(test_embedder()->web_contents(), ASCIIToUTF16("iframe")); - ExecuteSyncJSFunction(rvh, - ASCIIToUTF16(StringPrintf("PostMessage('%s', true);", kTesting))); + ExecuteSyncJSFunction( + rvh, StringPrintf("PostMessage('%s', true);", kTesting)); // The title will be updated to "iframe" at the last stage of the // process described above. @@ -1020,8 +1019,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadStop) { // Renavigate the guest to |kHTMLForGuest|. RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - StringPrintf("SetSrc('%s');", kHTMLForGuest))); + ExecuteSyncJSFunction(rvh, StringPrintf("SetSrc('%s');", kHTMLForGuest)); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -1038,8 +1036,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadCommit) { // Renavigate the guest to |kHTMLForGuest|. RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - StringPrintf("SetSrc('%s');", kHTMLForGuest))); + ExecuteSyncJSFunction(rvh, StringPrintf("SetSrc('%s');", kHTMLForGuest)); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); @@ -1072,16 +1069,14 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, DISABLED_VisibilityPreservation) { RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( test_embedder()->web_contents()->GetRenderViewHost()); // Hide the BrowserPlugin. - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - "document.getElementById('plugin').style.visibility = 'hidden';")); + ExecuteSyncJSFunction( + rvh, "document.getElementById('plugin').style.visibility = 'hidden';"); test_guest()->WaitUntilHidden(); // Kill the current guest. - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - "document.getElementById('plugin').terminate();")); + ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').terminate();"); test_guest()->WaitForExit(); // Get a new guest. - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - "document.getElementById('plugin').reload();")); + ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').reload();"); test_guest()->WaitForLoadStop(); // Verify that the guest is told to hide. test_guest()->WaitUntilHidden(); @@ -1118,8 +1113,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, FocusPreservation) { { // Focus the BrowserPlugin. This will have the effect of also focusing the // current guest. - ExecuteSyncJSFunction( - rvh, ASCIIToUTF16("document.getElementById('plugin').focus();")); + ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').focus();"); // Verify that key presses go to the guest. SimulateSpaceKeyPress(test_embedder()->web_contents()); test_guest()->WaitForInput(); @@ -1133,14 +1127,12 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, FocusPreservation) { } // Kill the current guest. - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - "document.getElementById('plugin').terminate();")); + ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').terminate();"); test_guest()->WaitForExit(); { // Get a new guest. - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - "document.getElementById('plugin').reload();")); + ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').reload();"); test_guest()->WaitForLoadStop(); // Verify that the guest is focused. scoped_ptr<base::Value> value( @@ -1162,8 +1154,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, FocusTracksEmbedder) { { // Focus the BrowserPlugin. This will have the effect of also focusing the // current guest. - ExecuteSyncJSFunction( - rvh, ASCIIToUTF16("document.getElementById('plugin').focus();")); + ExecuteSyncJSFunction(rvh, "document.getElementById('plugin').focus();"); // Verify that key presses go to the guest. SimulateSpaceKeyPress(test_embedder()->web_contents()); test_guest()->WaitForInput(); @@ -1209,12 +1200,13 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, AutoSizeAfterNavigation) { const string16 expected_title = ASCIIToUTF16("AutoSize(300, 400)"); content::TitleWatcher title_watcher(test_embedder()->web_contents(), expected_title); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( + ExecuteSyncJSFunction( + rvh, "document.getElementById('plugin').minWidth = 300;" "document.getElementById('plugin').minHeight = 200;" "document.getElementById('plugin').maxWidth = 600;" "document.getElementById('plugin').maxHeight = 400;" - "document.getElementById('plugin').autoSize = true;")); + "document.getElementById('plugin').autoSize = true;"); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); } @@ -1223,15 +1215,15 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, AutoSizeAfterNavigation) { const string16 expected_title = ASCIIToUTF16("AutoSize(350, 400)"); content::TitleWatcher title_watcher(test_embedder()->web_contents(), expected_title); - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - "document.getElementById('plugin').minWidth = 350;")); + ExecuteSyncJSFunction( + rvh, "document.getElementById('plugin').minWidth = 350;"); string16 actual_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, actual_title); } { // Turn off autoSize and verify that the guest resizes to fit the container. - ExecuteSyncJSFunction(rvh, ASCIIToUTF16( - "document.getElementById('plugin').autoSize = false;")); + ExecuteSyncJSFunction( + rvh, "document.getElementById('plugin').autoSize = false;"); test_guest()->WaitForViewSize(gfx::Size(640, 480)); } } diff --git a/content/browser/database_browsertest.cc b/content/browser/database_browsertest.cc index 1b7d165..0c49cfb 100644 --- a/content/browser/database_browsertest.cc +++ b/content/browser/database_browsertest.cc @@ -28,8 +28,10 @@ class DatabaseTest : public ContentBrowserTest { const std::string& result) { std::string data; ASSERT_TRUE(ExecuteJavaScriptAndExtractString( - shell->web_contents()->GetRenderViewHost(), L"", - ASCIIToWide(script), &data)); + shell->web_contents()->GetRenderViewHost(), + std::string(), + script, + &data)); ASSERT_EQ(data, result); } @@ -47,13 +49,14 @@ class DatabaseTest : public ContentBrowserTest { void UpdateRecord(Shell* shell, int index, const std::string& data) { RunScriptAndCheckResult( - shell, "updateRecord(" + base::IntToString(index) + ", '" + data + "')", - "done"); + shell, + "updateRecord(" + base::IntToString(index) + ", '" + data + "')", + "done"); } void DeleteRecord(Shell* shell, int index) { RunScriptAndCheckResult( - shell, "deleteRecord(" + base::IntToString(index) + ")", "done"); + shell, "deleteRecord(" + base::IntToString(index) + ")", "done"); } void CompareRecords(Shell* shell, const std::string& expected) { @@ -63,8 +66,10 @@ class DatabaseTest : public ContentBrowserTest { bool HasTable(Shell* shell) { std::string data; CHECK(ExecuteJavaScriptAndExtractString( - shell->web_contents()->GetRenderViewHost(), L"", - ASCIIToWide("getRecords()"), &data)); + shell->web_contents()->GetRenderViewHost(), + std::string(), + "getRecords()", + &data)); return data != "getRecords error: [object SQLError]"; } }; diff --git a/content/browser/dom_storage/dom_storage_browsertest.cc b/content/browser/dom_storage/dom_storage_browsertest.cc index 8182475..84405f2 100644 --- a/content/browser/dom_storage/dom_storage_browsertest.cc +++ b/content/browser/dom_storage/dom_storage_browsertest.cc @@ -29,8 +29,10 @@ class DomStorageBrowserTest : public ContentBrowserTest { if (result != "pass") { std::string js_result; ASSERT_TRUE(ExecuteJavaScriptAndExtractString( - the_browser->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(getLog())", &js_result)); + the_browser->web_contents()->GetRenderViewHost(), + std::string(), + "window.domAutomationController.send(getLog())", + &js_result)); FAIL() << "Failed: " << js_result; } } diff --git a/content/browser/encrypted_media_browsertest.cc b/content/browser/encrypted_media_browsertest.cc index 0313733..0aee2ed 100644 --- a/content/browser/encrypted_media_browsertest.cc +++ b/content/browser/encrypted_media_browsertest.cc @@ -77,8 +77,10 @@ class EncryptedMediaTest : public testing::WithParamInterface<const char*>, if (final_title == kFailed) { std::string fail_message; EXPECT_TRUE(ExecuteJavaScriptAndExtractString( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(failMessage);", &fail_message)); + shell()->web_contents()->GetRenderViewHost(), + std::string(), + "window.domAutomationController.send(failMessage);", + &fail_message)); LOG(INFO) << "Test failed: " << fail_message; } } diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc index be47ac7..e01f08b 100644 --- a/content/browser/fileapi/file_system_browsertest.cc +++ b/content/browser/fileapi/file_system_browsertest.cc @@ -42,8 +42,10 @@ class FileSystemBrowserTest : public ContentBrowserTest { if (result != "pass") { std::string js_result; ASSERT_TRUE(ExecuteJavaScriptAndExtractString( - the_browser->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(getLog())", &js_result)); + the_browser->web_contents()->GetRenderViewHost(), + std::string(), + "window.domAutomationController.send(getLog())", + &js_result)); FAIL() << "Failed: " << js_result; } } diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc index da6380a..e8f3222 100644 --- a/content/browser/in_process_webkit/indexed_db_browsertest.cc +++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc @@ -50,8 +50,10 @@ class IndexedDBBrowserTest : public ContentBrowserTest { if (result != "pass") { std::string js_result; ASSERT_TRUE(ExecuteJavaScriptAndExtractString( - the_browser->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(getLog())", &js_result)); + the_browser->web_contents()->GetRenderViewHost(), + std::string(), + "window.domAutomationController.send(getLog())", + &js_result)); FAIL() << "Failed: " << js_result; } } diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc index eee7c39..a9457ea 100644 --- a/content/browser/loader/resource_dispatcher_host_browsertest.cc +++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc @@ -69,7 +69,7 @@ class ResourceDispatcherHostBrowserTest : public ContentBrowserTest, ShellAddedObserver new_shell_observer; // Create dynamic popup. - if (!ExecuteJavaScript(render_view_host(), L"", L"OpenPopup();")) + if (!ExecuteJavaScript(render_view_host(), "", "OpenPopup();")) return false; Shell* new_shell = new_shell_observer.GetShell(); @@ -167,8 +167,8 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, SyncXMLHttpRequest) { bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( shell()->web_contents()->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(DidSyncRequestSucceed());", + "", + "window.domAutomationController.send(DidSyncRequestSucceed());", &success)); EXPECT_TRUE(success); } @@ -185,8 +185,8 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( shell()->web_contents()->GetRenderViewHost(), - L"", - L"window.domAutomationController.send(DidSucceed());", + "", + "window.domAutomationController.send(DidSucceed());", &success)); EXPECT_TRUE(success); } @@ -348,7 +348,9 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, "window.domAutomationController.send(true);"; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( shell()->web_contents()->GetRenderViewHost(), - L"", ASCIIToWide(redirect_script), &success)); + "", + redirect_script, + &success)); EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); } diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc index 015cf1e..60c607b 100644 --- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc @@ -131,8 +131,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) { ShellAddedObserver new_shell_observer; bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickSameSiteTargetedLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); Shell* new_shell = new_shell_observer.GetShell(); @@ -150,8 +151,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) { // We should have access to the opened window's location. success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(testScriptAccessToWindow());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(testScriptAccessToWindow());", &success)); EXPECT_TRUE(success); @@ -164,8 +166,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) { // We should no longer have script access to the opened window's location. success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(testScriptAccessToWindow());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(testScriptAccessToWindow());", &success)); EXPECT_FALSE(success); } @@ -199,8 +202,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ShellAddedObserver new_shell_observer; bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickNoRefTargetBlankLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickNoRefTargetBlankLink());", &success)); EXPECT_TRUE(success); @@ -252,8 +256,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ShellAddedObserver new_shell_observer; bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickSameSiteNoRefTargetedLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickSameSiteNoRefTargetedLink());", &success)); EXPECT_TRUE(success); @@ -305,8 +310,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ShellAddedObserver new_shell_observer; bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickTargetBlankLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickTargetBlankLink());", &success)); EXPECT_TRUE(success); @@ -352,8 +358,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Test clicking a rel=noreferrer link. bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickNoRefLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickNoRefLink());", &success)); EXPECT_TRUE(success); @@ -399,8 +406,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ShellAddedObserver new_shell_observer; bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickSameSiteTargetedLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); Shell* new_shell = new_shell_observer.GetShell(); @@ -427,8 +435,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, Source<NavigationController>( &new_shell->web_contents()->GetController())); EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickSameSiteTargetedLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); navigation_observer.Wait(); @@ -447,8 +456,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NOTIFICATION_WEB_CONTENTS_DESTROYED, Source<WebContents>(new_shell->web_contents())); EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(testCloseWindow());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(testCloseWindow());", &success)); EXPECT_TRUE(success); close_observer.Wait(); @@ -482,8 +492,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) { ShellAddedObserver new_shell_observer; bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickSameSiteTargetBlankLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickSameSiteTargetBlankLink());", &success)); EXPECT_TRUE(success); Shell* new_shell = new_shell_observer.GetShell(); @@ -506,8 +517,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) { // Now disown the opener. EXPECT_TRUE(ExecuteJavaScript( - new_shell->web_contents()->GetRenderViewHost(), L"", - L"window.opener = null;")); + new_shell->web_contents()->GetRenderViewHost(), + "", + "window.opener = null;")); // Go back and ensure the opener is still null. { @@ -520,8 +532,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) { } success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - new_shell->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(window.opener == null);", + new_shell->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(window.opener == null);", &success)); EXPECT_TRUE(success); @@ -529,8 +542,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) { NavigateToURL(new_shell, https_server.GetURL("files/title1.html")); success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - new_shell->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(window.opener == null);", + new_shell->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(window.opener == null);", &success)); EXPECT_TRUE(success); } @@ -578,8 +592,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ShellAddedObserver new_shell_observer; bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - opener_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickSameSiteTargetedLink());", + opener_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); Shell* new_shell = new_shell_observer.GetShell(); @@ -597,8 +612,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Second, a target=_blank window. ShellAddedObserver new_shell_observer2; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickSameSiteTargetBlankLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickSameSiteTargetBlankLink());", &success)); EXPECT_TRUE(success); @@ -623,9 +639,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // origin is wrong. We won't see an error, but we can check for the right // number of received messages below. EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - foo_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(postToOpener('msg'," - L"'http://google.com'));", + foo_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(postToOpener('msg'," + "'http://google.com'));", &success)); EXPECT_TRUE(success); ASSERT_FALSE(opener_manager->GetSwappedOutRenderViewHost(orig_site_instance)); @@ -636,8 +653,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED, Source<WebContents>(foo_contents)); EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - foo_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(postToOpener('msg','*'));", + foo_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(postToOpener('msg','*'));", &success)); EXPECT_TRUE(success); ASSERT_FALSE(opener_manager->GetSwappedOutRenderViewHost(orig_site_instance)); @@ -647,13 +665,15 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // and updated the title. int opener_received_messages = 0; EXPECT_TRUE(ExecuteJavaScriptAndExtractInt( - opener_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(window.receivedMessages);", + opener_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(window.receivedMessages);", &opener_received_messages)); int foo_received_messages = 0; EXPECT_TRUE(ExecuteJavaScriptAndExtractInt( - foo_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(window.receivedMessages);", + foo_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(window.receivedMessages);", &foo_received_messages)); EXPECT_EQ(1, foo_received_messages); EXPECT_EQ(1, opener_received_messages); @@ -665,8 +685,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED, Source<WebContents>(foo_contents)); EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - new_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(postToFoo('msg2'));", + new_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(postToFoo('msg2'));", &success)); EXPECT_TRUE(success); title_observer2.Wait(); @@ -710,8 +731,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ShellAddedObserver new_shell_observer; bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - orig_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickSameSiteTargetedLink());", + orig_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); Shell* new_shell = new_shell_observer.GetShell(); @@ -738,8 +760,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, Source<NavigationController>( &orig_contents->GetController())); EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - new_shell->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(navigateOpener());", + new_shell->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(navigateOpener());", &success)); EXPECT_TRUE(success); navigation_observer.Wait(); @@ -780,8 +803,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ShellAddedObserver new_shell_observer; bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickSameSiteTargetedLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); Shell* new_shell = new_shell_observer.GetShell(); @@ -861,8 +885,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) { // Renderer-initiated navigations should work. bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickNoRefLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickNoRefLink());", &success)); EXPECT_TRUE(success); @@ -1020,8 +1045,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ShellAddedObserver new_shell_observer; bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(clickSameSiteTargetedLink());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); Shell* new_shell = new_shell_observer.GetShell(); @@ -1033,9 +1059,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, RenderViewHost* rvh = new_shell->web_contents()->GetRenderViewHost(); EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - rvh, L"", - L"window.domAutomationController.send(" - L"document.webkitVisibilityState == 'visible');", + rvh, + "", + "window.domAutomationController.send(" + "document.webkitVisibilityState == 'visible');", &success)); EXPECT_TRUE(success); @@ -1044,9 +1071,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NavigateToURL(new_shell, https_server.GetURL("files/title1.html")); EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - rvh, L"", - L"window.domAutomationController.send(" - L"document.webkitVisibilityState == 'hidden');", + rvh, + "", + "window.domAutomationController.send(" + "document.webkitVisibilityState == 'hidden');", &success)); EXPECT_TRUE(success); @@ -1068,9 +1096,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, EXPECT_EQ(rvh, new_shell->web_contents()->GetRenderViewHost()); EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - rvh, L"", - L"window.domAutomationController.send(" - L"document.webkitVisibilityState == 'visible');", + rvh, + "", + "window.domAutomationController.send(" + "document.webkitVisibilityState == 'visible');", &success)); EXPECT_TRUE(success); } @@ -1239,8 +1268,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) { ShellAddedObserver shell_observer1; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - opener_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(openWindow('1-3.html'));", + opener_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(openWindow('1-3.html'));", &success)); EXPECT_TRUE(success); @@ -1260,8 +1290,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) { ShellAddedObserver shell_observer2; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - opener_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(openWindow('../title2.html'));", + opener_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(openWindow('../title2.html'));", &success)); EXPECT_TRUE(success); @@ -1320,8 +1351,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) { // Now let's ensure that using JS to add/remove frames results in proper // updates. EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - opener_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(removeFrame());", + opener_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(removeFrame());", &success)); EXPECT_TRUE(success); frames = GetTree(opener_rvhm->current_host()); @@ -1335,8 +1367,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) { Source<NavigationController>( &opener_contents->GetController())); EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - opener_contents->GetRenderViewHost(), L"", - L"window.domAutomationController.send(addFrame());", + opener_contents->GetRenderViewHost(), + "", + "window.domAutomationController.send(addFrame());", &success)); EXPECT_TRUE(success); load_observer.Wait(); @@ -1386,8 +1419,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ShellAddedObserver new_shell_observer; bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(openWindow());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(openWindow());", &success)); EXPECT_TRUE(success); Shell* new_shell = new_shell_observer.GetShell(); diff --git a/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc index 357fedb..8c0bb30 100644 --- a/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc @@ -41,8 +41,9 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest, // Focus to the text field, the IME should be enabled. bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(text01_focus());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(text01_focus());", &success)); EXPECT_TRUE(success); WaitForLoadStop(shell()->web_contents()); @@ -52,8 +53,9 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest, // Focus to the password field, the IME should be disabled. success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(password02_focus());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(password02_focus());", &success)); EXPECT_TRUE(success); WaitForLoadStop(shell()->web_contents()); @@ -79,8 +81,9 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest, // Focus to the text field, the IME should be enabled. bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(text01_focus());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(text01_focus());", &success)); EXPECT_TRUE(success); WaitForLoadStop(shell()->web_contents()); @@ -90,8 +93,9 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest, // Focus to another text field, the IME should be enabled. success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(text02_focus());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(text02_focus());", &success)); EXPECT_TRUE(success); WaitForLoadStop(shell()->web_contents()); @@ -117,8 +121,9 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest, // Focus to the password field, the IME should be disabled. bool success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(password01_focus());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(password01_focus());", &success)); EXPECT_TRUE(success); WaitForLoadStop(shell()->web_contents()); @@ -128,8 +133,9 @@ IN_PROC_BROWSER_TEST_F(RenderWidgetHostViewWinTest, // Focus to the another password field, the IME should be disabled. success = false; EXPECT_TRUE(ExecuteJavaScriptAndExtractBool( - shell()->web_contents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(password02_focus());", + shell()->web_contents()->GetRenderViewHost(), + "", + "window.domAutomationController.send(password02_focus());", &success)); EXPECT_TRUE(success); WaitForLoadStop(shell()->web_contents()); diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc index 232ad17..c81f89c 100644 --- a/content/browser/session_history_browsertest.cc +++ b/content/browser/session_history_browsertest.cc @@ -431,14 +431,18 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) { int length; ASSERT_TRUE(ExecuteJavaScriptAndExtractInt( shell()->web_contents()->GetRenderViewHost(), - L"", L"domAutomationController.send(history.length)", &length)); + "", + "domAutomationController.send(history.length)", + &length)); EXPECT_EQ(1, length); NavigateToURL(shell(), GetURL("title1.html")); ASSERT_TRUE(ExecuteJavaScriptAndExtractInt( shell()->web_contents()->GetRenderViewHost(), - L"", L"domAutomationController.send(history.length)", &length)); + "", + "domAutomationController.send(history.length)", + &length)); EXPECT_EQ(2, length); // Now test that history.length is updated when the navigation is committed. @@ -446,7 +450,9 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) { ASSERT_TRUE(ExecuteJavaScriptAndExtractInt( shell()->web_contents()->GetRenderViewHost(), - L"", L"domAutomationController.send(history.length)", &length)); + "", + "domAutomationController.send(history.length)", + &length)); EXPECT_EQ(3, length); GoBack(); @@ -457,7 +463,9 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) { ASSERT_TRUE(ExecuteJavaScriptAndExtractInt( shell()->web_contents()->GetRenderViewHost(), - L"", L"domAutomationController.send(history.length)", &length)); + "", + "domAutomationController.send(history.length)", + &length)); EXPECT_EQ(2, length); } diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc index 908c075..b215efe 100644 --- a/content/browser/site_per_process_browsertest.cc +++ b/content/browser/site_per_process_browsertest.cc @@ -153,7 +153,7 @@ class SitePerProcessBrowserTest : public ContentBrowserTest { Source<NavigationController>( &shell()->web_contents()->GetController())); bool result = ExecuteJavaScript(window->web_contents()->GetRenderViewHost(), - L"", ASCIIToWide(script)); + "", script); load_observer.Wait(); return result; } diff --git a/content/browser/webrtc_browsertest.cc b/content/browser/webrtc_browsertest.cc index 98b9c8c..3e5b224 100644 --- a/content/browser/webrtc_browsertest.cc +++ b/content/browser/webrtc_browsertest.cc @@ -33,7 +33,7 @@ class WebrtcBrowserTest: public ContentBrowserTest { RenderViewHost* render_view_host = shell()->web_contents()->GetRenderViewHost(); - return ExecuteJavaScript(render_view_host, L"", ASCIIToWide(javascript)); + return ExecuteJavaScript(render_view_host, "", javascript); } void ExpectTitle(const std::string& expected_title) const { diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc index 6efa0a6..5de453b 100644 --- a/content/public/test/browser_test_utils.cc +++ b/content/public/test/browser_test_utils.cc @@ -33,7 +33,6 @@ static const int kDefaultWsPort = 8880; namespace content { - namespace { class DOMOperationObserver : public NotificationObserver, @@ -79,24 +78,24 @@ class DOMOperationObserver : public NotificationObserver, // Specifying a prototype so that we can add the WARN_UNUSED_RESULT attribute. bool ExecuteJavaScriptHelper(RenderViewHost* render_view_host, - const std::wstring& frame_xpath, - const std::wstring& original_script, + const std::string& frame_xpath, + const std::string& original_script, scoped_ptr<Value>* result) WARN_UNUSED_RESULT; // Executes the passed |original_script| in the frame pointed to by // |frame_xpath|. If |result| is not NULL, stores the value that the evaluation // of the script in |result|. Returns true on success. bool ExecuteJavaScriptHelper(RenderViewHost* render_view_host, - const std::wstring& frame_xpath, - const std::wstring& original_script, + const std::string& frame_xpath, + const std::string& original_script, scoped_ptr<Value>* result) { // TODO(jcampan): we should make the domAutomationController not require an // automation id. - std::wstring script = L"window.domAutomationController.setAutomationId(0);" + - original_script; + std::string script = + "window.domAutomationController.setAutomationId(0);" + original_script; DOMOperationObserver dom_op_observer(render_view_host); - render_view_host->ExecuteJavascriptInWebFrame(WideToUTF16Hack(frame_xpath), - WideToUTF16Hack(script)); + render_view_host->ExecuteJavascriptInWebFrame(UTF8ToUTF16(frame_xpath), + UTF8ToUTF16(script)); std::string json; if (!dom_op_observer.WaitAndGetResponse(&json)) { DLOG(ERROR) << "Cannot communicate with DOMOperationObserver."; @@ -281,16 +280,16 @@ void SimulateKeyPress(WebContents* web_contents, } bool ExecuteJavaScript(RenderViewHost* render_view_host, - const std::wstring& frame_xpath, - const std::wstring& original_script) { - std::wstring script = - original_script + L";window.domAutomationController.send(0);"; + const std::string& frame_xpath, + const std::string& original_script) { + std::string script = + original_script + ";window.domAutomationController.send(0);"; return ExecuteJavaScriptHelper(render_view_host, frame_xpath, script, NULL); } bool ExecuteJavaScriptAndExtractInt(RenderViewHost* render_view_host, - const std::wstring& frame_xpath, - const std::wstring& script, + const std::string& frame_xpath, + const std::string& script, int* result) { DCHECK(result); scoped_ptr<Value> value; @@ -302,8 +301,8 @@ bool ExecuteJavaScriptAndExtractInt(RenderViewHost* render_view_host, } bool ExecuteJavaScriptAndExtractBool(RenderViewHost* render_view_host, - const std::wstring& frame_xpath, - const std::wstring& script, + const std::string& frame_xpath, + const std::string& script, bool* result) { DCHECK(result); scoped_ptr<Value> value; @@ -315,8 +314,8 @@ bool ExecuteJavaScriptAndExtractBool(RenderViewHost* render_view_host, } bool ExecuteJavaScriptAndExtractString(RenderViewHost* render_view_host, - const std::wstring& frame_xpath, - const std::wstring& script, + const std::string& frame_xpath, + const std::string& script, std::string* result) { DCHECK(result); scoped_ptr<Value> value; diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h index 64817a5..8f7d380 100644 --- a/content/public/test/browser_test_utils.h +++ b/content/public/test/browser_test_utils.h @@ -84,8 +84,8 @@ void SimulateKeyPress(WebContents* web_contents, // If you want to extract a result, use one of the below functions. // Returns true on success. bool ExecuteJavaScript(RenderViewHost* render_view_host, - const std::wstring& frame_xpath, - const std::wstring& script) WARN_UNUSED_RESULT; + const std::string& frame_xpath, + const std::string& script) WARN_UNUSED_RESULT; // The following methods executes the passed |script| in the frame pointed to by // |frame_xpath| (use empty string for main frame) and sets |result| to the @@ -93,17 +93,17 @@ bool ExecuteJavaScript(RenderViewHost* render_view_host, // They return true on success, false if the script evaluation failed or did not // evaluate to the expected type. bool ExecuteJavaScriptAndExtractInt(RenderViewHost* render_view_host, - const std::wstring& frame_xpath, - const std::wstring& script, + const std::string& frame_xpath, + const std::string& script, int* result) WARN_UNUSED_RESULT; bool ExecuteJavaScriptAndExtractBool(RenderViewHost* render_view_host, - const std::wstring& frame_xpath, - const std::wstring& script, + const std::string& frame_xpath, + const std::string& script, bool* result) WARN_UNUSED_RESULT; bool ExecuteJavaScriptAndExtractString( RenderViewHost* render_view_host, - const std::wstring& frame_xpath, - const std::wstring& script, + const std::string& frame_xpath, + const std::string& script, std::string* result) WARN_UNUSED_RESULT; // Returns the cookies for the given url. |