Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4554)

Unified Diff: chrome/test/automation/proxy_launcher.cc

Issue 7519028: Remove some unneeded uses of wstring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/automation/proxy_launcher.h ('k') | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automation/proxy_launcher.cc
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc
index eea9b41889600a6a298dcaa169f08aa8735a2c5d..7dfc6cefadb65d41f314f7cdb1f667a89401ed98 100644
--- a/chrome/test/automation/proxy_launcher.cc
+++ b/chrome/test/automation/proxy_launcher.cc
@@ -143,8 +143,8 @@ void ProxyLauncher::CloseBrowserAndServer() {
// 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();
}
@@ -304,17 +304,17 @@ void ProxyLauncher::TerminateBrowser() {
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;
}
« no previous file with comments | « chrome/test/automation/proxy_launcher.h ('k') | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698