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

chrome/test/ui/ui_test.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/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
@@ skipping 317 matching lines @@
 
   GURL url;
   bool success = tab_proxy->GetCurrentURL(&url);
   EXPECT_TRUE(success);
   if (!success)
     return GURL();
   return url;
 }
 
 std::wstring UITestBase::GetActiveTabTitle(int window_index) {
-  std::wstring title;
+  string16 title;
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab(window_index));
   EXPECT_TRUE(tab_proxy.get());
   if (!tab_proxy.get())
-    return title;
+    return std::wstring();
 
   EXPECT_TRUE(tab_proxy->GetTabTitle(&title));
-  return title;
+  return UTF16ToWideHack(title);
 }
 
 int UITestBase::GetActiveTabIndex(int window_index) {
   scoped_refptr<BrowserProxy> window_proxy(automation()->
       GetBrowserWindow(window_index));
   EXPECT_TRUE(window_proxy.get());
   if (!window_proxy.get())
     return -1;
 
   int active_tab_index = -1;
@@ skipping 357 matching lines @@
   const int kMaxIntervals = timeout_ms / kIntervalMs;
 
   // Wait until the test signals it has completed.
   for (int i = 0; i < kMaxIntervals; ++i) {
     bool browser_survived = CrashAwareSleep(kIntervalMs);
     EXPECT_TRUE(browser_survived);
     if (!browser_survived)
       return false;
 
     bool done_value = false;
-    bool success = tab->ExecuteAndExtractBool(frame_xpath, jscript,
+    bool success = tab->ExecuteAndExtractBool(WideToUTF16Hack(frame_xpath),
+                                              WideToUTF16Hack(jscript),
                                               &done_value);
     EXPECT_TRUE(success);
     if (!success)
       return false;
     if (done_value)
       return true;
   }
 
   ADD_FAILURE() << "Timeout reached in WaitUntilJavaScriptCondition";
   return false;
@@ skipping 121 matching lines @@
     incorrect_state_count++;
   }
 
   LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF()
             << " seconds"
             << " call failed " << fail_count << " times"
             << " state was incorrect " << incorrect_state_count << " times";
   ADD_FAILURE() << "Timeout reached in " << __FUNCTION__;
   return false;
 }