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

chrome/app/app_mode_loader_mac.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.
 
 // On Mac, shortcuts can't have command-line arguments. Instead, produce small
 // app bundles which locate the Chromium framework and load it, passing the
 // appropriate data. This is the code for such an app bundle. It should be kept
 // minimal and do as little work as possible (with as much work done on
 // framework side as possible).
 
 #include <dlfcn.h>
 
+#import <Cocoa/Cocoa.h>
 #include <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/launch_services_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/process/launch.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #import "chrome/common/mac/app_mode_chrome_locator.h"
 #include "chrome/common/mac/app_mode_common.h"
 
 namespace {
 
 typedef int (*StartFun)(const app_mode::ChromeAppModeInfo*);
 
 int LoadFrameworkAndStart(app_mode::ChromeAppModeInfo* info) {
   using base::SysNSStringToUTF8;
@@ skipping 26 matching lines @@
 
   if (!found_bundle) {
     // If no such bundle path exists, try to search by bundle ID.
     if (!app_mode::FindBundleById(cr_bundle_id, &cr_bundle_path)) {
       // TODO(jeremy): Display UI to allow user to manually locate the Chrome
       // bundle.
       LOG(FATAL) << "Failed to locate bundle by identifier";
     }
   }
 
-  // ** 2: Read information from the Chrome bundle.
+  // ** 2: Read the running Chrome version.
+  // The user_data_dir for shims actually contains the app_data_path.
+  // I.e. <user_data_dir>/<profile_dir>/Web Applications/_crx_extensionid/
+  base::FilePath app_data_dir = base::mac::NSStringToFilePath([app_bundle
+      objectForInfoDictionaryKey:app_mode::kCrAppModeUserDataDirKey]);
+  base::FilePath user_data_dir = app_data_dir.DirName().DirName().DirName();
+  CHECK(!user_data_dir.empty());
+
+  // If the version file does not exist, |cr_version_str| will be empty and
+  // app_mode::GetChromeBundleInfo will default to the latest version.
+  base::FilePath cr_version_str;
+  base::ReadSymbolicLink(
+      user_data_dir.Append(app_mode::kRunningChromeVersionSymlinkName),
+      &cr_version_str);
+
+  // If the version file does exist, it may have been left by a crashed Chrome
+  // process. Ensure the process is still running.
+  if (!cr_version_str.empty()) {
+    NSArray* existing_chrome = [NSRunningApplication
+        runningApplicationsWithBundleIdentifier:cr_bundle_id];
+    if ([existing_chrome count] == 0)
+      cr_version_str.clear();
+  }

[tapted, 2014/08/27 03:51:16]

  // TODO(): Also check that the running Chrome has a matching user_data_dir.

[jackhou1, 2014/08/28 01:04:56]

chrome_main_app_mode_mac checks for a running Chrome the same way. If it's not
using the same user_data_dir as this shim, the shim will just connect to a
non-existent (or dead) IPC socket, so it won't cause any problems.

But this does move app shims closer to supporting multiple user data dirs. Filed
a bug: http://crbug.com/Issue 407973

+
+  // ** 3: Read information from the Chrome bundle.
   base::FilePath executable_path;
-  base::string16 raw_version_str;
   base::FilePath version_path;
   base::FilePath framework_shlib_path;
   if (!app_mode::GetChromeBundleInfo(cr_bundle_path,
+                                     cr_version_str.value(),
                                      &executable_path,
-                                     &raw_version_str,
                                      &version_path,
                                      &framework_shlib_path)) {
     LOG(FATAL) << "Couldn't ready Chrome bundle info";
   }
   base::FilePath app_mode_bundle_path =
       base::mac::NSStringToFilePath([app_bundle bundlePath]);
 
-  // ** 3: Fill in ChromeAppModeInfo.
+  // ** 4: Fill in ChromeAppModeInfo.
   info->chrome_outer_bundle_path = cr_bundle_path;
   info->chrome_versioned_path = version_path;
   info->app_mode_bundle_path = app_mode_bundle_path;
 
   // Read information about the this app shortcut from the Info.plist.
   // Don't check for null-ness on optional items.
   NSDictionary* info_plist = [app_bundle infoDictionary];
   CHECK(info_plist) << "couldn't get loader Info.plist";
 
   info->app_mode_id = SysNSStringToUTF8(
       [info_plist objectForKey:app_mode::kCrAppModeShortcutIDKey]);
   CHECK(info->app_mode_id.size()) << "couldn't get app shortcut ID";
 
   info->app_mode_name = SysNSStringToUTF16(
       [info_plist objectForKey:app_mode::kCrAppModeShortcutNameKey]);
 
   info->app_mode_url = SysNSStringToUTF8(
       [info_plist objectForKey:app_mode::kCrAppModeShortcutURLKey]);
 
   info->user_data_dir = base::mac::NSStringToFilePath(
       [info_plist objectForKey:app_mode::kCrAppModeUserDataDirKey]);
 
   info->profile_dir = base::mac::NSStringToFilePath(
       [info_plist objectForKey:app_mode::kCrAppModeProfileDirKey]);
 
-  // Open the framework.
+  // ** 5: Open the framework.
   StartFun ChromeAppModeStart = NULL;
   void* cr_dylib = dlopen(framework_shlib_path.value().c_str(), RTLD_LAZY);
   if (cr_dylib) {
     // Find the entry point.
     ChromeAppModeStart = (StartFun)dlsym(cr_dylib, "ChromeAppModeStart");
     if (!ChromeAppModeStart)
       LOG(ERROR) << "Couldn't get entry point: " << dlerror();
   } else {
     LOG(ERROR) << "Couldn't load framework: " << dlerror();
   }
@@ skipping 50 matching lines @@
   // Hard coded info parameters.
   info.major_version = app_mode::kCurrentChromeAppModeInfoMajorVersion;
   info.minor_version = app_mode::kCurrentChromeAppModeInfoMinorVersion;
   info.argc = argc;
   info.argv = argv;
 
   // Exit instead of returning to avoid the the removal of |main()| from stack
   // backtraces under tail call optimization.
   exit(LoadFrameworkAndStart(&info));
 }