Delete and disarm StartupTimeBomb when browser is
shutting down if StartupTimeBomb is still Arm'ed.
BUG=105475
R=jar
TEST=browser unit tests
Review URL: http://codereview.chromium.org/8728035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112372 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index 5ef3eb9fa..26f22a6 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -26,6 +26,7 @@
class MetricsService;
class PrefService;
class Profile;
+class StartupTimeBomb;
class ShutdownWatcherHelper;
class TranslateManager;
@@ -138,6 +139,9 @@
const CommandLine& parsed_command_line_;
int result_code_;
+ // Create StartupTimeBomb object for watching jank during startup.
+ scoped_ptr<StartupTimeBomb> startup_watcher_;
+
// Create ShutdownWatcherHelper object for watching jank during shutdown.
// Please keep |shutdown_watcher| as the first object constructed, and hence
// it is destroyed last.