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

chrome/common/mac/app_mode_chrome_locator.h

Index: chrome/common/mac/app_mode_chrome_locator.h
diff --git a/chrome/common/mac/app_mode_chrome_locator.h b/chrome/common/mac/app_mode_chrome_locator.h
index b608e9c5a95d7367b9b78b46e647168b7a9a7549..5b95ee7f6e4a182184fd79c7249e105eedf32440 100644
--- a/chrome/common/mac/app_mode_chrome_locator.h
+++ b/chrome/common/mac/app_mode_chrome_locator.h
@@ -21,16 +21,18 @@ namespace app_mode {
 // Returns true if the bundle was found, false otherwise.
 bool FindBundleById(NSString* bundle_id, base::FilePath* out_bundle);
 
-// Given the path to the Chrome bundle, read the following information:
+// Given the path to the Chrome bundle, and an optional framework version, read
+// the following information:
 // |executable_path| - Path to the Chrome executable.
-// |raw_version_str| - Chrome version.
 // |version_path| - |chrome_bundle|/Contents/Versions/|raw_version_str|/
 // |framework_shlib_path| - Path to the chrome framework's shared library (not
 //                          the framework directory).
+// If |version_str| is not given, this will read the current Chrome version from
+// the bundle's plist.
 // Returns true if all information read succesfuly, false otherwise.
 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);