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

chrome/test/ui/dromaeo_benchmark_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_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/test/test_timeouts.h"
@@ skipping 47 matching lines @@
     PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
     return test_dir.AppendASCII("dromaeo");
   }
 
   bool WaitUntilTestCompletes(TabProxy* tab, const GURL& test_url) {
     return WaitUntilCookieValue(tab, test_url, "__done",
                                 TestTimeouts::huge_test_timeout_ms(), "1");
   }
 
   bool GetScore(TabProxy* tab, std::string* score) {
-    std::wstring score_wide;
-    bool succeeded = tab->ExecuteAndExtractString(L"",
-        L"window.domAutomationController.send(automation.GetScore());",
-        &score_wide);
+    string16 score16;
+    bool succeeded = tab->ExecuteAndExtractString(string16(),
+        ASCIIToUTF16("window.domAutomationController.send("
+                     "automation.GetScore());"),
+        &score16);
 
     // 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;
 
-    score->assign(WideToUTF8(score_wide));
+    score->assign(UTF16ToUTF8(score16));
     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 score;
     ASSERT_TRUE(GetScore(tab, &score));
 
     ResultsMap results;
     ASSERT_TRUE(GetResults(tab, &results));
 
@@ skipping 63 matching lines @@
 
 TEST_F(DromaeoReferenceTest, JSLibPerf) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
     return;
 
   RunTest(FILE_PATH_LITERAL("jslib"));
 }
 
 
 }  // namespace