libchrome: Several upstreamable fixes from libchrome

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/files/file_path.h"
@@ skipping 131 matching lines @@
     }
   }
   out.push_back('"');
 
   return out;
 }
 #endif
 
 }  // namespace
 
-CommandLine::CommandLine(NoProgram no_program)
-    : argv_(1),
-      begin_args_(1) {
-}
+CommandLine::CommandLine(NoProgram) : 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) {
@@ skipping 271 matching lines @@
   StringType params(GetArgumentsStringInternal(quote_placeholders));
   if (!params.empty()) {
     string.append(StringType(FILE_PATH_LITERAL(" ")));
     string.append(params);
   }
   return string;
 }
 
 CommandLine::StringType CommandLine::GetArgumentsStringInternal(
     bool quote_placeholders) const {
+#if !defined(OS_WIN)
+  (void)quote_placeholders;  // Avoid an unused warning.
+#endif
   StringType params;
   // Append switches and arguments.
   bool parse_switches = true;
   for (size_t i = 1; i < argv_.size(); ++i) {
     StringType arg = argv_[i];
     StringType switch_string;
     StringType switch_value;
     parse_switches &= arg != kSwitchTerminator;
     if (i > 1)
       params.append(StringType(FILE_PATH_LITERAL(" ")));
@@ skipping 16 matching lines @@
   return params;
 }
 
 void CommandLine::ResetStringPieces() {
   switches_by_stringpiece_.clear();
   for (const auto& entry : switches_)
     switches_by_stringpiece_[entry.first] = &(entry.second);
 }
 
 }  // namespace base