Create an AtExitManager around each test, to take care of stray singletons

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"
@@ skipping 64 matching lines @@
 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();
+    per_test_manager_.reset(new base::AtExitManager);
   }
 
   virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
     AtExitManager* new_top_manager = AtExitManager::current();
+    if (per_test_manager_.get() != 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.";

[Ryan Sleevi, 2012/07/11 22:30:41]

style nit: The << should be on the beginning of each of these new lines (
http://www.chromium.org/developers/coding-style#TOC-Code-formatting "An
exception is log messages"

Same on line 105

+    }
+    per_test_manager_.reset();
+
+    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) <<
+      ADD_FAILURE() <<
           "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_;
+  scoped_ptr<base::AtExitManager> per_test_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) {
@@ skipping 225 matching lines @@
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSingleProcessChromeFlag)) {
     WatchAtExitManager();
   }
 
   TestTimeouts::Initialize();
 }
 
 void TestSuite::Shutdown() {
 }