[Mac] Make app shims load the same framework version as the running Chrome process.

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/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/common/chrome_constants.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);
   return true;
 }
 
 bool GetChromeBundleInfo(const base::FilePath& chrome_bundle,
+                         const std::string& version_str,
                          base::FilePath* executable_path,
-                         base::string16* raw_version_str,
                          base::FilePath* version_path,
                          base::FilePath* framework_shlib_path) {
   using base::mac::ObjCCast;
 
   NSString* cr_bundle_path = base::mac::FilePathToNSString(chrome_bundle);
   NSBundle* cr_bundle = [NSBundle bundleWithPath:cr_bundle_path];
 
   if (!cr_bundle)
     return false;
 
-  // Read raw version string.
-  NSString* cr_version =
-       ObjCCast<NSString>(
-          [cr_bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]);
-  if (!cr_version)
-    return false;
+  // Read version string.
+  NSString* cr_version;
+  if (version_str.empty()) {
+    cr_version = ObjCCast<NSString>(
+        [cr_bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]);
+    if (!cr_version)
+      return false;
+  } else {
+    cr_version = base::SysUTF8ToNSString(version_str);
+  }
 
   // Get versioned directory.
   NSArray* cr_versioned_path_components =
       [NSArray arrayWithObjects:cr_bundle_path,
                                 @"Contents",
                                 @"Versions",
                                 cr_version,

[tapted, 2014/08/26 07:12:48]

Do we need to handle the case that this path doesn't exist? Like.. Chrome
crashes, leaves this version goo in place. User rolls back to stable channel
which never updates the version. etc.

Perhaps the caller can just try calling again with an empty version_str for the
case GetChromeBundleInfo returns false

[jackhou1, 2014/08/26 08:15:14]

I think it's reasonable to handle it here. If the version passed in does not
correspond to a valid directory, then default to the latest version.

[tapted, 2014/08/26 08:43:47]

lg

                                 nil];
   NSString* cr_versioned_path =
     [NSString pathWithComponents:cr_versioned_path_components];
 
   // Get the framework path.
   NSString* cr_bundle_exe =
       ObjCCast<NSString>(
           [cr_bundle objectForInfoDictionaryKey:@"CFBundleExecutable"]);
   // Essentially we want chrome::kFrameworkName which looks like
   // "$PRODUCT_STRING Framework.framework". The library itself is at
@@ skipping 20 matching lines @@
   // A few more sanity checks.
   BOOL is_directory;
   BOOL exists = [[NSFileManager defaultManager]
                     fileExistsAtPath:cr_framework_shlib_path
                          isDirectory:&is_directory];
   if (!exists || is_directory)
     return false;
 
   // Everything OK, copy output parameters.
   *executable_path = base::mac::NSStringToFilePath([cr_bundle executablePath]);
-  *raw_version_str = base::SysNSStringToUTF16(cr_version);
   *version_path = base::mac::NSStringToFilePath(cr_versioned_path);
   *framework_shlib_path =
       base::mac::NSStringToFilePath(cr_framework_shlib_path);
   return true;
 }
 
 }  // namespace app_mode