Remove wstring from RVH's run Javascript command....

chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sstream>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/test/test_timeouts.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_request_failed_dns_job.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
 
 namespace {
@@ skipping 63 matching lines @@
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get());
   scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab());
   ASSERT_TRUE(tab.get());
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(test_server.GetURL(
                 "files/sync_xmlhttprequest.html")));
 
   // Let's check the XMLHttpRequest ran successfully.
   bool success = false;
-  EXPECT_TRUE(tab->ExecuteAndExtractBool(L"",
-      L"window.domAutomationController.send(DidSyncRequestSucceed());",
+  EXPECT_TRUE(tab->ExecuteAndExtractBool(
+      string16(),
+      ASCIIToUTF16("window.domAutomationController.send("
+                   "DidSyncRequestSucceed());"),
       &success));
   EXPECT_TRUE(success);
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=62776
 TEST_F(ResourceDispatcherTest, FLAKY_SyncXMLHttpRequest_Disallowed) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP,
                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(test_server.Start());
 
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get());
   scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab());
   ASSERT_TRUE(tab.get());
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(test_server.GetURL(
                 "files/sync_xmlhttprequest_disallowed.html")));
 
   // Let's check the XMLHttpRequest ran successfully.
   bool success = false;
-  EXPECT_TRUE(tab->ExecuteAndExtractBool(L"",
-      L"window.domAutomationController.send(DidSucceed());",
+  EXPECT_TRUE(tab->ExecuteAndExtractBool(
+      string16(),
+      ASCIIToUTF16("window.domAutomationController.send(DidSucceed());"),
       &success));
   EXPECT_TRUE(success);
 }
 
 // Test for bug #1159553 -- A synchronous xhr (whose content-type is
 // downloadable) would trigger download and hang the renderer process,
 // if executed while navigating to a new page.
 // Disabled -- http://code.google.com/p/chromium/issues/detail?id=56264
 TEST_F(ResourceDispatcherTest, DISABLED_SyncXMLHttpRequest_DuringUnload) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP,
                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(test_server.Start());
 
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get());
   scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab());
   ASSERT_TRUE(tab.get());
 
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(test_server.GetURL(
                 "files/sync_xmlhttprequest_during_unload.html")));
 
   // Confirm that the page has loaded (since it changes its title during load).
-  std::wstring tab_title;
+  string16 tab_title;
   EXPECT_TRUE(tab->GetTabTitle(&tab_title));
-  EXPECT_EQ(L"sync xhr on unload", tab_title);
+  EXPECT_EQ(ASCIIToUTF16("sync xhr on unload"), tab_title);
 
   // Navigate to a new page, to dispatch unload event and trigger xhr.
   // (the bug would make this step hang the renderer).
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(test_server.GetURL("files/title2.html")));
 
   // Check that the new page got loaded, and that no download was triggered.
   EXPECT_TRUE(tab->GetTabTitle(&tab_title));
-  EXPECT_EQ(L"Title Of Awesomeness", tab_title);
+  EXPECT_EQ(ASCIIToUTF16("Title Of Awesomeness"), tab_title);
 
   bool shelf_is_visible = false;
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   EXPECT_TRUE(browser->IsShelfVisible(&shelf_is_visible));
   EXPECT_FALSE(shelf_is_visible);
 }
 
 // Tests that onunload is run for cross-site requests.  (Bug 1114994)
 TEST_F(ResourceDispatcherTest, CrossSiteOnunloadCookie) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP,
                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(test_server.Start());
 
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get());
   scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab());
   ASSERT_TRUE(tab.get());
 
   GURL url(test_server.GetURL("files/onunload_cookie.html"));
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(url));
 
   // Confirm that the page has loaded (since it changes its title during load).
-  std::wstring tab_title;
+  string16 tab_title;
   EXPECT_TRUE(tab->GetTabTitle(&tab_title));
-  EXPECT_EQ(L"set cookie on unload", tab_title);
+  EXPECT_EQ(ASCIIToUTF16("set cookie on unload"), tab_title);
 
   // Navigate to a new cross-site page, to dispatch unload event and set the
   // cookie.
   CheckTitleTest(L"content-sniffer-test0.html",
                  L"Content Sniffer Test 0", 1);
 
   // Check that the cookie was set.
   std::string value_result;
   ASSERT_TRUE(tab->GetCookieByName(url, "onunloadCookie", &value_result));
   ASSERT_FALSE(value_result.empty());
@@ skipping 65 matching lines @@
 
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get());
   scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab());
   ASSERT_TRUE(tab.get());
 
   GURL url(test_server.GetURL("files/onunload_cookie.html"));
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(url));
 
   // Confirm that the page has loaded (since it changes its title during load).
-  std::wstring tab_title;
+  string16 tab_title;
   EXPECT_TRUE(tab->GetTabTitle(&tab_title));
-  EXPECT_EQ(L"set cookie on unload", tab_title);
+  EXPECT_EQ(ASCIIToUTF16("set cookie on unload"), tab_title);
 
   // Navigate to a new cross-site URL that results in an error page.
   // TODO(creis): If this causes crashes or hangs, it might be for the same
   // reason as ErrorPageTest::DNSError.  See bug 1199491 and
   // http://crbug.com/22877.
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURLBlockUntilNavigationsComplete(
                 GURL(URLRequestFailedDnsJob::kTestUrl), 2));
   EXPECT_NE(L"set cookie on unload", GetActiveTabTitle());
 
   // Check that the cookie was set, meaning that the onunload handler ran.
   std::string value_result;
   EXPECT_TRUE(tab->GetCookieByName(url, "onunloadCookie", &value_result));
   EXPECT_FALSE(value_result.empty());
   EXPECT_STREQ("foo", value_result.c_str());
 
   // Check that renderer-initiated navigations still work.  In a previous bug,
   // the ResourceDispatcherHost would think that such navigations were
   // cross-site, because we didn't clean up from the previous request.  Since
   // TabContents was in the NORMAL state, it would ignore the attempt to run
   // the onunload handler, and the navigation would fail.
   // (Test by redirecting to javascript:window.location='someURL'.)
   GURL test_url(test_server.GetURL("files/title2.html"));
   std::string redirect_url = "javascript:window.location='" +
       test_url.possibly_invalid_spec() + "'";
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(GURL(redirect_url)));
   EXPECT_TRUE(tab->GetTabTitle(&tab_title));
-  EXPECT_EQ(L"Title Of Awesomeness", tab_title);
+  EXPECT_EQ(ASCIIToUTF16("Title Of Awesomeness"), tab_title);
 }
 
 TEST_F(ResourceDispatcherTest, CrossOriginRedirectBlocked) {
   // We expect the following URL requests from this test:
   // 1-  http://mock.http/cross-origin-redirect-blocked.html
   // 2-  http://mock.http/redirect-to-title2.html
   // 3-  http://mock.http/title2.html
   //
   // If the redirect in #2 were not blocked, we'd also see a request
   // for http://mock.http:4000/title2.html, and the title would be different.
@@ skipping 12 matching lines @@
 
   // Visit another URL first to trigger a cross-site navigation.
   GURL url(chrome::kChromeUINewTabURL);
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(url));
 
   // Visit a URL that fails without calling ResourceDispatcherHost::Read.
   GURL broken_url("chrome://theme");
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(broken_url));
 
   // Make sure the navigation finishes.
-  std::wstring tab_title;
+  string16 tab_title;
   EXPECT_TRUE(tab->GetTabTitle(&tab_title));
-  EXPECT_EQ(L"chrome://theme/ is not available", tab_title);
+  EXPECT_EQ(ASCIIToUTF16("chrome://theme/ is not available"), tab_title);
 }
 
 }  // namespace