Fixed file_version_info so that it finds Mac values correctly.

chrome/common/chrome_version_info.cc

 // Copyright (c) 2010 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/common/chrome_version_info.h"
 
 #include "base/basictypes.h"
 #include "base/file_version_info.h"
 #include "base/string_util.h"
 #include "base/thread_restrictions.h"
 #include "build/build_config.h"
+#include "chrome/common/chrome_constants.h"
 
 namespace chrome {
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
-// On Windows and Mac, we get the Chrome version info by querying
-// FileVersionInfo for the current module.
+// On Windows and Mac we get the Chrome version info by querying FileVersionInfo
+// for the current module if it is available, otherwise we fall back to coded
+// values.
 
 VersionInfo::VersionInfo() {
   // The current module is already loaded in memory, so this will be cheap.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   version_info_.reset(FileVersionInfo::CreateFileVersionInfoForCurrentModule());
 }
 
 VersionInfo::~VersionInfo() {
 }
 
-bool VersionInfo::is_valid() const {
-  return version_info_.get() != NULL;
-}
-
 std::string VersionInfo::Name() const {
-  if (!is_valid())
-    return std::string();
-  return WideToASCII(version_info_->product_name());
+  std::wstring name =
+      version_info_.get() ? version_info_->product_name()
+                          : kBrowserProcessExecutableName;
+  return WideToASCII(name);
 }
 
 std::string VersionInfo::Version() const {
-  if (!is_valid())
-    return std::string();
+  if (!version_info_.get())
+    return kChromeVersion;

[Erik does not do reviews, 2010/12/14 19:16:32]

I think you've lost me here.  What are we trying to accomplish with this change
again?  This seems like it's just misleading.  Why can't we fix the underlying
problem that's leading to bogus versions in bundles?

   return WideToASCII(version_info_->product_version());
 }
 
 std::string VersionInfo::LastChange() const {
-  if (!is_valid())
-    return std::string();
+  if (!version_info_.get())
+    return "0";
   return WideToASCII(version_info_->last_change());
 }
 
 bool VersionInfo::IsOfficialBuild() const {
-  if (!is_valid())
+  if (!version_info_.get())
     return false;
   return version_info_->is_official_build();
 }
 
 #elif defined(OS_POSIX)
 // We get chrome version information from chrome_version_info_posix.h,
 // a generated header.
 
 #include "chrome/common/chrome_version_info_posix.h"
 
 VersionInfo::VersionInfo() {
 }
 
 VersionInfo::~VersionInfo() {
 }
 
-bool VersionInfo::is_valid() const {
-  return true;
-}
-
 std::string VersionInfo::Name() const {
   return PRODUCT_NAME;
 }
 
 std::string VersionInfo::Version() const {
   return PRODUCT_VERSION;
 }
 
 std::string VersionInfo::LastChange() const {
   return LAST_CHANGE;
 }
 
 bool VersionInfo::IsOfficialBuild() const {
   return OFFICIAL_BUILD;
 }
 
 #endif
 
 }  // namespace chrome