Replace ScopedCommandLineOverride with TestSuite listener.

base/test/test_suite.h

 // Copyright (c) 2010 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 BASE_TEST_TEST_SUITE_H_
 #define BASE_TEST_TEST_SUITE_H_
 #pragma once
 
 // Defines a basic test suite framework for running gtest based tests.  You can
 // instantiate this class in your main function and call its Run method to run
@@ skipping 32 matching lines @@
   static bool ShouldIgnoreFailure(const testing::TestInfo& test);
 
   // Returns true if the test failed and the failure shouldn't be ignored.
   static bool NonIgnoredFailures(const testing::TestInfo& test);
 
   // Returns the number of tests where the match function returns true.
   int GetTestCount(TestMatch test_match);
 
   void CatchMaybeTests();
 
+  void ResetCommandLine();
+
   int Run();
 
   // A command-line flag that makes a test failure always result in a non-zero
   // process exit code.
   static const char kStrictFailureHandling[];
 
  protected:
   // By default fatal log messages (e.g. from DCHECKs) result in error dialogs
   // which gum up buildbots. Use a minimalistic assert handler which just
   // terminates the process.
@@ skipping 15 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestSuite);
 };
 
 }  // namespace base
 
 // TODO(brettw) remove this. This is a temporary hack to allow WebKit to compile
 // until we can update it to use "base::" (preventing a two-sided patch).
 using base::TestSuite;
 
 #endif  // BASE_TEST_TEST_SUITE_H_