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

chrome/browser/history/redirect_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.
 
 // Navigates the browser to server and client redirect pages and makes sure
 // that the correct redirects are reflected in the history database. Errors
 // here might indicate that WebKit changed the calls our glue layer gets in
 // the case of redirects. It may also mean problems with the history system.
 
 #include "base/file_util.h"
@@ skipping 242 matching lines @@
   GURL file_url = net::FilePathToFileURL(test_file);
 
   GURL initial_url = test_server_.GetURL(
       "client-redirect?" + file_url.spec());
 
   NavigateToURL(initial_url);
   // UITest will check for crashes. We make sure the title doesn't match the
   // title from the file, because the nav should not have taken place.
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
-  std::wstring actual_title;
+  string16 actual_title;
   ASSERT_TRUE(tab_proxy->GetTabTitle(&actual_title));
-  EXPECT_NE("File!", WideToUTF8(actual_title));
+  EXPECT_NE("File!", UTF16ToUTF8(actual_title));
 }
 
 // Ensures that non-user initiated location changes (within page) are
 // flagged as client redirects. See bug 1139823.
 TEST_F(RedirectTest, ClientFragments) {
   ASSERT_TRUE(test_server_.Start());
 
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("ref_redirect.html");
   GURL first_url = net::FilePathToFileURL(test_file);
@@ skipping 32 matching lines @@
       "client-redirect?" + slow.spec());
   std::vector<GURL> redirects;
 
   NavigateToURL(first_url);
   // We don't sleep here - the first navigation won't have been committed yet
   // because we told the server to wait a minute. This means the browser has
   // started it's provisional load for the client redirect destination page but
   // hasn't completed. Our time is now!
   NavigateToURL(final_url);
 
-  std::wstring tab_title;
-  std::wstring final_url_title = UTF8ToWide("Title Of Awesomeness");
+  string16 tab_title;
+  string16 final_url_title = ASCIIToUTF16("Title Of Awesomeness");
   // Wait till the final page has been loaded.
   for (int i = 0; i < 10; ++i) {
     base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
     scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
     ASSERT_TRUE(tab_proxy.get());
     ASSERT_TRUE(tab_proxy->GetTabTitle(&tab_title));
     if (tab_title == final_url_title) {
       ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
       break;
     }
@@ skipping 10 matching lines @@
        it != redirects.end(); ++it) {
     if (final_url.spec() == it->spec()) {
       final_navigation_not_redirect = false;
       break;
     }
   }
   EXPECT_TRUE(final_navigation_not_redirect);
 }
 
 }  // namespace