Move GetVersionStringModifier() and GetChannel() from platform_util_* to chrome_version_info_*

chrome/browser/upgrade_detector_impl.cc

 // Copyright (c) 2011 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/upgrade_detector_impl.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/platform_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "content/browser/browser_thread.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN)
 #include "chrome/installer/util/install_util.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/mac/keystone_glue.h"
@@ skipping 77 matching lines @@
     command_line.AppendSwitch(switches::kProductVersion);
     std::string reply;
     if (!base::GetAppOutput(command_line, &reply)) {
       DLOG(ERROR) << "Failed to get current file version";
       return;
     }
 
     installed_version.reset(Version::GetVersionFromString(reply));
 #endif
 
-    platform_util::Channel channel = platform_util::GetChannel();
-    *is_unstable_channel_ = channel == platform_util::CHANNEL_DEV ||
-                            channel == platform_util::CHANNEL_CANARY;
+    chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+    *is_unstable_channel_ = channel == chrome::VersionInfo::CHANNEL_DEV ||
+                            channel == chrome::VersionInfo::CHANNEL_CANARY;
 
     // Get the version of the currently *running* instance of Chrome.
     chrome::VersionInfo version_info;
     if (!version_info.is_valid()) {
       NOTREACHED() << "Failed to get current file version";
       return;
     }
     scoped_ptr<Version> running_version(
         Version::GetVersionFromString(version_info.Version()));
     if (running_version.get() == NULL) {
@@ skipping 128 matching lines @@
 
 // static
 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() {
   return Singleton<UpgradeDetectorImpl>::get();
 }
 
 // static
 UpgradeDetector* UpgradeDetector::GetInstance() {
   return UpgradeDetectorImpl::GetInstance();
 }