libchrome: Several upstreamable fixes from libchrome

base/command_line.cc

Index: base/command_line.cc
diff --git a/base/command_line.cc b/base/command_line.cc
index c991959d6911bf545f994b3e6d0833f793cc7cf0..44d8ffea0e7e106061c8d602db8c9fc310f564c7 100644
--- a/base/command_line.cc
+++ b/base/command_line.cc
@@ -149,7 +149,7 @@ string16 QuoteForCommandLineToArgvW(const string16& arg,
 
 }  // namespace
 
-CommandLine::CommandLine(NoProgram no_program)
+CommandLine::CommandLine(NoProgram /* no_program */)

[danakj, 2016/05/23 02:59:54]

Just remove the name

https://google.github.io/styleguide/cppguide.html#Function_Declarations_and_D...

"Parameter names may be omitted only if the parameter is unused and its purpose
is obvious."

The type name here makes it obvious

[Luis Héctor Chávez, 2016/05/24 15:27:52]

Done.

     : argv_(1),
       begin_args_(1) {
 }
@@ -444,6 +444,10 @@ CommandLine::StringType CommandLine::GetCommandLineStringInternal(
 
 CommandLine::StringType CommandLine::GetArgumentsStringInternal(
     bool quote_placeholders) const {
+#if !defined(OS_WIN)
+  // Avoid an unused warning.
+  (void)quote_placeholders;
+#endif
   StringType params;
   // Append switches and arguments.
   bool parse_switches = true;