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

chrome/browser/metrics/thread_watcher.h

Index: chrome/browser/metrics/thread_watcher.h
diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h
index 39d046872555545fdc5fa92008555e4182af8248..796c2bbeb5b80b25a9b7175af6f6778231cab0f7 100644
--- a/chrome/browser/metrics/thread_watcher.h
+++ b/chrome/browser/metrics/thread_watcher.h
@@ -403,6 +403,16 @@ class ThreadWatcherList {
   // 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;
@@ -444,16 +454,6 @@ class ThreadWatcherList {
       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();