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

chrome/test/automation/extension_proxy_uitest.cc

 // Copyright (c) 2010 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/path_service.h"
 #include "base/ref_counted.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/extension_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 
 namespace {
 
 // These tests are not meant to test the extension system itself, but to verify
@@ skipping 97 matching lines @@
   NavigateToURL(localhost);
 
   // Click the browser action, which should rename the tab title to
   // the tab's index.
   ASSERT_TRUE(rename_tab_extension->
               ExecuteActionInActiveTabAsync(browser.get()));
   ASSERT_NO_FATAL_FAILURE(automation()->EnsureExtensionTestResult());
 
   scoped_refptr<TabProxy> display_tab = browser->GetTab(0);
   ASSERT_TRUE(display_tab);
-  std::wstring title_wstring;
-  ASSERT_TRUE(display_tab->GetTabTitle(&title_wstring));
-  ASSERT_STREQ(L"0", title_wstring.c_str());
+  string16 title_string;
+  ASSERT_TRUE(display_tab->GetTabTitle(&title_string));
+  ASSERT_EQ(ASCIIToUTF16("0"), title_string);
 
   // Click the action again right after navigating to a new page.
   ASSERT_TRUE(browser->AppendTab(localhost));
   display_tab = browser->GetTab(1);
   ASSERT_TRUE(display_tab);
   ASSERT_TRUE(rename_tab_extension->
               ExecuteActionInActiveTabAsync(browser.get()));
   ASSERT_NO_FATAL_FAILURE(automation()->EnsureExtensionTestResult());
-  ASSERT_TRUE(display_tab->GetTabTitle(&title_wstring));
-  ASSERT_STREQ(L"1", title_wstring.c_str());
+  ASSERT_TRUE(display_tab->GetTabTitle(&title_string));
+  ASSERT_EQ(ASCIIToUTF16("1"), title_string);
 
   // Do not forget to stop the server.
   StopHttpServer();
 }
 
 // Flaky, http://crbug.com/59441.
 TEST_F(ExtensionProxyUITest, FLAKY_MoveBrowserAction) {
   scoped_refptr<ExtensionProxy> rename_tab_extension =
       InstallRenameTabExtension();
   ASSERT_TRUE(rename_tab_extension.get());
@@ skipping 25 matching lines @@
                           EnsureIdMatches("aiglobglfckejlcpcbdokbkbjeemfhno"));
   ASSERT_NO_FATAL_FAILURE(simple_extension_->
                           EnsureNameMatches("Browser Action"));
   ASSERT_NO_FATAL_FAILURE(simple_extension_->
                           EnsureVersionMatches("0.1.1"));
   ASSERT_NO_FATAL_FAILURE(simple_extension_->
                           EnsureBrowserActionIndexMatches(0));
 }
 
 }  // namespace