Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4829)

Unified Diff: chrome/browser/metrics/thread_watcher.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/metrics/thread_watcher.cc
diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
index 4e76eee62f37f3aa85d58f06b45baf3d8757e6af..0f9e9acdca01058eda882f56fb5f7a7be549a0fd 100644
--- a/chrome/browser/metrics/thread_watcher.cc
+++ b/chrome/browser/metrics/thread_watcher.cc
@@ -20,9 +20,10 @@
#include "build/build_config.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/metrics/thread_watcher_report_hang.h"
+#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
#include "chrome/common/logging_chrome.h"
+#include "components/version_info/version_info.h"
#include "content/public/browser/notification_service.h"
#if defined(OS_WIN)
@@ -449,7 +450,7 @@ void ThreadWatcherList::ParseCommandLine(
// Increase the unresponsive_threshold on the Stable and Beta channels to
// reduce the number of crashes due to ThreadWatcher.
- version_info::Channel channel = chrome::VersionInfo::GetChannel();
+ version_info::Channel channel = chrome::GetChannel();
if (channel == version_info::Channel::STABLE) {
*unresponsive_threshold *= 4;
} else if (channel == version_info::Channel::BETA) {
@@ -542,7 +543,7 @@ void ThreadWatcherList::InitializeAndStartWatching(
// stable channel, disable ThreadWatcher in stable and unknown channels. We
// will also not collect histogram data in these channels until
// http://crbug.com/426203 is fixed.
- version_info::Channel channel = chrome::VersionInfo::GetChannel();
+ version_info::Channel channel = chrome::GetChannel();
if (channel == version_info::Channel::STABLE ||
channel == version_info::Channel::UNKNOWN) {
return;
@@ -919,7 +920,7 @@ void ShutdownWatcherHelper::Arm(const base::TimeDelta& duration) {
DCHECK(!shutdown_watchdog_);
base::TimeDelta actual_duration = duration;
- version_info::Channel channel = chrome::VersionInfo::GetChannel();
+ version_info::Channel channel = chrome::GetChannel();
if (channel == version_info::Channel::STABLE) {
actual_duration *= 20;
} else if (channel == version_info::Channel::BETA ||
« no previous file with comments | « chrome/browser/metrics/chrome_metrics_service_client.cc ('k') | chrome/browser/metrics/variations/variations_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698