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) {
+  }
+
+  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 52 matching lines @@
 
   return count;
 }
 
 void TestSuite::CatchMaybeTests() {
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new MaybeTestDisabler);
 }
 
+void TestSuite::ResetCommandLine() {
+  testing::TestEventListeners& listeners =
+      testing::UnitTest::GetInstance()->listeners();
+  listeners.Append(new TestClientInitializer);
+}
+
 // Don't add additional code to this method.  Instead add it to
 // Initialize().  See bug 6436.
 int TestSuite::Run() {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool scoped_pool;
 #endif
 
   Initialize();
   std::string client_func =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ skipping 90 matching lines @@
     logging::SetLogAssertHandler(UnitTestAssertHandler);
   }
 
 #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();
+  ResetCommandLine();
 
   TestTimeouts::Initialize();
 }
 
 void TestSuite::Shutdown() {
 }