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/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc
index d87eea2..89ae9c1 100644
--- a/chrome/browser/memory_details_mac.cc
+++ b/chrome/browser/memory_details_mac.cc
@@ -18,9 +18,9 @@
#include "base/threading/thread.h"
#include "chrome/browser/process_info_snapshot.h"
#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_version_info.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/chromium_strings.h"
+#include "components/version_info/version_info.h"
#include "content/public/browser/browser_child_process_host.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/process_type.h"
@@ -63,9 +63,8 @@
else
info.process_type = content::PROCESS_TYPE_UNKNOWN;
- chrome::VersionInfo version_info;
- info.product_name = base::ASCIIToUTF16(version_info.Name());
- info.version = base::ASCIIToUTF16(version_info.Version());
+ info.product_name = base::ASCIIToUTF16(version_info::GetProductName());
+ info.version = base::ASCIIToUTF16(version_info::GetVersionNumber());
// Check if this is one of the child processes whose data was already
// collected and exists in |child_data|.
