Cleanup VersionInfo after componentization.

chrome/browser/sync/about_sync_util.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/sync/about_sync_util.h"
 
 #include <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/channel_info.h"
 #include "components/signin/core/browser/signin_manager.h"
+#include "components/version_info/version_info.h"
 #include "sync/api/time.h"
 #include "sync/internal_api/public/util/sync_string_conversions.h"
 #include "sync/protocol/proto_enum_conversions.h"
 
 using base::DictionaryValue;
 using base::ListValue;
 
 const char kIdentityTitle[] = "Identity";
 const char kDetailsKey[] = "details";
 
@@ skipping 110 matching lines @@
 }
 
 // Returns a string describing the chrome version environment. Version format:
 // <Build Info> <OS> <Version number> (<Last change>)<channel or "-devel">
 // If version information is unavailable, returns "invalid."
 // TODO(zea): this approximately matches MakeUserAgentForSyncApi in
 // sync_backend_host.cc. Unify the two if possible.
 std::string GetVersionString() {
   // Build a version string that matches MakeUserAgentForSyncApi with the
   // addition of channel info and proper OS names.
-  chrome::VersionInfo chrome_version;
-  // GetVersionStringModifier returns empty string for stable channel or
+  // chrome::GetChannelString() returns empty string for stable channel or
   // unofficial builds, the channel string otherwise. We want to have "-devel"
   // for unofficial builds only.
-  std::string version_modifier =
-      chrome::VersionInfo::GetVersionStringModifier();
+  std::string version_modifier = chrome::GetChannelString();
   if (version_modifier.empty()) {
-    if (chrome::VersionInfo::GetChannel() !=
-            version_info::Channel::STABLE) {
+    if (chrome::GetChannel() != version_info::Channel::STABLE) {
       version_modifier = "-devel";
     }
   } else {
     version_modifier = " " + version_modifier;
   }
-  return chrome_version.Name() + " " + chrome_version.OSType() + " " +
-      chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +
-      version_modifier;
+  return version_info::GetProductName() + " " + version_info::GetOSType() +
+         " " + version_info::GetVersionNumber() + " (" +
+         version_info::GetLastChange() + ")" + version_modifier;
 }
 
 std::string GetTimeStr(base::Time time, const std::string& default_msg) {
   std::string time_str;
   if (time.is_null())
     time_str = default_msg;
   else
     time_str = syncer::GetTimeDebugString(time);
   return time_str;
 }
@@ skipping 312 matching lines @@
     about_info->SetString("unrecoverable_error_message",
                        unrecoverable_error_message);
   }
 
   about_info->Set("type_status", service->GetTypeStatusMap());
 
   return about_info.Pass();
 }
 
 }  // namespace sync_ui_util