Cleanup VersionInfo after componentization.

chrome/browser/chromeos/login/version_info_updater.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/chromeos/login/version_info_updater.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.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 "base/task_runner_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/settings/cros_settings_names.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 namespace {
 
 const char* const kReportingFlags[] = {
   chromeos::kReportDeviceVersionInfo,
   chromeos::kReportDeviceActivityTimes,
@@ skipping 60 matching lines @@
                                             callback).release());
   }
 }
 
 void VersionInfoUpdater::UpdateVersionLabel() {
   if (version_text_.empty())
     return;
 
   UpdateSerialNumberInfo();
 
-  chrome::VersionInfo version_info;
   std::string label_text = l10n_util::GetStringFUTF8(
       IDS_LOGIN_VERSION_LABEL_FORMAT,
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
-      base::UTF8ToUTF16(version_info.Version()),
-      base::UTF8ToUTF16(version_text_),
-      base::UTF8ToUTF16(serial_number_text_));
+      base::UTF8ToUTF16(version_info::GetVersionNumber()),
+      base::UTF8ToUTF16(version_text_), base::UTF8ToUTF16(serial_number_text_));
 
   // Workaround over incorrect width calculation in old fonts.
   // TODO(glotov): remove the following line when new fonts are used.
   label_text += ' ';
 
   if (delegate_)
     delegate_->OnOSVersionLabelTextUpdated(label_text);
 }
 
 void VersionInfoUpdater::UpdateEnterpriseInfo() {
@@ skipping 30 matching lines @@
 
 void VersionInfoUpdater::OnStoreLoaded(policy::CloudPolicyStore* store) {
   UpdateEnterpriseInfo();
 }
 
 void VersionInfoUpdater::OnStoreError(policy::CloudPolicyStore* store) {
   UpdateEnterpriseInfo();
 }
 
 }  // namespace chromeos