Skip to content

GitLab

T
tangled
Commit da77fd43 authored by Jan Wilken Dörrie's avatar Jan Wilken Dörrie Committed by Commit Bot
Browse files
Options

[base] Use std::wstring for CommandLine on Windows 

This change modifies base::CommandLine::StringType to be std::wstring on
Windows. It relies on changing base::FilePath::StringType to
std::wstring on Windows as well, in order to compile once base::string16
is no longer std::wstring.

Bug: 911896
Change-Id: I07accc7e043fadf2b584799b699881f300e18bb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1875748Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709226}
parent 1901fc96
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 71 deletions
base/command_line.cc
View file @ da77fd43
...@@ -28,8 +28,9 @@ CommandLine* CommandLine::current_process_commandline_ = nullptr; ...@@ -28,8 +28,9 @@ CommandLine* CommandLine::current_process_commandline_ = nullptr;
namespace { namespace {
const CommandLine::CharType kSwitchTerminator[] = FILE_PATH_LITERAL("--"); constexpr CommandLine::CharType kSwitchTerminator[] = FILE_PATH_LITERAL("--");
const CommandLine::CharType kSwitchValueSeparator[] = FILE_PATH_LITERAL("="); constexpr CommandLine::CharType kSwitchValueSeparator[] =
FILE_PATH_LITERAL("=");
// Since we use a lazy match, make sure that longer versions (like "--") are // Since we use a lazy match, make sure that longer versions (like "--") are
// listed before shorter versions (like "-") of similar prefixes. // listed before shorter versions (like "-") of similar prefixes.
...@@ -37,11 +38,10 @@ const CommandLine::CharType kSwitchValueSeparator[] = FILE_PATH_LITERAL("="); ...@@ -37,11 +38,10 @@ const CommandLine::CharType kSwitchValueSeparator[] = FILE_PATH_LITERAL("=");
// By putting slash last, we can control whether it is treaded as a switch // By putting slash last, we can control whether it is treaded as a switch
// value by changing the value of switch_prefix_count to be one less than // value by changing the value of switch_prefix_count to be one less than
// the array size. // the array size.
const CommandLine::CharType* const kSwitchPrefixes[] = { constexpr CommandLine::StringPieceType kSwitchPrefixes[] = {L"--", L"-", L"/"};
FILE_PATH_LITERAL("--"), FILE_PATH_LITERAL("-"), FILE_PATH_LITERAL("/")};
#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
// Unixes don't use slash as a switch. // Unixes don't use slash as a switch.
const CommandLine::CharType* const kSwitchPrefixes[] = {"--", "-"}; constexpr CommandLine::StringPieceType kSwitchPrefixes[] = {"--", "-"};
#endif #endif
size_t switch_prefix_count = size(kSwitchPrefixes); size_t switch_prefix_count = size(kSwitchPrefixes);
...@@ -102,8 +102,7 @@ void AppendSwitchesAndArguments(CommandLine* command_line, ...@@ -102,8 +102,7 @@ void AppendSwitchesAndArguments(CommandLine* command_line,
parse_switches &= (arg != kSwitchTerminator); parse_switches &= (arg != kSwitchTerminator);
if (parse_switches && IsSwitch(arg, &switch_string, &switch_value)) { if (parse_switches && IsSwitch(arg, &switch_string, &switch_value)) {
#if defined(OS_WIN) #if defined(OS_WIN)
command_line->AppendSwitchNative(UTF16ToASCII(switch_string), command_line->AppendSwitchNative(WideToUTF8(switch_string), switch_value);
switch_value);
#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
command_line->AppendSwitchNative(switch_string, switch_value); command_line->AppendSwitchNative(switch_string, switch_value);
#else #else
...@@ -117,21 +116,21 @@ void AppendSwitchesAndArguments(CommandLine* command_line, ...@@ -117,21 +116,21 @@ void AppendSwitchesAndArguments(CommandLine* command_line,
#if defined(OS_WIN) #if defined(OS_WIN)
// Quote a string as necessary for CommandLineToArgvW compatiblity *on Windows*. // Quote a string as necessary for CommandLineToArgvW compatiblity *on Windows*.
string16 QuoteForCommandLineToArgvW(const string16& arg, std::wstring QuoteForCommandLineToArgvW(const std::wstring& arg,
bool quote_placeholders) { bool quote_placeholders) {
// We follow the quoting rules of CommandLineToArgvW. // We follow the quoting rules of CommandLineToArgvW.
// http://msdn.microsoft.com/en-us/library/17w5ykft.aspx // http://msdn.microsoft.com/en-us/library/17w5ykft.aspx
string16 quotable_chars(FILE_PATH_LITERAL(" \\\"")); std::wstring quotable_chars(L" \\\"");
// We may also be required to quote '%', which is commonly used in a command // We may also be required to quote '%', which is commonly used in a command
// line as a placeholder. (It may be substituted for a string with spaces.) // line as a placeholder. (It may be substituted for a string with spaces.)
if (quote_placeholders) if (quote_placeholders)
quotable_chars.push_back('%'); quotable_chars.push_back('%');
if (arg.find_first_of(quotable_chars) == string16::npos) { if (arg.find_first_of(quotable_chars) == std::wstring::npos) {
// No quoting necessary. // No quoting necessary.
return arg; return arg;
} }
string16 out; std::wstring out;
out.push_back('"'); out.push_back('"');
for (size_t i = 0; i < arg.size(); ++i) { for (size_t i = 0; i < arg.size(); ++i) {
if (arg[i] == '\\') { if (arg[i] == '\\') {
...@@ -200,9 +199,8 @@ CommandLine::~CommandLine() = default; ...@@ -200,9 +199,8 @@ CommandLine::~CommandLine() = default;
// static // static
void CommandLine::set_slash_is_not_a_switch() { void CommandLine::set_slash_is_not_a_switch() {
// The last switch prefix should be slash, so adjust the size to skip it. // The last switch prefix should be slash, so adjust the size to skip it.
// Leverage StringPiece16::operator== to do a deep comparison. static_assert(base::make_span(kSwitchPrefixes).back() == L"/",
DCHECK_EQ(*std::rbegin(kSwitchPrefixes), "Error: Last switch prefix is not a slash.");
StringPiece16(FILE_PATH_LITERAL("/")));
switch_prefix_count = size(kSwitchPrefixes) - 1; switch_prefix_count = size(kSwitchPrefixes) - 1;
} }
...@@ -210,10 +208,10 @@ void CommandLine::set_slash_is_not_a_switch() { ...@@ -210,10 +208,10 @@ void CommandLine::set_slash_is_not_a_switch() {
void CommandLine::InitUsingArgvForTesting(int argc, const char* const* argv) { void CommandLine::InitUsingArgvForTesting(int argc, const char* const* argv) {
DCHECK(!current_process_commandline_); DCHECK(!current_process_commandline_);
current_process_commandline_ = new CommandLine(NO_PROGRAM); current_process_commandline_ = new CommandLine(NO_PROGRAM);
// On Windows we need to convert the command line arguments to string16. // On Windows we need to convert the command line arguments to std::wstring.
CommandLine::StringVector argv_vector; CommandLine::StringVector argv_vector;
for (int i = 0; i < argc; ++i) for (int i = 0; i < argc; ++i)
argv_vector.push_back(UTF8ToUTF16(argv[i])); argv_vector.push_back(UTF8ToWide(argv[i]));
current_process_commandline_->InitFromArgv(argv_vector); current_process_commandline_->InitFromArgv(argv_vector);
} }
#endif #endif
...@@ -229,8 +227,7 @@ bool CommandLine::Init(int argc, const char* const* argv) { ...@@ -229,8 +227,7 @@ bool CommandLine::Init(int argc, const char* const* argv) {
current_process_commandline_ = new CommandLine(NO_PROGRAM); current_process_commandline_ = new CommandLine(NO_PROGRAM);
#if defined(OS_WIN) #if defined(OS_WIN)
current_process_commandline_->ParseFromString( current_process_commandline_->ParseFromString(::GetCommandLineW());
as_u16cstr(::GetCommandLineW()));
#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
current_process_commandline_->InitFromArgv(argc, argv); current_process_commandline_->InitFromArgv(argc, argv);
#else #else
...@@ -260,7 +257,7 @@ bool CommandLine::InitializedForCurrentProcess() { ...@@ -260,7 +257,7 @@ bool CommandLine::InitializedForCurrentProcess() {
#if defined(OS_WIN) #if defined(OS_WIN)
// static // static
CommandLine CommandLine::FromString(StringPiece16 command_line) { CommandLine CommandLine::FromString(StringPieceType command_line) {
CommandLine cmd(NO_PROGRAM); CommandLine cmd(NO_PROGRAM);
cmd.ParseFromString(command_line); cmd.ParseFromString(command_line);
return cmd; return cmd;
...@@ -309,12 +306,16 @@ bool CommandLine::HasSwitch(const char switch_constant[]) const { ...@@ -309,12 +306,16 @@ bool CommandLine::HasSwitch(const char switch_constant[]) const {
std::string CommandLine::GetSwitchValueASCII( std::string CommandLine::GetSwitchValueASCII(
const StringPiece& switch_string) const { const StringPiece& switch_string) const {
StringType value = GetSwitchValueNative(switch_string); StringType value = GetSwitchValueNative(switch_string);
#if defined(OS_WIN)
if (!IsStringASCII(base::AsStringPiece16(value))) {
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
if (!IsStringASCII(value)) { if (!IsStringASCII(value)) {
#endif
DLOG(WARNING) << "Value of switch (" << switch_string << ") must be ASCII."; DLOG(WARNING) << "Value of switch (" << switch_string << ") must be ASCII.";
return std::string(); return std::string();
} }
#if defined(OS_WIN) #if defined(OS_WIN)
return UTF16ToASCII(value); return WideToUTF8(value);
#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
return value; return value;
#endif #endif
...@@ -345,7 +346,7 @@ void CommandLine::AppendSwitchNative(const std::string& switch_string, ...@@ -345,7 +346,7 @@ void CommandLine::AppendSwitchNative(const std::string& switch_string,
const CommandLine::StringType& value) { const CommandLine::StringType& value) {
#if defined(OS_WIN) #if defined(OS_WIN)
const std::string switch_key = ToLowerASCII(switch_string); const std::string switch_key = ToLowerASCII(switch_string);
StringType combined_switch_string(ASCIIToUTF16(switch_key)); StringType combined_switch_string(UTF8ToWide(switch_key));
#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
const std::string& switch_key = switch_string; const std::string& switch_key = switch_string;
StringType combined_switch_string(switch_key); StringType combined_switch_string(switch_key);
...@@ -356,8 +357,10 @@ void CommandLine::AppendSwitchNative(const std::string& switch_string, ...@@ -356,8 +357,10 @@ void CommandLine::AppendSwitchNative(const std::string& switch_string,
if (!insertion.second) if (!insertion.second)
insertion.first->second = value; insertion.first->second = value;
// Preserve existing switch prefixes in |argv_|; only append one if necessary. // Preserve existing switch prefixes in |argv_|; only append one if necessary.
if (prefix_length == 0) if (prefix_length == 0) {
combined_switch_string = kSwitchPrefixes[0] + combined_switch_string; combined_switch_string.insert(0, kSwitchPrefixes[0].data(),
kSwitchPrefixes[0].size());
}
if (!value.empty()) if (!value.empty())
combined_switch_string += kSwitchValueSeparator + value; combined_switch_string += kSwitchValueSeparator + value;
// Append the switch and update the switches/arguments divider |begin_args_|. // Append the switch and update the switches/arguments divider |begin_args_|.
...@@ -367,7 +370,7 @@ void CommandLine::AppendSwitchNative(const std::string& switch_string, ...@@ -367,7 +370,7 @@ void CommandLine::AppendSwitchNative(const std::string& switch_string,
void CommandLine::AppendSwitchASCII(const std::string& switch_string, void CommandLine::AppendSwitchASCII(const std::string& switch_string,
const std::string& value_string) { const std::string& value_string) {
#if defined(OS_WIN) #if defined(OS_WIN)
AppendSwitchNative(switch_string, ASCIIToUTF16(value_string)); AppendSwitchNative(switch_string, UTF8ToWide(value_string));
#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
AppendSwitchNative(switch_string, value_string); AppendSwitchNative(switch_string, value_string);
#else #else
...@@ -377,7 +380,7 @@ void CommandLine::AppendSwitchASCII(const std::string& switch_string, ...@@ -377,7 +380,7 @@ void CommandLine::AppendSwitchASCII(const std::string& switch_string,
void CommandLine::RemoveSwitch(base::StringPiece switch_key_without_prefix) { void CommandLine::RemoveSwitch(base::StringPiece switch_key_without_prefix) {
#if defined(OS_WIN) #if defined(OS_WIN)
StringType switch_key_native = base::ASCIIToUTF16(switch_key_without_prefix); StringType switch_key_native = UTF8ToWide(switch_key_without_prefix);
#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
StringType switch_key_native = switch_key_without_prefix.as_string(); StringType switch_key_native = switch_key_without_prefix.as_string();
#endif #endif
...@@ -432,7 +435,7 @@ CommandLine::StringVector CommandLine::GetArgs() const { ...@@ -432,7 +435,7 @@ CommandLine::StringVector CommandLine::GetArgs() const {
void CommandLine::AppendArg(const std::string& value) { void CommandLine::AppendArg(const std::string& value) {
#if defined(OS_WIN) #if defined(OS_WIN)
DCHECK(IsStringUTF8(value)); DCHECK(IsStringUTF8(value));
AppendArgNative(UTF8ToUTF16(value)); AppendArgNative(UTF8ToWide(value));
#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
AppendArgNative(value); AppendArgNative(value);
#else #else
...@@ -473,7 +476,7 @@ void CommandLine::PrependWrapper(const CommandLine::StringType& wrapper) { ...@@ -473,7 +476,7 @@ void CommandLine::PrependWrapper(const CommandLine::StringType& wrapper) {
} }
#if defined(OS_WIN) #if defined(OS_WIN)
void CommandLine::ParseFromString(StringPiece16 command_line) { void CommandLine::ParseFromString(StringPieceType command_line) {
command_line = TrimWhitespace(command_line, TRIM_ALL); command_line = TrimWhitespace(command_line, TRIM_ALL);
if (command_line.empty()) if (command_line.empty())
return; return;
...@@ -490,19 +493,17 @@ void CommandLine::ParseFromString(StringPiece16 command_line) { ...@@ -490,19 +493,17 @@ void CommandLine::ParseFromString(StringPiece16 command_line) {
reinterpret_cast<decltype(::CommandLineToArgvW)*>( reinterpret_cast<decltype(::CommandLineToArgvW)*>(
::GetProcAddress(downlevel_shell32_dll, "CommandLineToArgvW")); ::GetProcAddress(downlevel_shell32_dll, "CommandLineToArgvW"));
if (command_line_to_argv_w_proc) if (command_line_to_argv_w_proc)
args = command_line_to_argv_w_proc(as_wcstr(command_line), &num_args); args = command_line_to_argv_w_proc(command_line.data(), &num_args);
::FreeLibrary(downlevel_shell32_dll); ::FreeLibrary(downlevel_shell32_dll);
} else { } else {
// Since the apiset is not available, allow the delayload of shell32.dll // Since the apiset is not available, allow the delayload of shell32.dll
// to take place. // to take place.
args = ::CommandLineToArgvW(as_wcstr(command_line), &num_args); args = ::CommandLineToArgvW(command_line.data(), &num_args);
} }
DPLOG_IF(FATAL, !args) << "CommandLineToArgvW failed on command line: " DPLOG_IF(FATAL, !args) << "CommandLineToArgvW failed on command line: "
<< UTF16ToUTF8(command_line); << command_line;
StringVector argv; StringVector argv(args, args + num_args);
for (auto* arg : make_span(args, num_args))
argv.push_back(WideToUTF16(arg));
InitFromArgv(argv); InitFromArgv(argv);
LocalFree(args); LocalFree(args);
} }
...@@ -516,7 +517,7 @@ CommandLine::StringType CommandLine::GetCommandLineStringInternal( ...@@ -516,7 +517,7 @@ CommandLine::StringType CommandLine::GetCommandLineStringInternal(
#endif #endif
StringType params(GetArgumentsStringInternal(quote_placeholders)); StringType params(GetArgumentsStringInternal(quote_placeholders));
if (!params.empty()) { if (!params.empty()) {
string.append(StringType(FILE_PATH_LITERAL(" "))); string.append(FILE_PATH_LITERAL(" "));
string.append(params); string.append(params);
} }
return string; return string;
...@@ -533,7 +534,7 @@ CommandLine::StringType CommandLine::GetArgumentsStringInternal( ...@@ -533,7 +534,7 @@ CommandLine::StringType CommandLine::GetArgumentsStringInternal(
StringType switch_value; StringType switch_value;
parse_switches &= arg != kSwitchTerminator; parse_switches &= arg != kSwitchTerminator;
if (i > 1) if (i > 1)
params.append(StringType(FILE_PATH_LITERAL(" "))); params.append(FILE_PATH_LITERAL(" "));
if (parse_switches && IsSwitch(arg, &switch_string, &switch_value)) { if (parse_switches && IsSwitch(arg, &switch_string, &switch_value)) {
params.append(switch_string); params.append(switch_string);
if (!switch_value.empty()) { if (!switch_value.empty()) {
......
base/command_line.h
View file @ da77fd43
...@@ -34,13 +34,12 @@ class BASE_EXPORT CommandLine { ...@@ -34,13 +34,12 @@ class BASE_EXPORT CommandLine {
public: public:
#if defined(OS_WIN) #if defined(OS_WIN)
// The native command line string type. // The native command line string type.
using StringType = string16; using StringType = std::wstring;
using StringPieceType = base::StringPiece16;
#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
using StringType = std::string; using StringType = std::string;
using StringPieceType = base::StringPiece;
#endif #endif
using StringPieceType = base::BasicStringPiece<StringType>;
using CharType = StringType::value_type; using CharType = StringType::value_type;
using StringVector = std::vector<StringType>; using StringVector = std::vector<StringType>;
using SwitchMap = std::map<std::string, StringType, std::less<>>; using SwitchMap = std::map<std::string, StringType, std::less<>>;
...@@ -104,7 +103,7 @@ class BASE_EXPORT CommandLine { ...@@ -104,7 +103,7 @@ class BASE_EXPORT CommandLine {
static bool InitializedForCurrentProcess(); static bool InitializedForCurrentProcess();
#if defined(OS_WIN) #if defined(OS_WIN)
static CommandLine FromString(StringPiece16 command_line); static CommandLine FromString(StringPieceType command_line);
#endif #endif
// Initialize from an argv vector. // Initialize from an argv vector.
...@@ -217,7 +216,7 @@ class BASE_EXPORT CommandLine { ...@@ -217,7 +216,7 @@ class BASE_EXPORT CommandLine {
#if defined(OS_WIN) #if defined(OS_WIN)
// Initialize by parsing the given command line string. // Initialize by parsing the given command line string.
// The program name is assumed to be the first item in the string. // The program name is assumed to be the first item in the string.
void ParseFromString(StringPiece16 command_line); void ParseFromString(StringPieceType command_line);
#endif #endif
private: private:
......
base/command_line_unittest.cc
View file @ da77fd43
...@@ -108,14 +108,14 @@ TEST(CommandLineTest, CommandLineConstructor) { ...@@ -108,14 +108,14 @@ TEST(CommandLineTest, CommandLineConstructor) {
TEST(CommandLineTest, CommandLineFromString) { TEST(CommandLineTest, CommandLineFromString) {
#if defined(OS_WIN) #if defined(OS_WIN)
CommandLine cl = CommandLine::FromString(StrCat( CommandLine cl = CommandLine::FromString(
{STRING16_LITERAL("program --foo= -bAr /Spaetzel=pierogi /Baz flim "), L"program --foo= -bAr /Spaetzel=pierogi /Baz flim "
STRING16_LITERAL("--other-switches=\"--dog=canine --cat=feline\" "), L"--other-switches=\"--dog=canine --cat=feline\" "
STRING16_LITERAL("-spaetzle=Crepe -=loosevalue FLAN "), L"-spaetzle=Crepe -=loosevalue FLAN "
STRING16_LITERAL("--input-translation=\"45\"--output-rotation "), L"--input-translation=\"45\"--output-rotation "
STRING16_LITERAL("--quotes="), kTrickyQuoted, STRING16_LITERAL(" "), L"--quotes=" +
STRING16_LITERAL("-- -- --not-a-switch "), kTrickyQuoted +
STRING16_LITERAL("\"in the time of submarines...\"")})); L" -- -- --not-a-switch \"in the time of submarines...\"");
EXPECT_FALSE(cl.GetCommandLineString().empty()); EXPECT_FALSE(cl.GetCommandLineString().empty());
EXPECT_FALSE(cl.HasSwitch("cruller")); EXPECT_FALSE(cl.HasSwitch("cruller"));
...@@ -172,7 +172,7 @@ TEST(CommandLineTest, CommandLineFromString) { ...@@ -172,7 +172,7 @@ TEST(CommandLineTest, CommandLineFromString) {
// Tests behavior with an empty input string. // Tests behavior with an empty input string.
TEST(CommandLineTest, EmptyString) { TEST(CommandLineTest, EmptyString) {
#if defined(OS_WIN) #if defined(OS_WIN)
CommandLine cl_from_string = CommandLine::FromString(string16()); CommandLine cl_from_string = CommandLine::FromString(std::wstring());
EXPECT_TRUE(cl_from_string.GetCommandLineString().empty()); EXPECT_TRUE(cl_from_string.GetCommandLineString().empty());
EXPECT_TRUE(cl_from_string.GetProgram().empty()); EXPECT_TRUE(cl_from_string.GetProgram().empty());
EXPECT_EQ(1U, cl_from_string.argv().size()); EXPECT_EQ(1U, cl_from_string.argv().size());
...@@ -205,11 +205,11 @@ TEST(CommandLineTest, GetArgumentsString) { ...@@ -205,11 +205,11 @@ TEST(CommandLineTest, GetArgumentsString) {
cl.AppendArg(kFifthArgName); cl.AppendArg(kFifthArgName);
#if defined(OS_WIN) #if defined(OS_WIN)
CommandLine::StringType expected_first_arg(UTF8ToUTF16(kFirstArgName)); CommandLine::StringType expected_first_arg(UTF8ToWide(kFirstArgName));
CommandLine::StringType expected_second_arg(UTF8ToUTF16(kSecondArgName)); CommandLine::StringType expected_second_arg(UTF8ToWide(kSecondArgName));
CommandLine::StringType expected_third_arg(UTF8ToUTF16(kThirdArgName)); CommandLine::StringType expected_third_arg(UTF8ToWide(kThirdArgName));
CommandLine::StringType expected_fourth_arg(UTF8ToUTF16(kFourthArgName)); CommandLine::StringType expected_fourth_arg(UTF8ToWide(kFourthArgName));
CommandLine::StringType expected_fifth_arg(UTF8ToUTF16(kFifthArgName)); CommandLine::StringType expected_fifth_arg(UTF8ToWide(kFifthArgName));
#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
CommandLine::StringType expected_first_arg(kFirstArgName); CommandLine::StringType expected_first_arg(kFirstArgName);
CommandLine::StringType expected_second_arg(kSecondArgName); CommandLine::StringType expected_second_arg(kSecondArgName);
...@@ -293,15 +293,16 @@ TEST(CommandLineTest, AppendSwitches) { ...@@ -293,15 +293,16 @@ TEST(CommandLineTest, AppendSwitches) {
#if defined(OS_WIN) #if defined(OS_WIN)
EXPECT_EQ( EXPECT_EQ(
StrCat({STRING16_LITERAL("Program "), STRING16_LITERAL("--switch1 "), L"Program "
STRING16_LITERAL("--switch2=value "), L"--switch1 "
STRING16_LITERAL("--switch3=\"a value with spaces\" "), L"--switch2=value "
STRING16_LITERAL("--switch4=\"\\\"a value with quotes\\\"\" "), L"--switch3=\"a value with spaces\" "
// Even though the switches are unique, appending can add L"--switch4=\"\\\"a value with quotes\\\"\" "
// repeat switches to argv. // Even though the switches are unique, appending can add repeat
STRING16_LITERAL("--quotes=\"\\\"a value with quotes\\\"\" "), // switches to argv.
STRING16_LITERAL("--quotes=\""), kTrickyQuoted, L"--quotes=\"\\\"a value with quotes\\\"\" "
STRING16_LITERAL("\"")}), L"--quotes=\"" +
kTrickyQuoted + L"\"",
cl.GetCommandLineString()); cl.GetCommandLineString());
#endif #endif
} }
...@@ -358,12 +359,12 @@ TEST(CommandLineTest, AppendArguments) { ...@@ -358,12 +359,12 @@ TEST(CommandLineTest, AppendArguments) {
// against regressions. // against regressions.
TEST(CommandLineTest, ProgramQuotes) { TEST(CommandLineTest, ProgramQuotes) {
// Check that quotes are not added for paths without spaces. // Check that quotes are not added for paths without spaces.
const FilePath kProgram(STRING16_LITERAL("Program")); const FilePath kProgram(L"Program");
CommandLine cl_program(kProgram); CommandLine cl_program(kProgram);
EXPECT_EQ(kProgram.value(), cl_program.GetProgram().value()); EXPECT_EQ(kProgram.value(), cl_program.GetProgram().value());
EXPECT_EQ(kProgram.value(), cl_program.GetCommandLineString()); EXPECT_EQ(kProgram.value(), cl_program.GetCommandLineString());
const FilePath kProgramPath(STRING16_LITERAL("Program Path")); const FilePath kProgramPath(L"Program Path");
// Check that quotes are not returned from GetProgram(). // Check that quotes are not returned from GetProgram().
CommandLine cl_program_path(kProgramPath); CommandLine cl_program_path(kProgramPath);
...@@ -371,13 +372,12 @@ TEST(CommandLineTest, ProgramQuotes) { ...@@ -371,13 +372,12 @@ TEST(CommandLineTest, ProgramQuotes) {
// Check that quotes are added to command line string paths containing spaces. // Check that quotes are added to command line string paths containing spaces.
CommandLine::StringType cmd_string(cl_program_path.GetCommandLineString()); CommandLine::StringType cmd_string(cl_program_path.GetCommandLineString());
EXPECT_EQ(STRING16_LITERAL("\"Program Path\""), cmd_string); EXPECT_EQ(L"\"Program Path\"", cmd_string);
// Check the optional quoting of placeholders in programs. // Check the optional quoting of placeholders in programs.
CommandLine cl_quote_placeholder(FilePath(STRING16_LITERAL("%1"))); CommandLine cl_quote_placeholder(FilePath(L"%1"));
EXPECT_EQ(STRING16_LITERAL("%1"), EXPECT_EQ(L"%1", cl_quote_placeholder.GetCommandLineString());
cl_quote_placeholder.GetCommandLineString()); EXPECT_EQ(L"\"%1\"",
EXPECT_EQ(STRING16_LITERAL("\"%1\""),
cl_quote_placeholder.GetCommandLineStringWithPlaceholders()); cl_quote_placeholder.GetCommandLineStringWithPlaceholders());
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment