Cleanup VersionInfo after componentization.

chrome/browser/diagnostics/recon_diagnostics.cc

 // Copyright (c) 2012 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/diagnostics/recon_diagnostics.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #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"
 #include "chrome/browser/enumerate_modules_model_win.h"
 #include "chrome/installer/util/install_util.h"
 #endif
 
 // Reconnaissance diagnostics. These are the first and most critical
 // diagnostic tests. Here we check for the existence of critical files.
 // TODO(cpu): Define if it makes sense to localize strings.
@@ skipping 318 matching lines @@
   TestPathInfo path_info_;
   DISALLOW_COPY_AND_ASSIGN(PathTest);
 };
 
 // Check the version of Chrome.
 class VersionTest : public DiagnosticsTest {
  public:
   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)
     current_version += " GCB";
 #endif  // defined(GOOGLE_CHROME_BUILD)
     RecordSuccess(current_version);
     return true;
   }
 
  private:
@@ skipping 49 matching lines @@
 
 DiagnosticsTest* MakeResourcesFileTest() {
   return new PathTest(kPathsToTest[2]);
 }
 
 DiagnosticsTest* MakeUserDirTest() { return new PathTest(kPathsToTest[3]); }
 
 DiagnosticsTest* MakeVersionTest() { return new VersionTest(); }
 
 }  // namespace diagnostics