Moved a whole pile of unittests over to CocoaTest.

chrome/browser/cocoa/preferences_window_controller_unittest.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 <Cocoa/Cocoa.h>
 
 #import "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/preferences_window_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
@@ skipping 23 matching lines @@
 class PrefsControllerTest : public CocoaTest {
  public:
   virtual void SetUp() {
     CocoaTest::SetUp();
     // The metrics reporting pref is registerd on the local state object in
     // real builds, but we don't have one of those for unit tests. Register
     // it on prefs so we'll find it when we go looking.
     PrefService* prefs = browser_helper_.profile()->GetPrefs();
     prefs->RegisterBooleanPref(prefs::kMetricsReportingEnabled, false);
 
-    pref_controller_.reset([[PreferencesWindowController alloc]
-                              initWithProfile:browser_helper_.profile()
-                                  initialPage:OPTIONS_PAGE_DEFAULT]);
-    EXPECT_TRUE(pref_controller_.get());
+    pref_controller_ = [[PreferencesWindowController alloc]
+                         initWithProfile:browser_helper_.profile()
+                             initialPage:OPTIONS_PAGE_DEFAULT];
+    EXPECT_TRUE(pref_controller_);
   }
 
   virtual void TearDown() {
-    pref_controller_.reset(NULL);
+    [pref_controller_ close];
     CocoaTest::TearDown();
   }
 
   BrowserTestHelper browser_helper_;
-  scoped_nsobject<PreferencesWindowController> pref_controller_;
+  PreferencesWindowController* pref_controller_;
 };
 
 // Test showing the preferences window and making sure it's visible, then
 // making sure we get the notification when it's closed.
 TEST_F(PrefsControllerTest, ShowAndClose) {
   [pref_controller_ showPreferences:nil];
   EXPECT_TRUE([[pref_controller_ window] isVisible]);
 
   scoped_nsobject<PrefsClosedObserver> observer(
       [[PrefsClosedObserver alloc] init]);
-  [[NSNotificationCenter defaultCenter]
-      addObserver:observer.get()
-         selector:@selector(prefsWindowClosed:)
-             name:kUserDoneEditingPrefsNotification
-           object:pref_controller_.get()];
+  NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
+  [defaultCenter addObserver:observer.get()
+                    selector:@selector(prefsWindowClosed:)
+                        name:NSWindowWillCloseNotification
+                      object:[pref_controller_ window]];
   [[pref_controller_ window] performClose:observer];
   EXPECT_TRUE(observer.get()->gotNotification_);
-  [[NSNotificationCenter defaultCenter] removeObserver:observer.get()];
+  [defaultCenter removeObserver:observer.get()];
+  pref_controller_ = nil;
 }
 
 TEST_F(PrefsControllerTest, ValidateCustomHomePagesTable) {
   // First, insert two valid URLs into the CustomHomePagesModel.
   GURL url1("http://www.google.com/");
   GURL url2("http://maps.google.com/");
   std::vector<GURL> urls;
   urls.push_back(url1);
   urls.push_back(url2);
   [[pref_controller_ customPagesSource] setURLs:urls];
@@ skipping 145 matching lines @@
 
   // TODO(akalin): Figure out how to test animation; we'll need everything
   // to stick around until the animation finishes.
 }
 
 // TODO(akalin): Figure out how to test sync controls.
 // TODO(akalin): Figure out how to test that sync controls are not shown
 // when there isn't a sync service.
 
 }  // namespace