Mac: Generate App Mode Loader bundle + cleanup

chrome/app/app_mode_loader_mac.mm

Index: chrome/app/app_mode_loader_mac.mm
diff --git a/chrome/app/app_mode_loader_mac.mm b/chrome/app/app_mode_loader_mac.mm
index 3d10145a5de1dc1e0dd0a979aa3e3b6e11f513bb..a691b15e192e76695ab3d387dccdd90c21e3b76e 100644
--- a/chrome/app/app_mode_loader_mac.mm
+++ b/chrome/app/app_mode_loader_mac.mm
@@ -39,8 +39,8 @@ void LoadFramework(void** cr_dylib, app_mode::ChromeAppModeInfo* info) {
 
   // ** 1: Get path to outer Chrome bundle.
   // Get the bundle ID of the browser that created this app bundle.
-  NSString* cr_bundle_id = [app_bundle
-      objectForInfoDictionaryKey:app_mode::kBrowserBundleIDKey];
+  NSString* cr_bundle_id = base::mac::ObjCCast<NSString>(
+      [app_bundle objectForInfoDictionaryKey:app_mode::kBrowserBundleIDKey]);
   CHECK(cr_bundle_id) << "couldn't get browser bundle ID";
 
   // First check if Chrome exists at the last known location.
@@ -72,6 +72,7 @@ void LoadFramework(void** cr_dylib, app_mode::ChromeAppModeInfo* info) {
   }
 
   // ** 3: Fill in ChromeAppModeInfo.
+  info->chrome_outer_bundle_path = cr_bundle_path;
   info->chrome_versioned_path = version_path;
   info->app_mode_bundle_path =
       base::mac::NSStringToFilePath([app_bundle bundlePath]);
@@ -93,7 +94,6 @@ void LoadFramework(void** cr_dylib, app_mode::ChromeAppModeInfo* info) {
 
   info->app_mode_url = SysNSStringToUTF8(
       [info_plist objectForKey:app_mode::kCrAppModeShortcutURLKey]);
-  CHECK(info->app_mode_url.size()) << "couldn't get app shortcut URL";
 
   info->user_data_dir = base::mac::NSStringToFilePath(
       [info_plist objectForKey:app_mode::kCrAppModeUserDataDirKey]);