Cleanup VersionInfo after componentization.

chrome/common/channel_info_posix.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/common/chrome_version_info.h"
+#include "chrome/common/channel_info.h"
 
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
+#include "components/version_info/version_info.h"
 
 namespace chrome {
 
 namespace {
 
 // Helper function to return both the channel enum and modifier string.
 // Implements both together to prevent their behavior from diverging, which has
 // happened multiple times in the past.
 version_info::Channel GetChannelImpl(std::string* modifier_out) {
   version_info::Channel channel = version_info::Channel::UNKNOWN;
@@ skipping 20 matching lines @@
 #endif
 
   if (modifier_out)
     modifier_out->swap(modifier);
 
   return channel;
 }
 
 }  // namespace
 
-// static
-std::string VersionInfo::GetVersionStringModifier() {
+std::string GetChannelString() {
   std::string modifier;
   GetChannelImpl(&modifier);
   return modifier;
 }
 
-// static
-version_info::Channel VersionInfo::GetChannel() {
-  return GetChannelImpl(NULL);
+version_info::Channel GetChannel() {
+  return GetChannelImpl(nullptr);
 }
 
 }  // namespace chrome