ThreadWatcher - give ShutdownWatchDogThread::Alarm a more unique function body.

chrome/browser/metrics/thread_watcher.cc

Index: chrome/browser/metrics/thread_watcher.cc
===================================================================
--- chrome/browser/metrics/thread_watcher.cc	(revision 192196)
+++ chrome/browser/metrics/thread_watcher.cc	(working copy)
@@ -51,6 +51,14 @@
 #endif
 }
 
+NOINLINE void StartupCrash() {
+  NullPointerCrash(__LINE__);
+}
+
+NOINLINE void ShutdownCrash() {
+  NullPointerCrash(__LINE__);
+}
+
 NOINLINE void ThreadUnresponsive_UI() {
   NullPointerCrash(__LINE__);
 }
@@ -849,11 +857,7 @@
   // Disarm(). When Alarm goes off, in release mode we get the crash dump

[eroman, 2013/04/16 22:53:12]

This comment no longer matches the code.

[ramant (doing other things), 2013/04/16 23:00:40]

Reverted this change. Shouldn't have changed the behavior.

   // without crashing and in debug mode we break into the debugger.
   virtual void Alarm() OVERRIDE {
-#ifndef NDEBUG
-    DCHECK(false);
-#else
-    logging::DumpWithoutCrashing();
-#endif
+    StartupCrash();

[eroman, 2013/04/16 22:53:12]

Is this behavior change intentional? before it would DumpWithoutCrashing()
whereas now it outright crashes.

[ramant (doing other things), 2013/04/16 23:00:40]

Reverted the change.

   }
 
   DISALLOW_COPY_AND_ASSIGN(StartupWatchDogThread);
@@ -873,7 +877,7 @@
   // Alarm is called if the time expires after an Arm() without someone calling
   // Disarm(). We crash the browser if this method is called.
   virtual void Alarm() OVERRIDE {
-    CHECK(false);
+    ShutdownCrash();
   }
 
   DISALLOW_COPY_AND_ASSIGN(ShutdownWatchDogThread);