Cleanup VersionInfo after componentization.

chrome/browser/mac/keystone_glue.mm

 // 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.
 
 #import "chrome/browser/mac/keystone_glue.h"
 
 #include <sys/mount.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/mac/authorization_util.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
 #import "chrome/browser/mac/keystone_registration.h"
 #include "chrome/browser/mac/obsolete_system.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/version_info/version_info.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
 // updates to Chrome.)
 
@@ skipping 283 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.
-    version_info::Channel channel = chrome::VersionInfo::GetChannel();
+    version_info::Channel channel = chrome::GetChannel();
 
     if (channel == version_info::Channel::DEV ||
         channel == version_info::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
@@ skipping 791 matching lines @@
   return [KeystoneGlue defaultKeystoneGlue] != nil;
 }
 
 base::string16 CurrentlyInstalledVersion() {
   KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue];
   NSString* version = [keystoneGlue currentlyInstalledVersion];
   return base::SysNSStringToUTF16(version);
 }
 
 }  // namespace keystone_glue