[NOT FOR COMMIT] Hacks to merge render compositor thread with UI thread

chrome/browser/metrics/thread_watcher.h

 // 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.
 
 // This file defines a WatchDog thread that monitors the responsiveness of other
 // browser threads like UI, IO, DB, FILE and CACHED threads. It also defines
 // ThreadWatcher class which performs health check on threads that would like to
 // be watched. This file also defines ThreadWatcherList class that has list of
 // all active ThreadWatcher objects.
 //
@@ skipping 385 matching lines @@
   static bool IsRegistered(const content::BrowserThread::ID thread_id);
 
   // This method returns number of responsive and unresponsive watched threads.
   static void GetStatusOfThreads(uint32* responding_thread_count,
                                  uint32* unresponding_thread_count);
 
   // This will ensure that the watching is actively taking place, and awaken
   // all thread watchers that are registered.
   static void WakeUpAll();
 
+  // This method calls ThreadWatcher::StartWatching() to perform health check on
+  // the given |thread_id|.
+  static void StartWatching(

[boliu, 2013/02/27 20:10:09]

Oops, this has nothing to do with this patch.

+      const content::BrowserThread::ID& thread_id,
+      const std::string& thread_name,
+      const base::TimeDelta& sleep_time,
+      const base::TimeDelta& unresponsive_time,
+      uint32 unresponsive_threshold,
+      const CrashOnHangThreadMap& crash_on_hang_threads);
+
  private:
   // Allow tests to access our innards for testing purposes.
   friend class CustomThreadWatcher;
   friend class ThreadWatcherTest;
   FRIEND_TEST_ALL_PREFIXES(ThreadWatcherTest, ThreadNamesOnlyArgs);
   FRIEND_TEST_ALL_PREFIXES(ThreadWatcherTest, ThreadNamesAndLiveThresholdArgs);
   FRIEND_TEST_ALL_PREFIXES(ThreadWatcherTest, CrashOnHangThreadsAllArgs);
 
   // This singleton holds the global list of registered ThreadWatchers.
   ThreadWatcherList();
@@ skipping 21 matching lines @@
       uint32 default_crash_seconds,
       CrashOnHangThreadMap* crash_on_hang_threads);
 
   // This constructs the |ThreadWatcherList| singleton and starts watching
   // browser threads by calling StartWatching() on each browser thread that is
   // watched. It disarms StartupTimeBomb.
   static void InitializeAndStartWatching(
       uint32 unresponsive_threshold,
       const CrashOnHangThreadMap& crash_on_hang_threads);
 
-  // This method calls ThreadWatcher::StartWatching() to perform health check on
-  // the given |thread_id|.
-  static void StartWatching(
-      const content::BrowserThread::ID& thread_id,
-      const std::string& thread_name,
-      const base::TimeDelta& sleep_time,
-      const base::TimeDelta& unresponsive_time,
-      uint32 unresponsive_threshold,
-      const CrashOnHangThreadMap& crash_on_hang_threads);
-
   // Delete all thread watcher objects and remove them from global map. It also
   // deletes |g_thread_watcher_list_|.
   static void DeleteAll();
 
   // The Find() method can be used to test to see if a given ThreadWatcher was
   // already registered, or to retrieve a pointer to it from the global map.
   static ThreadWatcher* Find(const content::BrowserThread::ID& thread_id);
 
   // The singleton of this class and is used to keep track of information about
   // threads that are being watched.
@@ skipping 157 matching lines @@
   // shutdown_watchdog_ watches for hangs during shutdown.
   base::Watchdog* shutdown_watchdog_;
 
   // The |thread_id_| on which this object is constructed.
   const base::PlatformThreadId thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ShutdownWatcherHelper);
 };
 
 #endif  // CHROME_BROWSER_METRICS_THREAD_WATCHER_H_