Revert 174880 due to compilation error in pdf_browsertest.cc

chrome/browser/extensions/isolated_app_browsertest.cc

Index: chrome/browser/extensions/isolated_app_browsertest.cc
===================================================================
--- chrome/browser/extensions/isolated_app_browsertest.cc	(revision 174946)
+++ chrome/browser/extensions/isolated_app_browsertest.cc	(working copy)
@@ -30,9 +30,10 @@
 
 namespace {
 
-std::string WrapForJavascriptAndExtract(const char* javascript_expression) {
-  return std::string("window.domAutomationController.send(") +
-      javascript_expression + ")";
+std::wstring WrapForJavascriptAndExtract(
+    const wchar_t* javascript_expression) {
+  return std::wstring(L"window.domAutomationController.send(") +
+      javascript_expression + L")";
 }
 
 class IsolatedAppTest : public ExtensionBrowserTest {
@@ -126,7 +127,7 @@
   std::string script = base::StringPrintf(
         "document.location.href=\"%s\";",
         base_url.Resolve("app2/main.html").spec().c_str());
-  EXPECT_TRUE(ExecuteJavaScript(rvh, "", script));
+  EXPECT_TRUE(ExecuteJavaScript(rvh, L"", ASCIIToWide(script)));
   observer1.Wait();
 
   // This kind of navigation should not replace previous navigation entry.
@@ -182,26 +183,25 @@
   RenderViewHost* app2_rvh = tab1->GetRenderViewHost();
   RenderViewHost* non_app_rvh = tab2->GetRenderViewHost();
   ASSERT_TRUE(ExecuteJavaScript(
-      app1_rvh, "", "window.localStorage.setItem('testdata', 'ls_app1');"));
+      app1_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app1');"));
   ASSERT_TRUE(ExecuteJavaScript(
-      app2_rvh, "", "window.localStorage.setItem('testdata', 'ls_app2');"));
+      app2_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app2');"));
   ASSERT_TRUE(ExecuteJavaScript(
-      non_app_rvh,
-      "",
-      "window.localStorage.setItem('testdata', 'ls_normal');"));
+      non_app_rvh, L"",
+      L"window.localStorage.setItem('testdata', 'ls_normal');"));
 
-  const std::string& kRetrieveLocalStorage =
+  const std::wstring& kRetrieveLocalStorage =
       WrapForJavascriptAndExtract(
-          "window.localStorage.getItem('testdata') || 'badval'");
+          L"window.localStorage.getItem('testdata') || 'badval'");
   std::string result;
   ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app1_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+      app1_rvh, L"", kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_app1", result);
   ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app2_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+      app2_rvh, L"", kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_app2", result);
   ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      non_app_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+      non_app_rvh, L"", kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
 
   // Check that each tab sees its own cookie.
@@ -288,25 +288,24 @@
   RenderViewHost* non_app_rvh =
       chrome::GetWebContentsAt(browser(), 2)->GetRenderViewHost();
   ASSERT_TRUE(ExecuteJavaScript(
-      app1_rvh, "", "window.localStorage.setItem('testdata', 'ls_app1');"));
+      app1_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app1');"));
   ASSERT_TRUE(ExecuteJavaScript(
-      app2_rvh, "", "window.localStorage.setItem('testdata', 'ls_app2');"));
+      app2_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app2');"));
   ASSERT_TRUE(ExecuteJavaScript(
-      non_app_rvh,
-      "",
-      "window.localStorage.setItem('testdata', 'ls_normal');"));
+      non_app_rvh, L"",
+      L"window.localStorage.setItem('testdata', 'ls_normal');"));
 
-  const std::string& kRetrieveLocalStorage =
-      WrapForJavascriptAndExtract("window.localStorage.getItem('testdata')");
+  const std::wstring& kRetrieveLocalStorage =
+      WrapForJavascriptAndExtract(L"window.localStorage.getItem('testdata')");
   std::string result;
   ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app1_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+      app1_rvh, L"", kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
   ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      app2_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+      app2_rvh, L"", kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
   ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
-      non_app_rvh, "", kRetrieveLocalStorage.c_str(), &result));
+      non_app_rvh, L"", kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
 }
 
@@ -456,37 +455,37 @@
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ASSERT_TRUE(ExecuteJavaScript(
       chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "",
-      "window.sessionStorage.setItem('testdata', 'ss_app1');"));
+      L"",
+      L"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(),
-      "",
-      "window.sessionStorage.setItem('testdata', 'ss_app2');"));
+      L"",
+      L"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(),
-      "",
-      "window.sessionStorage.setItem('testdata', 'ss_normal');"));
+      L"",
+      L"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::string& kRetrieveSessionStorage =
+  const std::wstring& kRetrieveSessionStorage =
       WrapForJavascriptAndExtract(
-          "window.sessionStorage.getItem('testdata') || 'badval'");
+          L"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(),
-      "", kRetrieveSessionStorage.c_str(), &result));
+      L"", kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_app1", result);
 
   ui_test_utils::NavigateToURLWithDisposition(
@@ -494,7 +493,7 @@
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
       chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "", kRetrieveSessionStorage.c_str(), &result));
+      L"", kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_app2", result);
 
   ui_test_utils::NavigateToURLWithDisposition(
@@ -502,6 +501,6 @@
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
       chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(),
-      "", kRetrieveSessionStorage.c_str(), &result));
+      L"", kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_normal", result);
 }