Replace ScopedCommandLineOverride with TestSuite listener.

base/test/test_suite.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 "base/test/test_suite.h"
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 29 matching lines @@
 class MaybeTestDisabler : public testing::EmptyTestEventListener {
  public:
   virtual void OnTestStart(const testing::TestInfo& test_info) {
     ASSERT_FALSE(TestSuite::IsMarkedMaybe(test_info))
         << "Probably the OS #ifdefs don't include all of the necessary "
            "platforms.\nPlease ensure that no tests have the MAYBE_ prefix "
            "after the code is preprocessed.";
   }
 };
 
+class TestClientInitializer : public testing::EmptyTestEventListener {
+ public:
+  TestClientInitializer()
+      : old_command_line_(CommandLine::NO_PROGRAM) {

[asargent_no_longer_on_chrome, 2011/11/21 19:19:50]

I guess it doesn't really matter since you set it in the OnTestStart, but would
it be better to use CommandLine::ForCurrentProcess() rather than
CommandLine::NO_PROGRAM here?

+  }
+
+  virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
+    old_command_line_ = *CommandLine::ForCurrentProcess();
+  }
+
+  virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
+    *CommandLine::ForCurrentProcess() = old_command_line_;
+  }
+
+ private:
+  CommandLine old_command_line_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestClientInitializer);
+};
+
 }  // namespace
 
 const char TestSuite::kStrictFailureHandling[] = "strict_failure_handling";
 
 TestSuite::TestSuite(int argc, char** argv) {
 #if defined(OS_WIN)
   testing::GTEST_FLAG(catch_exceptions) = false;
 #endif
   base::EnableTerminationOnHeapCorruption();
   CommandLine::Init(argc, argv);
@@ skipping 163 matching lines @@
   }
 
 #if !defined(OS_ANDROID)
   // TODO(michaelbai): The icu can not be compiled in Android now, this should
   // be enabled once icu is ready. http://b/5406077.
   icu_util::Initialize();
 #endif
 
   CatchMaybeTests();
 
+  testing::TestEventListeners& listeners =

[Paweł Hajdan Jr., 2011/11/21 19:59:32]

nit: It's slightly inconsistent to add the MAYBE test listeners in a function
and this one inline. Please do those two on the same abstraction level. I
slightly prefer doing both of them inline.

+      testing::UnitTest::GetInstance()->listeners();
+  listeners.Append(new TestClientInitializer);
+
   TestTimeouts::Initialize();
 }
 
 void TestSuite::Shutdown() {
 }