| Index: chrome/browser/metrics/thread_watcher.cc
|
| diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
|
| index 5badf2b6bbd2f87909e2d941cfb5f6059c39a8ee..709ad2b000f2a2a87514483dbdc8f9617f63a95e 100644
|
| --- a/chrome/browser/metrics/thread_watcher.cc
|
| +++ b/chrome/browser/metrics/thread_watcher.cc
|
| @@ -932,7 +932,7 @@ class StartupWatchDogThread : public base::Watchdog {
|
| // Alarm is called if the time expires after an Arm() without someone calling
|
| // Disarm(). When Alarm goes off, in release mode we get the crash dump
|
| // without crashing and in debug mode we break into the debugger.
|
| - virtual void Alarm() OVERRIDE {
|
| + virtual void Alarm() override {
|
| #if !defined(NDEBUG)
|
| StartupHang();
|
| return;
|
| @@ -978,7 +978,7 @@ class ShutdownWatchDogThread : public base::Watchdog {
|
|
|
| // 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 {
|
| + virtual void Alarm() override {
|
| ShutdownHang();
|
| }
|
|
|
|
|