Move some misc thread-related stuff from base to base/thread and into the bas...

chrome/browser/jankometer.cc

 // Copyright (c) 2010 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 <limits>
 
 #include "chrome/browser/jankometer.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/ref_counted.h"
 #include "base/string_util.h"
+#include "base/threading/watchdog.h"
 #include "base/thread.h"
 #include "base/time.h"
-#include "base/watchdog.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/common/chrome_switches.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/gtk/gtk_util.h"
 #endif
 
 using base::TimeDelta;
@@ skipping 19 matching lines @@
 // Maximum processing time (excluding queueing delay) for a message before
 // considering it delayed.
 const int kMaxMessageProcessingMs = 100;
 
 // TODO(brettw) Consider making this a pref.
 const bool kPlaySounds = false;
 
 //------------------------------------------------------------------------------
 // Provide a special watchdog to make it easy to set the breakpoint on this
 // class only.
-class JankWatchdog : public Watchdog {
+class JankWatchdog : public base::Watchdog {
  public:
   JankWatchdog(const TimeDelta& duration,
                const std::string& thread_watched_name,
                bool enabled)
       : Watchdog(duration, thread_watched_name, enabled),
         thread_name_watched_(thread_watched_name),
         alarm_count_(0) {
   }
 
   virtual ~JankWatchdog() {}
@@ skipping 339 matching lines @@
     delete ui_observer;
     ui_observer = NULL;
   }
   if (io_observer) {
     // IO thread can't be running when we remove observers.
     DCHECK((!g_browser_process) || !(g_browser_process->io_thread()));
     delete io_observer;
     io_observer = NULL;
   }
 }