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

Unified Diff: chrome/test/ui/ui_test.cc

Issue 329017: Remove deprecated CommandLine(std::wstring) ctor. (Closed)
Patch Set: Created 11 years, 2 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/render_view_test.cc ('k') | chrome/tools/crash_service/crash_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/ui_test.cc
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 725092a538c3593bdcd68bfe9b6f68e21e4ee4dd..e9ca10ea35a8248a401bfc7856a7400ebccbcb86 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -97,7 +97,7 @@ const char kEnableErrorDialogs[] = "enable-errdialogs";
UITest::UITest()
: testing::Test(),
- launch_arguments_(L""),
+ launch_arguments_(CommandLine::ARGUMENTS_ONLY),
expected_errors_(0),
expected_crashes_(0),
homepage_(L"about:blank"),
@@ -257,9 +257,9 @@ static CommandLine* CreatePythonCommandLine() {
.Append(FILE_PATH_LITERAL("third_party"))
.Append(FILE_PATH_LITERAL("python_24"))
.Append(FILE_PATH_LITERAL("python.exe"));
- return new CommandLine(python_runtime.ToWStringHack());
+ return new CommandLine(python_runtime);
#elif defined(OS_POSIX)
- return new CommandLine(L"python");
+ return new CommandLine(FilePath("python"));
#endif
}
@@ -1010,10 +1010,9 @@ bool UITest::LaunchBrowserHelper(const CommandLine& arguments,
bool use_existing_browser,
bool wait,
base::ProcessHandle* process) {
- FilePath command = browser_directory_;
- command = command.Append(FilePath::FromWStringHack(
- chrome::kBrowserProcessExecutablePath));
- CommandLine command_line(command.ToWStringHack());
+ FilePath command = browser_directory_.Append(
+ FilePath::FromWStringHack(chrome::kBrowserProcessExecutablePath));
+ CommandLine command_line(command);
// Add any explicit command line flags passed to the process.
std::wstring extra_chrome_flags =
« no previous file with comments | « chrome/test/render_view_test.cc ('k') | chrome/tools/crash_service/crash_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698