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

chrome/test/webdriver/automation.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 "chrome/test/webdriver/automation.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 32 matching lines @@
 }
 
 void Automation::Terminate() {
   QuitBrowser();
 }
 
 void Automation::ExecuteScript(const std::string& frame_xpath,
                                const std::string& script,
                                std::string* result,
                                bool* success) {
-  std::wstring wide_xpath = UTF8ToWide(frame_xpath);
-  std::wstring wide_script = UTF8ToWide(script);
-  std::wstring wide_result;
+  string16 xpath16 = UTF8ToUTF16(frame_xpath);
+  string16 script16 = UTF8ToUTF16(script);
+  string16 result16;
   *success = tab_->ExecuteAndExtractString(
-      wide_xpath, wide_script, &wide_result);
+      xpath16, script16, &result16);

[Evan Martin, 2011/02/07 22:52:29]

Maybe fits on one line?

[Avi (use Gerrit), 2011/02/07 22:55:25]

Done.

   if (*success)
-    *result = WideToUTF8(wide_result);
+    *result = UTF16ToUTF8(result16);
 }
 
 void Automation::NavigateToURL(const std::string& url,
                                bool* success) {
   *success = tab_->NavigateToURL(GURL(url));
 }
 
 void Automation::GoForward(bool* success) {
   *success = tab_->GoForward();
 }
 
 void Automation::GoBack(bool* success) {
   *success = tab_->GoBack();
 }
 
 void Automation::Reload(bool* success) {
   *success = tab_->Reload();
 }
 
 void Automation::GetURL(std::string* url,
                         bool* success) {
   GURL gurl;
   *success = tab_->GetCurrentURL(&gurl);
   if (*success)
     *url = gurl.possibly_invalid_spec();
 }
 
 void Automation::GetTabTitle(std::string* tab_title,
                              bool* success) {
-  std::wstring wide_title;
-  *success = tab_->GetTabTitle(&wide_title);
+  string16 title16;
+  *success = tab_->GetTabTitle(&title16);
   if (*success)
-    *tab_title = WideToUTF8(wide_title);
+    *tab_title = UTF16ToUTF8(title16);
 }
 
 }  // namespace webdriver