Moved a whole pile of unittests over to CocoaTest.

chrome/browser/cocoa/about_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/app/keystone_glue.h"
 #import "chrome/browser/cocoa/about_window_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
@@ skipping 13 matching lines @@
   if (version) {
     [dictionary setObject:version forKey:kAutoupdateStatusVersion];
   }
 
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   [center postNotificationName:kAutoupdateStatusNotification
                         object:nil
                       userInfo:dictionary];
 }
 
-class AboutWindowControllerTest : public PlatformTest {
+class AboutWindowControllerTest : public CocoaTest {
  public:
   virtual void SetUp() {
-    PlatformTest::SetUp();
-    about_window_controller_.reset([[AboutWindowController alloc]
-                                    initWithProfile:nil]);
-    // make sure the nib is loaded
-    [about_window_controller_ window];
+    CocoaTest::SetUp();
+    about_window_controller_ =
+        [[AboutWindowController alloc] initWithProfile:nil];
+    EXPECT_TRUE([about_window_controller_ window]);
   }
 
-  scoped_nsobject<AboutWindowController> about_window_controller_;
+  virtual void TearDown() {
+    [about_window_controller_ close];
+    CocoaTest::TearDown();
+  }
+
+  AboutWindowController* about_window_controller_;
 };
 
 TEST_F(AboutWindowControllerTest, TestCopyright) {
   NSString* text = [[AboutWindowController legalTextBlock] string];
 
   // Make sure we have the word "Copyright" in it, which is present in all
   // locales.
   NSRange range = [text rangeOfString:@"Copyright"];
   EXPECT_NE(NSNotFound, range.location);
 }
@@ skipping 20 matching lines @@
 TEST_F(AboutWindowControllerTest, TestButton) {
   NSButton* button = [about_window_controller_ updateButton];
   ASSERT_TRUE(button);
 
   // Not enabled until we know if updates are available.
   ASSERT_FALSE([button isEnabled]);
   PostAutoupdateStatusNotification(kAutoupdateAvailable, nil);
   ASSERT_TRUE([button isEnabled]);
 
   // Make sure the button is hooked up
-  ASSERT_EQ([button target], about_window_controller_.get());
+  ASSERT_EQ([button target], about_window_controller_);
   ASSERT_EQ([button action], @selector(updateNow:));
 }
 
 // Doesn't confirm correctness, but does confirm something happens.
 TEST_F(AboutWindowControllerTest, TestCallbacks) {
   NSString *lastText = [[about_window_controller_ updateText]
                         stringValue];
   PostAutoupdateStatusNotification(kAutoupdateCurrent, @"foo");
   ASSERT_FALSE([lastText isEqual:[[about_window_controller_ updateText]
                                   stringValue]]);
@@ skipping 35 matching lines @@
                                   stringValue]]);
 #endif
 
   lastText = [[about_window_controller_ updateText] stringValue];
   PostAutoupdateStatusNotification(kAutoupdateInstallFailed, nil);
   ASSERT_FALSE([lastText isEqual:[[about_window_controller_
                                   updateText] stringValue]]);
 }
 
 }  // namespace