Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc}

chrome/browser/extensions/isolated_app_browsertest.cc

 // Copyright (c) 2012 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 "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 12 matching lines @@
 #include "net/base/mock_host_resolver.h"
 
 using content::ExecuteJavaScript;
 using content::ExecuteJavaScriptAndExtractString;
 using content::NavigationController;
 using content::WebContents;
 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 {
  public:
   // Returns whether the given tab's current URL has the given cookie.
   bool WARN_UNUSED_RESULT HasCookie(WebContents* contents, std::string cookie) {
     int value_size;
     std::string actual_cookie;
     automation_util::GetCookies(contents->GetURL(), contents, &value_size,
                                 &actual_cookie);
@@ skipping 73 matching lines @@
 
   // Using JavaScript to navigate to app2 page,
   // after the non_app page has finished loading.
   content::WindowedNotificationObserver observer1(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
   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.
   EXPECT_TRUE(chrome::CanGoBack(browser()));
   chrome::GoBack(browser(), CURRENT_TAB);
   EXPECT_FALSE(chrome::CanGoBack(browser()));
 }
 
 // Tests that cookies set within an isolated app are not visible to normal
 // pages or other apps.
@@ skipping 35 matching lines @@
   ASSERT_TRUE(GetInstalledApp(tab0));
   ASSERT_TRUE(GetInstalledApp(tab1));
   ASSERT_TRUE(!GetInstalledApp(tab2));
 
   // Check that tabs see cannot each other's localStorage even though they are
   // in the same origin.
   RenderViewHost* app1_rvh = tab0->GetRenderViewHost();
   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.
   EXPECT_TRUE(HasCookie(tab0, "app1=3"));
   EXPECT_TRUE(HasCookie(tab1, "app2=4"));
   EXPECT_TRUE(HasCookie(tab2, "normalPage=5"));
 
   // Check that app1 tab cannot see the other cookies.
   EXPECT_FALSE(HasCookie(tab0, "app2"));
   EXPECT_FALSE(HasCookie(tab0, "normalPage"));
@@ skipping 66 matching lines @@
 
   // Check that all tabs share the same localStorage if they have the same
   // origin.
   RenderViewHost* app1_rvh =
       chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost();
   RenderViewHost* app2_rvh =
       chrome::GetWebContentsAt(browser(), 1)->GetRenderViewHost();
   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);
 }
 
 // Tests that subresource and media requests use the app's cookie store.
 // See http://crbug.com/141172.
 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, SubresourceCookieIsolation) {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
@@ skipping 129 matching lines @@
   replace_host.SetHostStr(host_str);
   base_url = base_url.ReplaceComponents(replace_host);
 
   // Enter some state into sessionStorage three times on the same origin, but
   // for three URLs that correspond to app1, app2, and a non-isolated site.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("app1/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_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(
       browser(), base_url.Resolve("app2/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_app2", result);
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), base_url.Resolve("non_app/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_normal", result);
 }