commit 06bc5d9a46ad798452b317fc47be8acd5ff041c5
author darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jan 02 22:44:13 2013
committer darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jan 02 22:44:13 2013
tree fe194e49cf0ea3f31a88b60821abb82c4fe6a853
parent 78e2370448246f03b6f795b105746bf82ba5f4f4

Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc}
to take std::string (UTF-8) instead of std::wstring.  This seems to help
simplify callsites considerably.

TBR=jam@chromium.org
BUG=none


Review URL: https://chromiumcodereview.appspot.com/11728003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174880 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/app_process_apitest.cc

diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index d85b04c3..241ad9d 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -225,8 +225,9 @@
             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 @@
       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 @@
       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 @@
   // 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 @@
       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 @@
   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);
 }