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

chrome/browser/platform_util_mac.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.
 
 #include "chrome/browser/platform_util.h"
 
 #include <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #include <CoreServices/CoreServices.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/mac/scoped_aedesc.h"
 #include "base/sys_string_conversions.h"
+#include "chrome/common/chrome_version_info.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace platform_util {
 
 void ShowItemInFolder(const FilePath& full_path) {
   DCHECK_EQ([NSThread currentThread], [NSThread mainThread]);
   NSString* path_string = base::SysUTF8ToNSString(full_path.value());
@@ skipping 148 matching lines @@
 
   [alert addButtonWithTitle:
       l10n_util::GetNSString(IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL)];
   [alert addButtonWithTitle:
       l10n_util::GetNSString(IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL)];
 
   NSInteger result = [alert runModal];
   return result == NSAlertFirstButtonReturn;
 }
 
-std::string GetVersionStringModifier() {
-#if defined(GOOGLE_CHROME_BUILD)
-  // Use the main application bundle and not the framework bundle. Keystone
-  // keys don't live in the framework.
-  NSBundle* bundle = [NSBundle mainBundle];
-  NSString* channel = [bundle objectForInfoDictionaryKey:@"KSChannelID"];
-
-  // Only ever return "", "unknown", "beta", "dev", or "canary" in a branded
-  // build.
-  if (![bundle objectForInfoDictionaryKey:@"KSProductID"]) {
-    // This build is not Keystone-enabled, it can't have a channel.
-    channel = @"unknown";
-  } else if (!channel) {
-    // For the stable channel, KSChannelID is not set.
-    channel = @"";
-  } else if ([channel isEqual:@"beta"] ||
-             [channel isEqual:@"dev"] ||
-             [channel isEqual:@"canary"]) {
-    // do nothing.
-  } else {
-    channel = @"unknown";
-  }
-
-  return base::SysNSStringToUTF8(channel);
-#else
-  return std::string();
-#endif
-}
-
-Channel GetChannel() {
-#if defined(GOOGLE_CHROME_BUILD)
-  std::string channel = GetVersionStringModifier();
-  if (channel.empty()) {
-    return CHANNEL_STABLE;
-  } else if (channel == "beta") {
-    return CHANNEL_BETA;
-  } else if (channel == "dev") {
-    return CHANNEL_DEV;
-  } else if (channel == "canary") {
-    return CHANNEL_CANARY;
-  }
-#endif
-
-  return CHANNEL_UNKNOWN;
-}
-
 bool CanSetAsDefaultBrowser() {
-  return GetChannel() != CHANNEL_CANARY;
+  return chrome::VersionInfo::GetChannel() !=
+      chrome::VersionInfo::CHANNEL_CANARY;
 }
 
 bool CanSetAsDefaultProtocolClient(const std::string& protocol) {
   return CanSetAsDefaultBrowser();
 }
 
 }  // namespace platform_util