ThreadWacther - delete the code for Android that collected stats for

chrome/browser/metrics/thread_watcher.cc

 // Copyright (c) 2012 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 "chrome/browser/metrics/thread_watcher.h"
 
 #include <math.h>  // ceil
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 902 matching lines @@
 
 // StartupWatchDogThread methods and members.
 //
 // Class for detecting hangs during startup.
 class StartupWatchDogThread : public base::Watchdog {
  public:
   // Constructor specifies how long the StartupWatchDogThread will wait before
   // alarming.
   explicit StartupWatchDogThread(const base::TimeDelta& duration)
       : base::Watchdog(duration, "Startup watchdog thread", true) {
-#if defined(OS_ANDROID)
-    // TODO(rtenneti): Delete this code, after getting data.
-    start_time_clock_= base::Time::Now();
-    start_time_monotonic_ = base::TimeTicks::Now();
-    start_time_thread_now_ = base::TimeTicks::IsThreadNowSupported()
-        ? base::TimeTicks::ThreadNow() : base::TimeTicks::Now();
-#endif  // OS_ANDROID
   }
 
   // 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.
   void Alarm() override {
 #if !defined(NDEBUG)
     StartupHang();
     return;
 #elif !defined(OS_ANDROID)
     WatchDogThread::PostTask(FROM_HERE, base::Bind(&StartupHang));
     return;
-#else  // Android release: gather stats to figure out when to crash.
-    // TODO(rtenneti): Delete this code, after getting data.
-    UMA_HISTOGRAM_TIMES("StartupTimeBomb.Alarm.TimeDuration",
-                        base::Time::Now() - start_time_clock_);
-    UMA_HISTOGRAM_TIMES("StartupTimeBomb.Alarm.TimeTicksDuration",
-                        base::TimeTicks::Now() - start_time_monotonic_);
-    if (base::TimeTicks::IsThreadNowSupported()) {
-      UMA_HISTOGRAM_TIMES(
-          "StartupTimeBomb.Alarm.ThreadNowDuration",
-          base::TimeTicks::ThreadNow() - start_time_thread_now_);
-    }
-    return;
+#else
+    // TODO(rtenneti): Enable crashing for Android.
 #endif  // OS_ANDROID
   }
 
  private:
-#if defined(OS_ANDROID)
-  // TODO(rtenneti): Delete this code, after getting data.
-  base::Time start_time_clock_;
-  base::TimeTicks start_time_monotonic_;
-  base::TimeTicks start_time_thread_now_;
-#endif  // OS_ANDROID
-
   DISALLOW_COPY_AND_ASSIGN(StartupWatchDogThread);
 };
 
 // ShutdownWatchDogThread methods and members.
 //
 // Class for detecting hangs during shutdown.
 class ShutdownWatchDogThread : public base::Watchdog {
  public:
   // Constructor specifies how long the ShutdownWatchDogThread will wait before
   // alarming.
@@ skipping 104 matching lines @@
 
 #if defined(OS_WIN)
   // On Windows XP, give twice the time for shutdown.
   if (base::win::GetVersion() <= base::win::VERSION_XP)
     actual_duration *= 2;
 #endif
 
   shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration);
   shutdown_watchdog_->Arm();
 }