Support Using ScopedFeatureList in BrowserTest

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"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/stl_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif
@@ skipping 118 matching lines @@
     } else {
       out.push_back(arg[i]);
     }
   }
   out.push_back('"');
 
   return out;
 }
 #endif
 
+std::string SwitchKey(const std::string& switch_string) {

[Ilya Sherman, 2017/06/09 20:19:28]

nit: Mebbe "GetSwitchKey"?

+#if defined(OS_WIN)
+  return ToLowerASCII(switch_string);
+#elif defined(OS_POSIX)
+  return switch_string;
+#endif
+}
+
+CommandLine::StringType CombinedSwitchString(const std::string switch_key) {

[Ilya Sherman, 2017/06/09 20:19:28]

nit: Mebbe "GetCombinedSwitchString"?

+#if defined(OS_WIN)
+  return ASCIIToUTF16(switch_key);
+#elif defined(OS_POSIX)
+  return switch_key;
+#endif
+}
+
 }  // namespace
 
 CommandLine::CommandLine(NoProgram no_program)
     : argv_(1),
       begin_args_(1) {
 }
 
 CommandLine::CommandLine(const FilePath& program)
     : argv_(1),
       begin_args_(1) {
@@ skipping 166 matching lines @@
   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) {
-#if defined(OS_WIN)
-  const std::string switch_key = ToLowerASCII(switch_string);
-  StringType combined_switch_string(ASCIIToUTF16(switch_key));
-#elif defined(OS_POSIX)
-  const std::string& switch_key = switch_string;
-  StringType combined_switch_string(switch_key);
-#endif
+  const std::string switch_key = SwitchKey(switch_string);
+  StringType combined_switch_string = CombinedSwitchString(switch_key);
   size_t prefix_length = GetSwitchPrefixLength(combined_switch_string);
   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,
                                     const std::string& value_string) {
 #if defined(OS_WIN)
   AppendSwitchNative(switch_string, ASCIIToUTF16(value_string));
 #elif defined(OS_POSIX)
   AppendSwitchNative(switch_string, value_string);
 #endif
 }
 
+void CommandLine::RemoveSwitchForTesting(const std::string& switch_string) {
+  const std::string switch_key = SwitchKey(switch_string);
+  StringType combined_switch_string = CombinedSwitchString(switch_key);
+  size_t prefix_length = GetSwitchPrefixLength(combined_switch_string);
+  switches_by_stringpiece_.erase(switch_key.substr(prefix_length));
+  switches_.erase(switch_string.substr(prefix_length));
+
+  auto find_switch = [&combined_switch_string](const std::string& s) {

[Ilya Sherman, 2017/06/09 20:19:28]

nit: What does "s" represent?  Please give it a clearer name, e.g. "argv_entry".

+    return s.find(combined_switch_string) != std::string::npos;
+  };
+
+  base::EraseIf(argv_, find_switch);
+}
+
 void CommandLine::CopySwitchesFrom(const CommandLine& source,
                                    const char* const switches[],
                                    size_t count) {
   for (size_t i = 0; i < count; ++i) {
     if (source.HasSwitch(switches[i]))
       AppendSwitchNative(switches[i], source.GetSwitchValueNative(switches[i]));
   }
 }
 
 CommandLine::StringVector CommandLine::GetArgs() const {
@@ skipping 111 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