Provide and use auto startup/teardown for tracked objects...

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2008 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 "build/build_config.h"
 
 #include "base/command_line.h"
 #include "sandbox/src/sandbox.h"
 
-// TODO(port): several win-only methods have been pulled out of this, but 
+// TODO(port): several win-only methods have been pulled out of this, but
 // BrowserMain() as a whole needs to be broken apart so that it's usable by
-// other platforms. For now, it's just a stub. This is a serious work in 
+// other platforms. For now, it's just a stub. This is a serious work in
 // progress and should not be taken as an indication of a real refactoring.
 
 #if defined(OS_WIN)
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
 
 #include "base/file_util.h"
@@ skipping 120 matching lines @@
 // Main routine for running as the Browser process.
 int BrowserMain(CommandLine &parsed_command_line,
                 sandbox::BrokerServices* broker_services) {
   // WARNING: If we get a WM_ENDSESSION objects created on the stack here
   // are NOT deleted. If you need something to run during WM_ENDSESSION add it
   // to browser_shutdown::Shutdown or BrowserProcess::EndSession.
 
   // TODO(beng, brettw): someday, break this out into sub functions with well
   //                     defined roles (e.g. pre/post-profile startup, etc).
 
+#ifdef TRACK_ALL_TASK_OBJECTS
+  // Start tracking the creation and deletion of Task instance.
+  // This construction MUST be done before main_message_loop, so that it is
+  // destroyed after the main_message_loop.
+  tracked_objects::AutoTracking tracking_objects;
+#endif
+
   MessageLoop main_message_loop(MessageLoop::TYPE_UI);
 
   // Initialize the SystemMonitor
   base::SystemMonitor::Start();
 
   // Initialize statistical testing infrastructure.
   FieldTrialList field_trial;
 
   std::wstring app_name = chrome::kBrowserAppName;
   std::string thread_name_string = WideToASCII(app_name + L"_BrowserMain");
@@ skipping 94 matching lines @@
   ResourceBundle::GetSharedInstance().LoadThemeResources();
 
   if (!parsed_command_line.HasSwitch(switches::kNoErrorDialogs)) {
     // Display a warning if the user is running windows 2000.
     CheckForWin2000();
   }
 
   // Initialize histogram statistics gathering system.
   StatisticsRecorder statistics;
 
-  // Start tracking the creation and deletion of Task instances
-  bool tracking_objects = false;
-#ifdef TRACK_ALL_TASK_OBJECTS
-  tracking_objects = tracked_objects::ThreadData::StartTracking(true);
-#endif
-
   // Initialize the shared instance of user data manager.
   UserDataManager::Create();
 
   // Try to create/load the profile.
   ProfileManager* profile_manager = browser_process->profile_manager();
   Profile* profile = profile_manager->GetDefaultProfile(user_data_dir);
   if (!profile) {
     user_data_dir = UserDataDirDialog::RunUserDataDirDialog(user_data_dir);
     // Flush the message loop which lets the UserDataDirDialog close.
     MessageLoop::current()->Run();
@@ skipping 197 matching lines @@
                                       true, profile, &result_code)) {
     MessageLoopForUI::current()->Run(browser_process->accelerator_handler());
   }
 
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
-
   browser_shutdown::Shutdown();
 
-  // The following teardown code will pacify Purify, but is not necessary for
-  // shutdown.  Only list methods here that have no significant side effects
-  // and can be run in single threaded mode before terminating.
-#ifndef NDEBUG  // Don't call these in a Release build: they just waste time.
-  // The following should ONLY be called when in single threaded mode. It is
-  // unsafe to do this cleanup if other threads are still active.
-  // It is also very unnecessary, so I'm only doing this in debug to satisfy
-  // purify.
-  if (tracking_objects)
-    tracked_objects::ThreadData::ShutdownSingleThreadedCleanup();
-#endif  // NDEBUG
-
   return result_code;
 }
 
 #elif defined(OS_POSIX)
 
 // Call to kick off the main message loop. The implementation for this on Mac
 // must reside in another file because it has to call Cocoa functions and thus
 // cannot live in a .cc file.
 int StartPlatformMessageLoop();
 
 // TODO(port): merge this with above. Just a stub for now, not meant as a place
 // to duplicate code.
 // Main routine for running as the Browser process.
 int BrowserMain(CommandLine &parsed_command_line,
                 sandbox::BrokerServices* broker_services) {
   return StartPlatformMessageLoop();
 }
 
 #if defined(OS_LINUX)
 void StartPlatformMessageLoop() {
   return 0;
 }
 #endif
 
 #endif