Revert 144488 - For unit tests, track additions to AtExitManager and warn.

base/test/test_suite.cc

 // Copyright (c) 2012 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"
 #include "base/debug/debug_on_start_win.h"
 #include "base/debug/debugger.h"
 #include "base/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/test/multiprocess_test.h"
-#include "base/test/test_switches.h"
 #include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #if defined(OS_IOS)
 #include "base/test/test_listener_ios.h"
 #else
@@ skipping 40 matching lines @@
   }
 
  private:
   CommandLine old_command_line_;
 
   DISALLOW_COPY_AND_ASSIGN(TestClientInitializer);
 };
 
 }  // namespace
 
-namespace base {
-
-class TestWatchAtExitManager : public testing::EmptyTestEventListener {
- public:
-  TestWatchAtExitManager() { }
-  ~TestWatchAtExitManager() { }
-
-  virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
-    initial_top_manager_ = AtExitManager::current();
-    at_exit_stack_size_ = initial_top_manager_->CallbackStackSize();
-  }
-
-  virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
-    AtExitManager* new_top_manager = AtExitManager::current();
-    size_t new_stack_size = new_top_manager->CallbackStackSize();
-
-    if (initial_top_manager_ != new_top_manager) {
-      ADD_FAILURE() << "The current AtExitManager has changed across the "
-          "test " << test_info.test_case_name() << "." << test_info.name() <<
-          " most likely because one was created without being destroyed.";
-    } else if (new_stack_size != at_exit_stack_size_) {
-      // TODO(scottbyer): clean up all the errors that result from this and
-      // turn this into a test failure with
-      // ADD_FAILURE(). http://crbug.com/133403
-      LOG(WARNING) <<
-          "AtExitManager: items were added to the callback list by " <<
-          test_info.test_case_name() << "." << test_info.name() <<
-          ". Global state should be cleaned up before a test exits.";
-    }
-  }
-
- private:
-  AtExitManager* initial_top_manager_;
-  size_t at_exit_stack_size_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestWatchAtExitManager);
-};
-
-}  // namespace base
-
 const char TestSuite::kStrictFailureHandling[] = "strict_failure_handling";
 
 TestSuite::TestSuite(int argc, char** argv) : initialized_command_line_(false) {
   PreInitialize(argc, argv, true);
 }
 
 TestSuite::TestSuite(int argc, char** argv, bool create_at_exit_manager)
     : initialized_command_line_(false) {
   PreInitialize(argc, argv, create_at_exit_manager);
 }
@@ skipping 81 matching lines @@
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new MaybeTestDisabler);
 }
 
 void TestSuite::ResetCommandLine() {
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestClientInitializer);
 }
 
-void TestSuite::WatchAtExitManager() {
-  testing::TestEventListeners& listeners =
-      testing::UnitTest::GetInstance()->listeners();
-  listeners.Append(new TestWatchAtExitManager);
-}
-
 // 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 104 matching lines @@
     SuppressErrorDialogs();
     base::debug::SetSuppressDebugUI(true);
     logging::SetLogAssertHandler(UnitTestAssertHandler);
   }
 
   icu_util::Initialize();
 
   CatchMaybeTests();
   ResetCommandLine();
 
-  // Don't watch for AtExit items being added if we're running as a child
-  // process (e.g., browser_tests or interactive_ui_tests).
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSingleProcessTestsFlag) &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSingleProcessChromeFlag)) {
-    WatchAtExitManager();
-  }
-
   TestTimeouts::Initialize();
 }
 
 void TestSuite::Shutdown() {
 }