| Index: chrome/browser/metrics/thread_watcher.cc
|
| diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
|
| index 27dc82511b812a8aba1a8eeee256932a98c611d3..00590a4cd0ee17c48e40702c4f28b8319c575c66 100644
|
| --- a/chrome/browser/metrics/thread_watcher.cc
|
| +++ b/chrome/browser/metrics/thread_watcher.cc
|
| @@ -539,6 +539,13 @@ void ThreadWatcherList::InitializeAndStartWatching(
|
| ThreadWatcherList* thread_watcher_list = new ThreadWatcherList();
|
| CHECK(thread_watcher_list);
|
|
|
| + // Disable ThreadWatcher in Canary channel.
|
| + chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
|
| + if (channel == chrome::VersionInfo::CHANNEL_CANARY ||
|
| + channel == chrome::VersionInfo::CHANNEL_UNKNOWN) {
|
| + return;
|
| + }
|
| +
|
| const base::TimeDelta kSleepTime =
|
| base::TimeDelta::FromSeconds(kSleepSeconds);
|
| const base::TimeDelta kUnresponsiveTime =
|
|
|