Mac: Generate App Mode Loader bundle + cleanup

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).
 
@@ skipping 21 matching lines @@
   using base::mac::NSToCFCast;
 
   base::mac::ScopedNSAutoreleasePool scoped_pool;
 
   // Get the current main bundle, i.e., that of the app loader that's running.
   NSBundle* app_bundle = [NSBundle mainBundle];
   CHECK(app_bundle) << "couldn't get loader bundle";
 
   // ** 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.
   FilePath cr_bundle_path;
   NSString* cr_bundle_path_ns =
       [CFToNSCast(CFCastStrict<CFStringRef>(CFPreferencesCopyAppValue(
           NSToCFCast(app_mode::kLastRunAppBundlePathPrefsKey),
           NSToCFCast(cr_bundle_id)))) autorelease];
   cr_bundle_path = base::mac::NSStringToFilePath(cr_bundle_path_ns);
   bool found_bundle =
@@ skipping 11 matching lines @@
   // ** 2: Read information from the Chrome bundle.
   string16 raw_version_str;
   FilePath version_path;
   FilePath framework_shlib_path;
   if (!app_mode::GetChromeBundleInfo(cr_bundle_path, &raw_version_str,
           &version_path, &framework_shlib_path)) {
     LOG(FATAL) << "Couldn't ready Chrome bundle 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]);
 
   // 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_short_name = SysNSStringToUTF16(
       [info_plist objectForKey:app_mode::kCrAppModeShortcutShortNameKey]);
 
   info->app_mode_name = SysNSStringToUTF16(
       [info_plist objectForKey:app_mode::kCrAppModeShortcutNameKey]);
 
   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]);
 
   info->extension_path = base::mac::NSStringToFilePath(
       [info_plist objectForKey:app_mode::kCrAppModeExtensionPathKey]);
 
   // Open the framework.
   *cr_dylib = dlopen(framework_shlib_path.value().c_str(), RTLD_LAZY);
   CHECK(cr_dylib) << "couldn't load framework: " << dlerror();
@@ skipping 17 matching lines @@
 
   typedef int (*StartFun)(const app_mode::ChromeAppModeInfo*);
   StartFun ChromeAppModeStart = (StartFun)dlsym(cr_dylib, "ChromeAppModeStart");
   CHECK(ChromeAppModeStart) << "couldn't get entry point";
 
   // Exit instead of returning to avoid the the removal of |main()| from stack
   // backtraces under tail call optimization.
   int rv = ChromeAppModeStart(&info);
   exit(rv);
 }