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

chrome/browser/session_history_uitest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
 
 namespace {
 
@@ skipping 38 matching lines @@
     ASSERT_TRUE(tab_->NavigateToURL(url));
   }
 
   // Navigate session history using history.go(distance).
   void JavascriptGo(std::string distance) {
     GURL url("javascript:history.go('" + distance + "')");
     ASSERT_TRUE(tab_->NavigateToURL(url));
   }
 
   std::wstring GetTabTitle() {
-    std::wstring title;
+    string16 title;
     EXPECT_TRUE(tab_->GetTabTitle(&title));
-    return title;
+    return UTF16ToWideHack(title);
   }
 
   GURL GetTabURL() {
     GURL url;
     EXPECT_TRUE(tab_->GetCurrentURL(&url));
     return url;
   }
 
  protected:
   scoped_refptr<BrowserProxy> window_;
@@ skipping 451 matching lines @@
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(L"Default Title", GetTabTitle());
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=56267
 TEST_F(SessionHistoryTest, DISABLED_HistoryLength) {
   ASSERT_TRUE(test_server_.Start());
 
   int length;
   ASSERT_TRUE(tab_->ExecuteAndExtractInt(
-      L"", L"domAutomationController.send(history.length)", &length));
+      string16(),
+      ASCIIToUTF16("domAutomationController.send(history.length)"),
+      &length));
   EXPECT_EQ(1, length);
 
   ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL("files/title1.html")));
 
   ASSERT_TRUE(tab_->ExecuteAndExtractInt(
-      L"", L"domAutomationController.send(history.length)", &length));
+      string16(),
+      ASCIIToUTF16("domAutomationController.send(history.length)"),
+      &length));
   EXPECT_EQ(2, length);
 
   // Now test that history.length is updated when the navigation is committed.
   ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL(
       "files/session_history/record_length.html")));
   ASSERT_TRUE(tab_->ExecuteAndExtractInt(
-      L"", L"domAutomationController.send(history.length)", &length));
+      string16(),
+      ASCIIToUTF16("domAutomationController.send(history.length)"),
+      &length));
   EXPECT_EQ(3, length);
   ASSERT_TRUE(tab_->ExecuteAndExtractInt(
-      L"", L"domAutomationController.send(history_length)", &length));
+      string16(),
+      ASCIIToUTF16("domAutomationController.send(history_length)"),
+      &length));
   EXPECT_EQ(3, length);
 
   ASSERT_TRUE(tab_->GoBack());
   ASSERT_TRUE(tab_->GoBack());
 
   // Ensure history.length is properly truncated.
   ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL("files/title2.html")));
   ASSERT_TRUE(tab_->ExecuteAndExtractInt(
-      L"", L"domAutomationController.send(history.length)", &length));
+      string16(),
+      ASCIIToUTF16("domAutomationController.send(history.length)"),
+      &length));
   EXPECT_EQ(2, length);
 }
 
 }  // namespace