Replace ScopedCommandLineOverride with TestSuite listener.

chrome/test/base/scoped_command_line_override.h

Index: chrome/test/base/scoped_command_line_override.h
diff --git a/chrome/test/base/scoped_command_line_override.h b/chrome/test/base/scoped_command_line_override.h
index 33ebd8a1ff356616230089938aa20a4fbc252d3c..f5c112b0c76b03463c35e528f32414823d3709dc 100644
--- a/chrome/test/base/scoped_command_line_override.h
+++ b/chrome/test/base/scoped_command_line_override.h
@@ -24,6 +24,17 @@
 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_;