Move the framework and helper application into a versioned directory in support

of unbreaking auto-update.

BUG=14610
TEST= - The following bundles should be gone:
         - Chromium.app/Contents/Frameworks/Chromium Framework.framework
         - Chromium.app/Contents/Resources/Chromium Helper.app
        They should be replaced by:
         - Chromium.app/Contents/Versions/*/Chromium Framework.framework
         - Chromium.app/Contents/Versions/*/Chromium Helper.app
      - The application should continue to function properly and all tests
        should still pass.
      - The signed application should have the inner framework and helper
        application signed, and the outer application signed.  The outer seal
        should permit unknown versions to be present in the Versions directory,
        but should protect the active versioned directory.
      - Auto-updating to an official build with this change should still work.
Review URL: http://codereview.chromium.org/261031

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

1 files changed, 1 insertions, 6 deletions

diff --git a/base/file_version_info_mac.mm b/base/file_version_info_mac.mm
index f177bca..c1395df 100644
--- a/base/file_version_info_mac.mm
+++ b/base/file_version_info_mac.mm
@@ -88,12 +88,7 @@ std::wstring FileVersionInfo::private_build() {
 }
 
 std::wstring FileVersionInfo::file_version() {
-  // CFBundleVersion has limitations that may not be honored by a
-  // proper Chromium version number, so try KSVersion first.
-  std::wstring version = GetStringValue(L"KSVersion");
-  if (version.empty())
-    version = GetStringValue(L"CFBundleVersion");
-  return version;
+  return product_version();
 }
 
 std::wstring FileVersionInfo::original_filename() {