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

chrome/browser/mac/keystone_glue.mm

 // 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.
 
 #import "chrome/browser/mac/keystone_glue.h"
 
 #include <sys/param.h>
 #include <sys/mount.h>
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/memory/ref_counted.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/browser/mac/authorization_util.h"
 #import "chrome/browser/mac/keystone_registration.h"
-#include "chrome/browser/platform_util.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_version_info.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace {
 
 namespace ksr = keystone_registration;
 
 // Constants for the brand file (uses an external file so it can survive
@@ skipping 258 matching lines @@
   if (brandFileType_ == kBrandFileTypeNotDetermined) {
 
     NSFileManager* fm = [NSFileManager defaultManager];
     NSString* userBrandFile = UserBrandFilePath();
     NSString* systemBrandFile = SystemBrandFilePath();
 
     // Default to none.
     brandFileType_ = kBrandFileTypeNone;
 
     // Only the stable channel has a brand code.
-    platform_util::Channel channel = platform_util::GetChannel();
+    chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
 
-    if (channel == platform_util::CHANNEL_DEV ||
-        channel == platform_util::CHANNEL_BETA) {
+    if (channel == chrome::VersionInfo::CHANNEL_DEV ||
+        channel == chrome::VersionInfo::CHANNEL_BETA) {
 
       // If on the dev or beta channel, this installation may have replaced
       // an older system-level installation. Check for a user brand file and
       // nuke it if present. Don't try to remove the system brand file, there
       // wouldn't be any permission to do so.
       //
       // Don't do this on the canary channel. The canary can run side-by-side
       // with another Google Chrome installation whose brand code, if any,
       // should remain intact.
 
       if ([fm fileExistsAtPath:userBrandFile]) {
         [fm removeItemAtPath:userBrandFile error:NULL];
       }
 
-    } else if (channel == platform_util::CHANNEL_STABLE) {
+    } else if (channel == chrome::VersionInfo::CHANNEL_STABLE) {
 
       // If there is a system brand file, use it.
       if ([fm fileExistsAtPath:systemBrandFile]) {
         // System
 
         // Use the system file that is there.
         brandFileType_ = kBrandFileTypeSystem;
 
         // Clean up any old user level file.
         if ([fm fileExistsAtPath:userBrandFile]) {
@@ skipping 582 matching lines @@
   return [KeystoneGlue defaultKeystoneGlue] != nil;
 }
 
 string16 CurrentlyInstalledVersion() {
   KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue];
   NSString* version = [keystoneGlue currentlyInstalledVersion];
   return base::SysNSStringToUTF16(version);
 }
 
 }  // namespace keystone_glue