Allow multiple AtExitManagers to be chained in a stack, this allows much easier testing for code that is expecting to be run via an AtExitManager. This actually cleaned up a lot of the at exit code.

Clean up singleton_dll_unittest.  It is no longer windows specific DLL, and now is much simpler, and builds and runs cross platform.

BUG=1314043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@646 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 1 deletions

diff --git a/base/at_exit.h b/base/at_exit.h
index 8b9f946..123935d 100644
--- a/base/at_exit.h
+++ b/base/at_exit.h
@@ -54,6 +54,12 @@ typedef void (*AtExitCallbackType)();
 // callbacks and singleton destructors will be called.
 
 class AtExitManager {
+ protected:
+  // This constructor will allow this instance of AtExitManager to be created
+  // even if on already exists.  This should only be used for testing!
+  // AtExitManagers are kept on a global stack, and it will be removed during
+  // destruction.  This allows you to shadow another AtExitManager.
+  AtExitManager(bool shadow);
  public:
   AtExitManager();
 
@@ -71,7 +77,7 @@ class AtExitManager {
 
  private:
   Lock lock_;
-  std::stack<base::AtExitCallbackType> atexit_queue_;
+  std::stack<base::AtExitCallbackType> stack_;
   DISALLOW_EVIL_CONSTRUCTORS(AtExitManager);
 };