Take a StringPiece when looking up CommandLine switches.

base/command_line.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 
 #include <algorithm>
 #include <ostream>
 
 #include "base/basictypes.h"
@@ skipping 75 matching lines @@
                                        switch_value);
 #elif defined(OS_POSIX)
       command_line->AppendSwitchNative(switch_string, switch_value);
 #endif
     } else {
       command_line->AppendArgNative(arg);
     }
   }
 }
 
-// Lowercase switches for backwards compatiblity *on Windows*.
-#if defined(OS_WIN)
-std::string LowerASCIIOnWindows(const std::string& string) {
-  return StringToLowerASCII(string);
-}
-#elif defined(OS_POSIX)
-const std::string& LowerASCIIOnWindows(const std::string& string) {
-  return string;
-}
-#endif
-
-
 #if defined(OS_WIN)
 // Quote a string as necessary for CommandLineToArgvW compatiblity *on Windows*.
 string16 QuoteForCommandLineToArgvW(const string16& arg,
                                     bool quote_placeholders) {
   // We follow the quoting rules of CommandLineToArgvW.
   // http://msdn.microsoft.com/en-us/library/17w5ykft.aspx
   string16 quotable_chars(L" \\\"");
   // 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.)
   if (quote_placeholders)
@@ skipping 30 matching lines @@
     } else {
       out.push_back(arg[i]);
     }
   }
   out.push_back('"');
 
   return out;
 }
 #endif
 
+// Reconstruct |switches_by_stringpiece| to be a mirror of |switches|.
+// |switches_by_stringpiece| only contains pointers to objects owned by
+// |switches|.
+void ResetStringPieces(

[brettw, 2015/04/24 19:50:49]

Why not make this a private member function? You call it with the same arguments
each time which are just class members.

[jackhou1, 2015/05/11 13:51:42]

Done.

+    const CommandLine::SwitchMap& switches,
+    CommandLine::StringPieceSwitchMap* switches_by_stringpiece) {
+  switches_by_stringpiece->clear();
+  for (auto it = switches.begin(); it != switches.end(); ++it)

[brettw, 2015/04/24 19:50:50]

auto -> const auto&
Always use const refs when applicable (see style guide).

[jackhou1, 2015/05/11 13:51:42]

Done.

+    (*switches_by_stringpiece)[it->first] = &(it->second);
+}
+
 }  // namespace
 
 CommandLine::CommandLine(NoProgram no_program)
     : argv_(1),
       begin_args_(1) {
 }
 
 CommandLine::CommandLine(const FilePath& program)
     : argv_(1),
       begin_args_(1) {
   SetProgram(program);
 }
 
 CommandLine::CommandLine(int argc, const CommandLine::CharType* const* argv)
     : argv_(1),
       begin_args_(1) {
   InitFromArgv(argc, argv);
 }
 
 CommandLine::CommandLine(const StringVector& argv)
     : argv_(1),
       begin_args_(1) {
   InitFromArgv(argv);
 }
 
+CommandLine::CommandLine(const CommandLine& other)
+    : argv_(other.argv_),
+      switches_(other.switches_),
+      begin_args_(other.begin_args_) {
+  ResetStringPieces(switches_, &switches_by_stringpiece_);
+}
+
+CommandLine& CommandLine::operator=(const CommandLine& other) {
+  argv_ = other.argv_;
+  switches_ = other.switches_;
+  begin_args_ = other.begin_args_;
+  ResetStringPieces(switches_, &switches_by_stringpiece_);
+  return *this;
+}
+
 CommandLine::~CommandLine() {
 }
 
 #if defined(OS_WIN)
 // static
 void CommandLine::set_slash_is_not_a_switch() {
   // The last switch prefix should be slash, so adjust the size to skip it.
   DCHECK_EQ(wcscmp(kSwitchPrefixes[arraysize(kSwitchPrefixes) - 1], L"/"), 0);
   switch_prefix_count = arraysize(kSwitchPrefixes) - 1;
 }
@@ skipping 49 matching lines @@
                                const CommandLine::CharType* const* argv) {
   StringVector new_argv;
   for (int i = 0; i < argc; ++i)
     new_argv.push_back(argv[i]);
   InitFromArgv(new_argv);
 }
 
 void CommandLine::InitFromArgv(const StringVector& argv) {
   argv_ = StringVector(1);
   switches_.clear();
+  switches_by_stringpiece_.clear();
   begin_args_ = 1;
   SetProgram(argv.empty() ? FilePath() : FilePath(argv[0]));
   AppendSwitchesAndArguments(this, argv);
 }
 
 FilePath CommandLine::GetProgram() const {
   return FilePath(argv_[0]);
 }
 
 void CommandLine::SetProgram(const FilePath& program) {
   TrimWhitespace(program.value(), TRIM_ALL, &argv_[0]);
 }
 
-bool CommandLine::HasSwitch(const std::string& switch_string) const {
-  DCHECK_EQ(StringToLowerASCII(switch_string), switch_string);
-  return switches_.find(switch_string) != switches_.end();
+bool CommandLine::HasSwitch(const base::StringPiece& switch_string) const {
+  DCHECK_EQ(StringToLowerASCII(switch_string.as_string()), switch_string);
+  return switches_by_stringpiece_.find(switch_string) !=
+         switches_by_stringpiece_.end();
 }
 
-bool CommandLine::HasSwitch(const char string_constant[]) const {
-  return HasSwitch(std::string(string_constant));
+bool CommandLine::HasSwitch(const char switch_constant[]) const {
+  return HasSwitch(base::StringPiece(switch_constant));
 }
 
 std::string CommandLine::GetSwitchValueASCII(
-    const std::string& switch_string) const {
+    const base::StringPiece& switch_string) const {
   StringType value = GetSwitchValueNative(switch_string);
   if (!IsStringASCII(value)) {
     DLOG(WARNING) << "Value of switch (" << switch_string << ") must be ASCII.";
     return std::string();
   }
 #if defined(OS_WIN)
   return UTF16ToASCII(value);
 #else
   return value;
 #endif
 }
 
 FilePath CommandLine::GetSwitchValuePath(
-    const std::string& switch_string) const {
+    const base::StringPiece& switch_string) const {
   return FilePath(GetSwitchValueNative(switch_string));
 }
 
 CommandLine::StringType CommandLine::GetSwitchValueNative(
-    const std::string& switch_string) const {
-  SwitchMap::const_iterator result =
-    switches_.find(LowerASCIIOnWindows(switch_string));
-  return result == switches_.end() ? StringType() : result->second;
+    const base::StringPiece& switch_string) const {
+  DCHECK_EQ(StringToLowerASCII(switch_string.as_string()), switch_string);

[brettw, 2015/04/24 19:50:49]

Shouldn't this function require that the switches are lowercase just like the
HasSwitch ones? It seems like the whole API should be consistent.

[jackhou1, 2015/05/11 13:51:42]

It has the same DCHECK as HasSwitch. AppendSwitch* ensures incoming switches are
converted to lowercase.

+  auto result = switches_by_stringpiece_.find(switch_string);
+  return result == switches_by_stringpiece_.end() ? StringType()
+                                                  : *(result->second);
 }
 
 void CommandLine::AppendSwitch(const std::string& switch_string) {
   AppendSwitchNative(switch_string, StringType());
 }
 
 void CommandLine::AppendSwitchPath(const std::string& switch_string,
                                    const FilePath& path) {
   AppendSwitchNative(switch_string, path.value());
 }
 
 void CommandLine::AppendSwitchNative(const std::string& switch_string,
                                      const CommandLine::StringType& value) {
-  std::string switch_key(LowerASCIIOnWindows(switch_string));
 #if defined(OS_WIN)
+  const std::string switch_key = StringToLowerASCII(switch_string);

[brettw, 2015/04/24 19:50:50]

Ditto for lower-case.

[jackhou1, 2015/05/11 13:51:42]

With AppendSwitch* the string may have come from an external source like argv. I
think we should keep the behavior that CommandLine converts them to lowercase to
save callers from having to.

   StringType combined_switch_string(ASCIIToUTF16(switch_key));
 #elif defined(OS_POSIX)
-  StringType combined_switch_string(switch_string);
+  const std::string& switch_key = switch_string;
+  StringType combined_switch_string(switch_key);
 #endif
   size_t prefix_length = GetSwitchPrefixLength(combined_switch_string);
-  switches_[switch_key.substr(prefix_length)] = value;
+  auto insertion =
+      switches_.insert(make_pair(switch_key.substr(prefix_length), value));
+  if (!insertion.second)
+    insertion.first->second = value;
+  switches_by_stringpiece_[insertion.first->first] = &(insertion.first->second);
   // Preserve existing switch prefixes in |argv_|; only append one if necessary.
   if (prefix_length == 0)
     combined_switch_string = kSwitchPrefixes[0] + combined_switch_string;
   if (!value.empty())
     combined_switch_string += kSwitchValueSeparator + value;
   // Append the switch and update the switches/arguments divider |begin_args_|.
   argv_.insert(argv_.begin() + begin_args_++, combined_switch_string);
 }
 
 void CommandLine::AppendSwitchASCII(const std::string& switch_string,
@@ skipping 118 matching lines @@
 #if defined(OS_WIN)
       arg = QuoteForCommandLineToArgvW(arg, quote_placeholders);
 #endif
       params.append(arg);
     }
   }
   return params;
 }
 
 }  // namespace base