Cleanup VersionInfo after componentization.
Remove wrapper methods around version_info free functions and directly
call them instead and fixes #include if only the component is required.
Convert VersionInfo methods to free functions (as they do not have
state) and rename GetVersionStringModifier to GetChannelString.
Rename chrome/common/{chrome_version_info => channel_info}*.
Forward-declare version_info::Channel in channel_info.h and add the
missing #include of components/version_info/version_info.h were needed.
BUG=514562
Review URL: https://codereview.chromium.org/1269773002
Cr-Commit-Position: refs/heads/master@{#341568}
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 3c646b3..17fe4ef 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -42,9 +42,10 @@
#include "base/threading/thread_restrictions.h"
#include "build/build_config.h"
#include "chrome/browser/shell_integration.h"
+#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_constants.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"
#include "grit/chrome_unscaled_resources.h"
#include "ui/base/resource/resource_bundle.h"
@@ -586,8 +587,7 @@
std::string GetDesktopName(base::Environment* env) {
#if defined(GOOGLE_CHROME_BUILD)
- version_info::Channel product_channel(
- chrome::VersionInfo::GetChannel());
+ version_info::Channel product_channel(chrome::GetChannel());
switch (product_channel) {
case version_info::Channel::DEV:
return "google-chrome-unstable.desktop";
