summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_launcher.cc3
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.cc3
-rw-r--r--chrome_frame/test/net/process_singleton_subclass.cc3
3 files changed, 3 insertions, 6 deletions
diff --git a/chrome_frame/chrome_launcher.cc b/chrome_frame/chrome_launcher.cc
index d7cca9c..1f9f0d1 100644
--- a/chrome_frame/chrome_launcher.cc
+++ b/chrome_frame/chrome_launcher.cc
@@ -80,8 +80,7 @@ void SanitizeCommandLine(const CommandLine& original, CommandLine* sanitized) {
bool SanitizeAndLaunchChrome(const wchar_t* command_line) {
std::wstring command_line_with_program(L"dummy.exe ");
command_line_with_program += command_line;
- CommandLine original(L"");
- original.ParseFromString(command_line_with_program);
+ CommandLine original = CommandLine::FromString(command_line_with_program);
CommandLine sanitized(GetChromeExecutablePath());
SanitizeCommandLine(original, &sanitized);
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index a75d791..7d2d67b 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -322,8 +322,7 @@ base::ProcessHandle LaunchExecutable(const std::wstring& executable,
if (path.empty()) {
DLOG(ERROR) << "Failed to find executable: " << executable;
} else {
- CommandLine cmdline(L"");
- cmdline.ParseFromString(path);
+ CommandLine cmdline = CommandLine::FromString(path);
base::LaunchApp(cmdline, false, false, &process);
}
} else {
diff --git a/chrome_frame/test/net/process_singleton_subclass.cc b/chrome_frame/test/net/process_singleton_subclass.cc
index 2206a74..91a3bef 100644
--- a/chrome_frame/test/net/process_singleton_subclass.cc
+++ b/chrome_frame/test/net/process_singleton_subclass.cc
@@ -99,8 +99,7 @@ LRESULT ProcessSingletonSubclass::OnCopyData(HWND hwnd, HWND from_hwnd,
// Get command line.
std::wstring cmd_line(begin, static_cast<size_t>(end - begin));
- CommandLine parsed_command_line(L"");
- parsed_command_line.ParseFromString(cmd_line);
+ CommandLine parsed_command_line = CommandLine::FromString(cmd_line);
std::string channel_id(WideToASCII(parsed_command_line.GetSwitchValue(
switches::kAutomationClientChannelID)));
EXPECT_FALSE(channel_id.empty());