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

chrome/browser/dom_ui/bookmarks_ui_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 "chrome/test/ui/ui_test.h"
 
 #include "base/test/test_timeouts.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 
 class BookmarksUITest : public UITest {
  public:
   BookmarksUITest() {
     dom_automation_enabled_ = true;
@@ skipping 23 matching lines @@
     success = WaitForBookmarksUI(tab);
     EXPECT_TRUE(success);
     if (!success)
       return NULL;
     return tab;
   }
 
   void AssertIsBookmarksPage(TabProxy* tab) {
     // tab->GetCurrentURL is not up to date.
     GURL url;
-    std::wstring out;
-    ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
-        L"domAutomationController.send(location.protocol)", &out));
-    ASSERT_EQ(L"chrome-extension:", out);
-    ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
-        L"domAutomationController.send(location.pathname)", &out));
-    ASSERT_EQ(L"/main.html", out);
+    string16 out;
+    ASSERT_TRUE(tab->ExecuteAndExtractString(string16(),
+        ASCIIToUTF16("domAutomationController.send(location.protocol)"), &out));
+    ASSERT_EQ(ASCIIToUTF16("chrome-extension:"), out);
+    ASSERT_TRUE(tab->ExecuteAndExtractString(string16(),
+        ASCIIToUTF16("domAutomationController.send(location.pathname)"), &out));
+    ASSERT_EQ(ASCIIToUTF16("/main.html"), out);
   }
 };
 
 // http://code.google.com/p/chromium/issues/detail?id=39532
 TEST_F(BookmarksUITest, FLAKY_ShouldRedirectToExtension) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
 
   int tab_count = -1;
   ASSERT_TRUE(browser->GetTabCount(&tab_count));
@@ skipping 77 matching lines @@
   ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER));
   ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER));
   ASSERT_TRUE(browser->GetTabCount(&tab_count));
   ASSERT_EQ(2, tab_count);
 }
 
 TEST_F(BookmarksUITest, BookmarksLoaded) {
   scoped_refptr<TabProxy> tab = GetBookmarksUITab();
   ASSERT_TRUE(tab.get());
 }