Remove some unneeded uses of wstring.

chrome/test/automation/proxy_launcher.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/automation/proxy_launcher.h"
 
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 125 matching lines @@
 }
 
 void ProxyLauncher::CloseBrowserAndServer() {
   QuitBrowser();
 
   // Suppress spammy failures that seem to be occurring when running
   // the UI tests in single-process mode.
   // TODO(jhughes): figure out why this is necessary at all, and fix it
   if (!in_process_renderer_)
     AssertAppNotRunning(
-        StringPrintf(L"Unable to quit all browser processes. Original PID %d",
-                     &process_id_));
+        StringPrintf("Unable to quit all browser processes. Original PID %d",
+                     process_id_));
 
   DisconnectFromRunningBrowser();
 }
 
 void ProxyLauncher::DisconnectFromRunningBrowser() {
   automation_proxy_.reset();  // Shut down IPC testing interface.
 }
 
 bool ProxyLauncher::LaunchBrowser(const LaunchState& state) {
   if (state.clear_profile || !temp_profile_dir_.IsValid()) {
@@ skipping 139 matching lines @@
 #endif  // OS_POSIX
 
   int exit_code = -1;
   EXPECT_TRUE(WaitForBrowserProcessToQuit(
                   TestTimeouts::action_max_timeout_ms(), &exit_code));
   EXPECT_EQ(0, exit_code);  // Expect a clean shutdown.
 
   browser_quit_time_ = base::TimeTicks::Now() - quit_start;
 }
 
-void ProxyLauncher::AssertAppNotRunning(const std::wstring& error_message) {
-  std::wstring final_error_message(error_message);
+void ProxyLauncher::AssertAppNotRunning(const std::string& error_message) {
+  std::string final_error_message(error_message);
 
   ChromeProcessList processes = GetRunningChromeProcesses(process_id_);
   if (!processes.empty()) {
-    final_error_message += L" Leftover PIDs: [";
+    final_error_message += " Leftover PIDs: [";
     for (ChromeProcessList::const_iterator it = processes.begin();
          it != processes.end(); ++it) {
-      final_error_message += StringPrintf(L" %d", *it);
+      final_error_message += StringPrintf(" %d", *it);
     }
-    final_error_message += L" ]";
+    final_error_message += " ]";
   }
   ASSERT_TRUE(processes.empty()) << final_error_message;
 }
 
 bool ProxyLauncher::WaitForBrowserProcessToQuit(int timeout, int* exit_code) {
 #ifdef WAIT_FOR_DEBUGGER_ON_OPEN
   timeout = 500000;
 #endif
   bool success = base::WaitForExitCodeWithTimeout(process_, exit_code, timeout);
 
@@ skipping 252 matching lines @@
   ASSERT_TRUE(LaunchBrowserAndServer(state, wait_for_initial_loads));
 }
 
 void AnonymousProxyLauncher::TerminateConnection() {
   CloseBrowserAndServer();
 }
 
 std::string AnonymousProxyLauncher::PrefixedChannelID() const {
   return channel_id_;
 }