Refactor version-getting info into a chrome::VersionInfo object.

I was trying to replace wstring usage in base::FileVersionInfo, but
that class is rather Windows-specific with strange fields like
"private_build()" where the value and encoding aren't clear.  95%
of the users of FileVersionInfo actually just care about the current
Chrome version, so we can provide a much simpler interface for them.

We still use FileVersionInfo for retrieving information from e.g.
plugin DLLs, but in those cases the usage is clearer.

Review URL: http://codereview.chromium.org/3135028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57725 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 21 insertions, 30 deletions

diff --git a/chrome/browser/dom_ui/about_page_handler.cc b/chrome/browser/dom_ui/about_page_handler.cc
index 6275b7d..750a921 100644
--- a/chrome/browser/dom_ui/about_page_handler.cc
+++ b/chrome/browser/dom_ui/about_page_handler.cc
@@ -9,7 +9,6 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "base/file_version_info.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
@@ -136,21 +135,18 @@ void AboutPageHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
 
   // browser version
 
-  scoped_ptr<FileVersionInfo> version_info(chrome::GetChromeVersionInfo());
-  DCHECK(version_info.get() != NULL);
+  chrome::VersionInfo version_info;
+  DCHECK(version_info.is_valid());
 
-  string16 browser_version = WideToUTF16Hack(version_info->file_version());
-
-  string16 version_modifier = platform_util::GetVersionStringModifier();
-  if (version_modifier.length()) {
-    browser_version += ASCIIToUTF16(" ");
-    browser_version += version_modifier;
-  }
+  std::string browser_version = version_info.Version();
+  std::string version_modifier = platform_util::GetVersionStringModifier();
+  if (!version_modifier.empty())
+    browser_version += " " + version_modifier;
 
 #if !defined(GOOGLE_CHROME_BUILD)
-  browser_version += ASCIIToUTF16(" (");
-  browser_version += WideToUTF16Hack(version_info->last_change());
-  browser_version += ASCIIToUTF16(")");
+  browser_version += " (";
+  browser_version += version_info.LastChange();
+  browser_version += ")";
 #endif
 
   localized_strings->SetString("browser_version", browser_version);
diff --git a/chrome/browser/dom_ui/net_internals_ui.cc b/chrome/browser/dom_ui/net_internals_ui.cc
index 63ad1a2..c10428a 100644
--- a/chrome/browser/dom_ui/net_internals_ui.cc
+++ b/chrome/browser/dom_ui/net_internals_ui.cc
@@ -13,7 +13,6 @@
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/file_version_info.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
@@ -456,25 +455,21 @@ void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady(
   {
     DictionaryValue* dict = new DictionaryValue();
 
-    scoped_ptr<FileVersionInfo> version_info(
-        chrome::GetChromeVersionInfo());
-
-    if (version_info == NULL) {
-      DLOG(ERROR) << "Unable to create FileVersionInfo object";
+    chrome::VersionInfo version_info;
 
+    if (version_info.is_valid()) {
+      DLOG(ERROR) << "Unable to create chrome::VersionInfo";
     } else {
       // We have everything we need to send the right values.
-      dict->SetString("version", WideToUTF16Hack(version_info->file_version()));
-      dict->SetString("cl", WideToUTF16Hack(version_info->last_change()));
-      dict->SetString("version_mod", platform_util::GetVersionStringModifier());
-
-      if (version_info->is_official_build()) {
-        dict->SetString("official",
-            l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_OFFICIAL));
-      } else {
-        dict->SetString("official",
-            l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_UNOFFICIAL));
-      }
+      dict->SetString("version", version_info.Version());
+      dict->SetString("cl", version_info.LastChange());
+      dict->SetString("version_mod",
+                      platform_util::GetVersionStringModifier());
+      dict->SetString("official",
+          l10n_util::GetStringUTF16(
+              version_info.IsOfficialBuild() ?
+                IDS_ABOUT_VERSION_OFFICIAL
+              : IDS_ABOUT_VERSION_UNOFFICIAL));
 
       dict->SetString("command_line",
           CommandLine::ForCurrentProcess()->command_line_string());