Cleans up our autorelease handling so that we don't create a layered ...

chrome/browser/browser_main_mac.mm

 // Copyright (c) 2008 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.
 
 #include "chrome/browser/browser_main.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "chrome/app/breakpad_mac.h"
 #import "chrome/app/keystone_glue.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/browser_main_win.h"
-#import "chrome/browser/chrome_application_mac.h"
+#import "chrome/browser/chrome_browser_application_mac.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/common/result_codes.h"
 
 namespace Platform {
 
 // Tell Cooca to finish its initalization, which we want to do manually
 // instead of calling NSApplicationMain(). The primary reason is that NSAM()
 // never returns, which would leave all the objects currently on the stack
 // in scoped_ptrs hanging and never cleaned up. We then load the main nib
 // directly. The main event loop is run from common code using the
 // MessageLoop API, which works out ok for us because it's a wrapper around
 // CFRunLoop.
 void WillInitializeMainMessageLoop(const MainFunctionParams& parameters) {
-  // Initialize NSApplication using the custom subclass.  Check whether NSApp
-  // was already initialized using another class, because that would break
-  // some things.
-  [CrApplication sharedApplication];
-  if (![NSApp isKindOfClass:[CrApplication class]]) {
-    LOG(ERROR) << "NSApp should be of type CrApplication, not "
-               << [[NSApp className] UTF8String];
-    DCHECK(false) << "NSApp is of wrong type";
-  }
+  // Initialize NSApplication using the custom subclass.
+  [BrowserCrApplication sharedApplication];
 
   // Before we load the nib, we need to start up the resource bundle so we have
   // the strings avaiable for localization.
   if (!parameters.ui_task) {
     ResourceBundle::InitSharedInstance(std::wstring());
   }
   // Now load the nib.
   [NSBundle loadNibNamed:@"MainMenu" owner:NSApp];
 
   // This is a no-op if the KeystoneRegistration framework is not present.
@@ skipping 30 matching lines @@
 int HandleIconsCommands(const CommandLine& parsed_command_line) {
   return 0;
 }
 
 bool CheckMachineLevelInstall() {
   return false;
 }
 
 void PrepareRestartOnCrashEnviroment(const CommandLine& parsed_command_line) {
 }