Moved a whole pile of unittests over to CocoaTest.

chrome/browser/app_controller_mac.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/command_line.h"
 #include "base/mac_util.h"
 #include "base/message_loop.h"
@@ skipping 148 matching lines @@
   BrowserList::CloseAllBrowsers(true);
 
   // On Windows, this is done in Browser::OnWindowClosing, but that's not
   // appropriate on Mac since we don't shut down when we reach zero windows.
   browser_shutdown::OnShutdownStarting(browser_shutdown::BROWSER_EXIT);
 
   // Release the reference to the browser process. Once all the browsers get
   // dealloc'd, it will stop the RunLoop and fall back into main().
   g_browser_process->ReleaseModule();
 
+  // Close these off if they have open windows.
+  [prefsController_ close];
+  [aboutController_ close];
+
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 - (void)didEndMainMessageLoop {
   DCHECK(!BrowserList::HasBrowserWithProfile([self defaultProfile]));
   if (!BrowserList::HasBrowserWithProfile([self defaultProfile])) {
     // As we're shutting down, we need to nuke the TabRestoreService, which
     // will start the shutdown of the NavigationControllers and allow for
     // proper shutdown. If we don't do this, Chrome won't shut down cleanly,
     // and may end up crashing when some thread tries to use the IO thread (or
@@ skipping 496 matching lines @@
       continue;
     GURL gurl(std::string((char*)[fileURLData bytes], [fileURLData length]));
     gurlVector.push_back(gurl);
   }
 
   [self openURLs:gurlVector];
 }
 
 // Called when the preferences window is closed. We use this to release the
 // window controller.
-- (void)prefsWindowClosed:(NSNotification*)notify {
-  [[NSNotificationCenter defaultCenter]
-    removeObserver:self
-              name:kUserDoneEditingPrefsNotification
-            object:prefsController_.get()];
-  prefsController_.reset(NULL);
+- (void)prefsWindowClosed:(NSNotification*)notification {
+  NSWindow* window = [prefsController_ window];
+  DCHECK([notification object] == window);
+  NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
+  [defaultCenter removeObserver:self
+                           name:NSWindowWillCloseNotification
+                         object:window];
+  // PreferencesWindowControllers are autoreleased in
+  // -[PreferencesWindowController windowWillClose:].
+  prefsController_ = nil;
 }
 
 // Show the preferences window, or bring it to the front if it's already
 // visible.
 - (IBAction)showPreferences:(id)sender {
   [self showPreferencesWindow:sender
                          page:OPTIONS_PAGE_DEFAULT
                       profile:[self defaultProfile]];
 }
 
 - (void)showPreferencesWindow:(id)sender
                          page:(OptionsPage)page
                       profile:(Profile*)profile {
-  if (prefsController_.get()) {
+  if (prefsController_) {
     [prefsController_ switchToPage:page animate:YES];
   } else {
-    prefsController_.reset([[PreferencesWindowController alloc]
-                              initWithProfile:profile
-                                  initialPage:page]);
+    prefsController_ =
+        [[PreferencesWindowController alloc] initWithProfile:profile
+                                                 initialPage:page];
     // Watch for a notification of when it goes away so that we can destroy
     // the controller.
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(prefsWindowClosed:)
-               name:kUserDoneEditingPrefsNotification
-             object:prefsController_.get()];
+               name:NSWindowWillCloseNotification
+             object:[prefsController_ window]];
   }
   [prefsController_ showPreferences:sender];
 }
 
 // Called when the about window is closed. We use this to release the
 // window controller.
-- (void)aboutWindowClosed:(NSNotification*)notify {
+- (void)aboutWindowClosed:(NSNotification*)notification {
+  NSWindow* window = [aboutController_ window];
+  DCHECK(window == [notification object]);
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
-                name:kUserClosedAboutNotification
-              object:aboutController_.get()];
-  aboutController_.reset(nil);
+                name:NSWindowWillCloseNotification
+              object:window];
+  // AboutWindowControllers are autoreleased in
+  // -[AboutWindowController windowWillClose:].
+  aboutController_ = nil;
 }
 
 - (IBAction)orderFrontStandardAboutPanel:(id)sender {
   if (!aboutController_) {
-    aboutController_.reset([[AboutWindowController alloc]
-                            initWithProfile:[self defaultProfile]]);
+    aboutController_ =
+        [[AboutWindowController alloc] initWithProfile:[self defaultProfile]];
 
     // Watch for a notification of when it goes away so that we can destroy
     // the controller.
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(aboutWindowClosed:)
-               name:kUserClosedAboutNotification
-             object:aboutController_.get()];
+               name:NSWindowWillCloseNotification
+             object:[aboutController_ window]];
   }
 
   if (![[aboutController_ window] isVisible])
     [[aboutController_ window] center];
 
   [aboutController_ showWindow:self];
 }
 
 // Explicitly bring to the foreground when creating new windows from the dock.
 - (void)newWindowFromDock:(id)sender {
@@ skipping 35 matching lines @@
   [appController showPreferencesWindow:nil page:page profile:profile];
 }
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac