[Mac] Use the app's version as the app shim bundle version.

chrome/common/mac/app_mode_chrome_locator.mm

 // 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.
 
 #import "chrome/common/mac/app_mode_chrome_locator.h"
 
 #import <AppKit/AppKit.h>
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/mac/app_mode_common.h"
 
 namespace app_mode {
 
 bool FindBundleById(NSString* bundle_id, base::FilePath* out_bundle) {
   NSWorkspace* ws = [NSWorkspace sharedWorkspace];
   NSString *bundlePath = [ws absolutePathForAppBundleWithIdentifier:bundle_id];
   if (!bundlePath)
     return false;
 
   *out_bundle = base::mac::NSStringToFilePath(bundlePath);
@@ skipping 22 matching lines @@
   NSString* cr_versioned_path;
   if (!version_str.empty()) {
     cr_versioned_path =
         GetVersionedPath(cr_bundle_path, base::SysUTF8ToNSString(version_str));
   }
 
   if (version_str.empty() ||
       !base::PathExists(base::mac::NSStringToFilePath(cr_versioned_path))) {
     // Read version string.
     NSString* cr_version = ObjCCast<NSString>(
-        [cr_bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]);
+        [cr_bundle objectForInfoDictionaryKey:app_mode::kCrBundleVersionKey]);
+    if (!cr_version) {
+      // Older bundles have the Chrome version in the following key.
+      cr_version = ObjCCast<NSString>([cr_bundle
+          objectForInfoDictionaryKey:app_mode::kCFBundleShortVersionStringKey]);
+    }
     if (!cr_version)
       return false;
 
     cr_versioned_path = GetVersionedPath(cr_bundle_path, cr_version);
   }
 
   // Get the framework path.
   NSString* cr_bundle_exe =
       ObjCCast<NSString>(
           [cr_bundle objectForInfoDictionaryKey:@"CFBundleExecutable"]);
@@ skipping 29 matching lines @@
 
   // Everything OK, copy output parameters.
   *executable_path = base::mac::NSStringToFilePath([cr_bundle executablePath]);
   *version_path = base::mac::NSStringToFilePath(cr_versioned_path);
   *framework_shlib_path =
       base::mac::NSStringToFilePath(cr_framework_shlib_path);
   return true;
 }
 
 }  // namespace app_mode