Componentize VersionInfo.

chrome/common/chrome_version_info.cc

Index: chrome/common/chrome_version_info.cc
diff --git a/chrome/common/chrome_version_info.cc b/chrome/common/chrome_version_info.cc
index 996da1bca68f37768537dedbcdb67c4e18a7411e..985e74e0f462557487701900b830ff7fcfd75484 100644
--- a/chrome/common/chrome_version_info.cc
+++ b/chrome/common/chrome_version_info.cc
@@ -4,116 +4,64 @@
 
 #include "chrome/common/chrome_version_info.h"
 
-#include "base/basictypes.h"
 #include "base/profiler/scoped_tracker.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
-#include "chrome/common/chrome_version_info_values.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chrome {
 
-std::string VersionInfo::ProductNameAndVersionForUserAgent() const {
-  return "Chrome/" + Version();
-}
-
 VersionInfo::VersionInfo() {
 }
 
 VersionInfo::~VersionInfo() {
 }
 
-std::string VersionInfo::Name() const {
-  return PRODUCT_NAME;
+// static
+std::string VersionInfo::ProductNameAndVersionForUserAgent() {
+  return version_info::GetProductNameAndVersionForUserAgent();
 }
 
-std::string VersionInfo::Version() const {
-  return PRODUCT_VERSION;
+// static
+std::string VersionInfo::Name() {
+  return version_info::GetProductName();
 }
 
-std::string VersionInfo::LastChange() const {
-  return LAST_CHANGE;
+// static
+std::string VersionInfo::Version() {
+  return version_info::GetVersionNumber();
 }
 
-bool VersionInfo::IsOfficialBuild() const {
-  return IS_OFFICIAL_BUILD;
+// static
+std::string VersionInfo::LastChange() {
+  return version_info::GetLastChange();
 }
 
-std::string VersionInfo::CreateVersionString() const {
-  // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
-  // fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422460 VersionInfo::CreateVersionString"));
-
-  std::string current_version;
-  current_version += Version();
-#if !defined(GOOGLE_CHROME_BUILD)
-  current_version += " (";
-  current_version += l10n_util::GetStringUTF8(IDS_ABOUT_VERSION_UNOFFICIAL);
-  current_version += " ";
-  current_version += LastChange();
-  current_version += " ";
-  current_version += OSType();
-  current_version += ")";
-#endif
-  std::string modifier = GetVersionStringModifier();
-  if (!modifier.empty())
-    current_version += " " + modifier;
-  return current_version;
+// static
+bool VersionInfo::IsOfficialBuild() {
+  return version_info::IsOfficialBuild();
 }
 
-std::string VersionInfo::OSType() const {
-#if defined(OS_WIN)
-  return "Windows";
-#elif defined(OS_IOS)
-  return "iOS";
-#elif defined(OS_MACOSX)
-  return "Mac OS X";
-#elif defined(OS_CHROMEOS)
-  #if defined(GOOGLE_CHROME_BUILD)
-    return "Chrome OS";
-  #else
-    return "Chromium OS";
-  #endif
-#elif defined(OS_ANDROID)
-  return "Android";
-#elif defined(OS_LINUX)
-  return "Linux";
-#elif defined(OS_FREEBSD)
-  return "FreeBSD";
-#elif defined(OS_OPENBSD)
-  return "OpenBSD";
-#elif defined(OS_SOLARIS)
-  return "Solaris";
-#else
-  return "Unknown";
-#endif
+// static
+std::string VersionInfo::OSType() {
+  return version_info::GetOSType();
 }
 
 // static
 std::string VersionInfo::GetChannelString() {
-  switch (GetChannel()) {
-    case chrome::VersionInfo::CHANNEL_STABLE:
-      return "stable";
-      break;
-    case chrome::VersionInfo::CHANNEL_BETA:
-      return "beta";
-      break;
-    case chrome::VersionInfo::CHANNEL_DEV:
-      return "dev";
-      break;
-    case chrome::VersionInfo::CHANNEL_CANARY:
-      return "canary";
-      break;
-    case chrome::VersionInfo::CHANNEL_UNKNOWN:
-      return "unknown";
-      break;
-  }
-  return std::string();
+  return version_info::GetChannelString(GetChannel());
+}
+
+// static
+std::string VersionInfo::CreateVersionString() {
+  // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
+  // fixed.
+  tracked_objects::ScopedTracker tracking_profile(
+      FROM_HERE_WITH_EXPLICIT_FUNCTION(
+          "422460 VersionInfo::CreateVersionString"));
+
+  return version_info::GetVersionStringWithModifier(GetVersionStringModifier());
 }
 
 }  // namespace chrome