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

chrome/test/ui/sunspider_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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
@@ skipping 48 matching lines @@
     PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
     return test_dir.AppendASCII("sunspider");
   }
 
   bool WaitUntilTestCompletes(TabProxy* tab, const GURL& test_url) {
     return WaitUntilCookieValue(tab, test_url, "__done",
                                 TestTimeouts::huge_test_timeout_ms(), "1");
   }
 
   bool GetTotal(TabProxy* tab, std::string* total) {
-    std::wstring total_wide;
-    bool succeeded = tab->ExecuteAndExtractString(L"",
-        L"window.domAutomationController.send(automation.GetTotal());",
-        &total_wide);
+    string16 total16;
+    bool succeeded = tab->ExecuteAndExtractString(string16(),
+        ASCIIToUTF16("window.domAutomationController.send("
+                     "automation.GetTotal());"),
+        &total16);
 
     // Note that we don't use ASSERT_TRUE here (and in some other places) as it
     // doesn't work inside a function with a return type other than void.
     EXPECT_TRUE(succeeded);
     if (!succeeded)
       return false;
 
-    total->assign(WideToUTF8(total_wide));
+    total->assign(UTF16ToUTF8(total16));
     return true;
   }
 
   bool GetResults(TabProxy* tab, ResultsMap* results) {
-    std::wstring json_wide;
-    bool succeeded = tab->ExecuteAndExtractString(L"",
-        L"window.domAutomationController.send("
-        L"    JSON.stringify(automation.GetResults()));",
-        &json_wide);
+    string16 json16;
+    bool succeeded = tab->ExecuteAndExtractString(string16(),
+        ASCIIToUTF16("window.domAutomationController.send("
+                     "JSON.stringify(automation.GetResults()));"),
+        &json16);
 
     EXPECT_TRUE(succeeded);
     if (!succeeded)
       return false;
 
-    std::string json = WideToUTF8(json_wide);
+    std::string json = UTF16ToUTF8(json16);
     return JsonDictionaryToMap(json, results);
   }
 
   void PrintResults(TabProxy* tab) {
     std::string total;
     ASSERT_TRUE(GetTotal(tab, &total));
 
     ResultsMap results;
     ASSERT_TRUE(GetResults(tab, &results));
 
@@ skipping 41 matching lines @@
 }
 
 TEST_F(SunSpiderReferenceTest, Perf) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunSunSpider))
     return;
 
   RunTest();
 }
 
 }  // namespace