Cleanup VersionInfo after componentization.

chrome/browser/diagnostics/recon_diagnostics.cc

Index: chrome/browser/diagnostics/recon_diagnostics.cc
diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc
index a0575db565540afe98eb5c1548d41f917988dfb7..fdce774cde89c8b5f339cc2593c4e8846b06d534 100644
--- a/chrome/browser/diagnostics/recon_diagnostics.cc
+++ b/chrome/browser/diagnostics/recon_diagnostics.cc
@@ -16,10 +16,11 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_version_info.h"
 #include "components/bookmarks/common/bookmark_constants.h"
+#include "components/version_info/version_info.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
@@ -358,14 +359,12 @@ class VersionTest : public DiagnosticsTest {
   VersionTest() : DiagnosticsTest(DIAGNOSTICS_VERSION_TEST) {}
 
   bool ExecuteImpl(DiagnosticsModel::Observer* observer) override {
-    chrome::VersionInfo version_info;
-    std::string current_version = version_info.Version();
+    std::string current_version = version_info::GetVersionNumber();
     if (current_version.empty()) {
       RecordFailure(DIAG_RECON_EMPTY_VERSION, "Empty Version");
       return true;
     }
-    std::string version_modifier =
-        chrome::VersionInfo::GetVersionStringModifier();
+    std::string version_modifier = chrome::GetChannelString();
     if (!version_modifier.empty())
       current_version += " " + version_modifier;
 #if defined(GOOGLE_CHROME_BUILD)