Cleanup VersionInfo after componentization.

chrome/browser/sxs_linux.cc

 // Copyright 2013 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/sxs_linux.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
 
 const char kChannelsFileName[] = "Channels";
 
 std::string GetChannelMarkForThisExecutable() {
   std::string product_channel_name;
-  version_info::Channel product_channel(
-      chrome::VersionInfo::GetChannel());
+  version_info::Channel product_channel(chrome::GetChannel());
   switch (product_channel) {
     case version_info::Channel::UNKNOWN: {
       // Add the channel mark even for Chromium builds (which do not have
       // channel) to better handle possibility of users using Chromium builds
       // with their Google Chrome profiles. Include version string modifier
       // as additional piece of information for debugging (it can't make
       // a meaningful difference for the code since unknown does not match any
       // real channel name).
-      std::string version_string_modifier(
-          chrome::VersionInfo::GetVersionStringModifier());
+      std::string version_string_modifier(chrome::GetChannelString());
       product_channel_name = "unknown (" + version_string_modifier + ")";
       break;
     }
     case version_info::Channel::CANARY:
       product_channel_name = "canary";
       break;
     case version_info::Channel::DEV:
       product_channel_name = "dev";
       break;
     case version_info::Channel::BETA:
@@ skipping 99 matching lines @@
   if (!base::Move(source_path, target_path)) {
     LOG(ERROR) << "Failed to rename '" << source_path.value()
                << "' to '" << target_path.value() << "'";
     return chrome::RESULT_CODE_SXS_MIGRATION_FAILED;
   }
 
   return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 }  // namespace sxs_linux