Replace ScopedCommandLineOverride with TestSuite listener.

chrome/test/base/scoped_command_line_override.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_TEST_BASE_SCOPED_COMMAND_LINE_OVERRIDE_H_
 #define CHROME_TEST_BASE_SCOPED_COMMAND_LINE_OVERRIDE_H_
 #pragma once
 
 #include <string>
 
 #include "base/command_line.h"
 
 // ScopedCommandLineOverride takes the CommandLine for the current
 // process, saves it, then alters it. When the instance of this class
 // goes out of scope, it restores CommandLine to its prior state. The
 // intended usage is to test something that requires a flag that's off
 // by default:
 //
 // ASSERT_TRUE(!Something::NotFullyBaked());
 // {
 //   ScopedCommandLineOverride override(switches:kEnableSomethingHalfBaked);
 //   ASSERT_TRUE(Something::NotFullyBaked());
 // }
 class ScopedCommandLineOverride {
  public:
   explicit ScopedCommandLineOverride(const std::string& new_switch);
+  explicit ScopedCommandLineOverride(CommandLine& old_command_line);

[asargent_no_longer_on_chrome, 2011/11/21 17:14:23]

nit: const CommandLine&

+
+  // These constructors feel dopey, but they're better than the trouble of
+  // constructing a vector, and va_list won't work with references.

[asargent_no_longer_on_chrome, 2011/11/21 17:14:23]

It might be better to group the 3 constructors that take strings together, eg.

explicit ScopedCommandLineOverride(const std::string& new_switch);
ScopedCommandLineOverride(const std::string& new_switch1,
                          const std::string& switch2);
...

and then

explicit ScopedCommandLineOverride(CommandLine& old_command_line);

+  //
+  // TODO(you): if you're a C wizard, make this prettier.
+  ScopedCommandLineOverride(const std::string& switch1,
+                            const std::string& switch2);
+  ScopedCommandLineOverride(const std::string& switch1,
+                            const std::string& switch2,
+                            const std::string& switch3);
   virtual ~ScopedCommandLineOverride();
  private:
   CommandLine old_command_line_;
 };
 
 #endif  // CHROME_TEST_BASE_SCOPED_COMMAND_LINE_OVERRIDE_H_