summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-26 22:39:33 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-26 22:39:33 +0000
commit51343d5ae5d463fc4f84f4af79b44962a580cd4f (patch)
tree8d53ff6a0097950f2732ee5376bf0c83297c9c87 /chrome_frame
parent7b9db43fbc1731cabc985f6e026a07a2ceaafc28 (diff)
downloadchromium_src-51343d5ae5d463fc4f84f4af79b44962a580cd4f.zip
chromium_src-51343d5ae5d463fc4f84f4af79b44962a580cd4f.tar.gz
chromium_src-51343d5ae5d463fc4f84f4af79b44962a580cd4f.tar.bz2
Remove deprecated CommandLine(std::wstring) ctor.
Add a ctor for creating a CommandLine for carrying arguments; convert all the users to either that or the FilePath version. BUG=24672 Review URL: http://codereview.chromium.org/329017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30117 0039d316-1c4b-4281-b951-d872f2087c98
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());