Componentize VersionInfo.

chrome/browser/metrics/thread_watcher.cc

 // 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.
 
 #include "chrome/browser/metrics/thread_watcher.h"
 
 #include <math.h>  // ceil
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 431 matching lines @@
 // static
 void ThreadWatcherList::ParseCommandLine(
     const base::CommandLine& command_line,
     uint32* unresponsive_threshold,
     CrashOnHangThreadMap* crash_on_hang_threads) {
   // Initialize |unresponsive_threshold| to a default value.
   *unresponsive_threshold = kUnresponsiveCount;
 
   // Increase the unresponsive_threshold on the Stable and Beta channels to
   // reduce the number of crashes due to ThreadWatcher.
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_STABLE) {
+  version_info::Channel channel = chrome::VersionInfo::GetChannel();
+  if (channel == version_info::Channel::STABLE) {
     *unresponsive_threshold *= 4;
-  } else if (channel == chrome::VersionInfo::CHANNEL_BETA) {
+  } else if (channel == version_info::Channel::BETA) {
     *unresponsive_threshold *= 2;
   }
 
 #if defined(OS_WIN)
   // For Windows XP (old systems), double the unresponsive_threshold to give
   // the OS a chance to schedule UI/IO threads a time slice to respond with a
   // pong message (to get around limitations with the OS).
   if (base::win::GetVersion() <= base::win::VERSION_XP)
     *unresponsive_threshold *= 2;
 #endif
 
   uint32 crash_seconds = *unresponsive_threshold * kUnresponsiveSeconds;
   std::string crash_on_hang_thread_names;
   if (command_line.HasSwitch(switches::kCrashOnHangThreads)) {
     crash_on_hang_thread_names =
         command_line.GetSwitchValueASCII(switches::kCrashOnHangThreads);
-  } else if (channel != chrome::VersionInfo::CHANNEL_STABLE) {
+  } else if (channel != version_info::Channel::STABLE) {
     // Default to crashing the browser if UI or IO or FILE threads are not
     // responsive except in stable channel.
     crash_on_hang_thread_names = base::StringPrintf(
         "UI:%d:%d,IO:%d:%d,FILE:%d:%d",
         kLiveThreadsThreshold, crash_seconds,
         kLiveThreadsThreshold, crash_seconds,
         kLiveThreadsThreshold, crash_seconds * 5);
   }
 
   ParseCommandLineCrashOnHangThreads(crash_on_hang_thread_names,
@@ skipping 52 matching lines @@
   if (g_thread_watcher_list_ || g_stopped_)
     return;
 
   ThreadWatcherList* thread_watcher_list = new ThreadWatcherList();
   CHECK(thread_watcher_list);
 
   // TODO(rtenneti): Because we don't generate crash dumps for ThreadWatcher in
   // 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.
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_STABLE ||
-      channel == chrome::VersionInfo::CHANNEL_UNKNOWN) {
+  version_info::Channel channel = chrome::VersionInfo::GetChannel();
+  if (channel == version_info::Channel::STABLE ||
+      channel == version_info::Channel::UNKNOWN) {
     return;
   }
 
   const base::TimeDelta kSleepTime =
       base::TimeDelta::FromSeconds(kSleepSeconds);
   const base::TimeDelta kUnresponsiveTime =
       base::TimeDelta::FromSeconds(kUnresponsiveSeconds);
 
   StartWatching(BrowserThread::UI, "UI", kSleepTime, kUnresponsiveTime,
                 unresponsive_threshold, crash_on_hang_threads);
@@ skipping 354 matching lines @@
     delete shutdown_watchdog_;
     shutdown_watchdog_ = NULL;
   }
 }
 
 void ShutdownWatcherHelper::Arm(const base::TimeDelta& duration) {
   DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId());
   DCHECK(!shutdown_watchdog_);
   base::TimeDelta actual_duration = duration;
 
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_STABLE) {
+  version_info::Channel channel = chrome::VersionInfo::GetChannel();
+  if (channel == version_info::Channel::STABLE) {
     actual_duration *= 20;
-  } else if (channel == chrome::VersionInfo::CHANNEL_BETA ||
-             channel == chrome::VersionInfo::CHANNEL_DEV) {
+  } else if (channel == version_info::Channel::BETA ||
+             channel == version_info::Channel::DEV) {
     actual_duration *= 10;
   }
 
 #if defined(OS_WIN)
   // On Windows XP, give twice the time for shutdown.
   if (base::win::GetVersion() <= base::win::VERSION_XP)
     actual_duration *= 2;
 #endif
 
   shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration);
   shutdown_watchdog_->Arm();
 }