Replace ScopedCommandLineOverride with TestSuite listener.

chrome/test/base/scoped_command_line_override.cc

 // 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.
 
 #include "chrome/test/base/scoped_command_line_override.h"
 
 ScopedCommandLineOverride::ScopedCommandLineOverride(
     const std::string& new_switch)
     : old_command_line_(*CommandLine::ForCurrentProcess()) {
   CommandLine::ForCurrentProcess()->AppendSwitch(new_switch);
 }
 
+ScopedCommandLineOverride::ScopedCommandLineOverride(
+    CommandLine& old_command_line)
+    : old_command_line_(old_command_line) {}
+
+ScopedCommandLineOverride::ScopedCommandLineOverride(
+    const std::string& switch1,
+    const std::string& switch2)
+    : old_command_line_(*CommandLine::ForCurrentProcess()) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switch1);
+  CommandLine::ForCurrentProcess()->AppendSwitch(switch2);
+}
+
+ScopedCommandLineOverride::ScopedCommandLineOverride(
+    const std::string& switch1,
+    const std::string& switch2,
+    const std::string& switch3)
+    : old_command_line_(*CommandLine::ForCurrentProcess()) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switch1);
+  CommandLine::ForCurrentProcess()->AppendSwitch(switch2);
+  CommandLine::ForCurrentProcess()->AppendSwitch(switch3);
+}
+
 ScopedCommandLineOverride::~ScopedCommandLineOverride() {
   *CommandLine::ForCurrentProcess() = old_command_line_;
 }