Moved a whole pile of unittests over to CocoaTest.

AboutIPC.xib - Connected up controller to its window and the window delegate to the controller.

BUG=26484, 26484
TEST=See repro steps in bugs.

Review URL: http://codereview.chromium.org/402066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32551 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 12 deletions

diff --git a/chrome/browser/cocoa/page_info_window_controller_unittest.mm b/chrome/browser/cocoa/page_info_window_controller_unittest.mm
index 8c92098..8ca4782 100644
--- a/chrome/browser/cocoa/page_info_window_controller_unittest.mm
+++ b/chrome/browser/cocoa/page_info_window_controller_unittest.mm
@@ -2,37 +2,36 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Cocoa/Cocoa.h>
-
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/page_info_window_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
-#include "chrome/common/pref_names.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/platform_test.h"
 
-class PageInfoWindowControllerTest : public PlatformTest {
+class PageInfoWindowControllerTest : public CocoaTest {
   virtual void SetUp() {
-    controller_.reset([[PageInfoWindowController alloc] init]);
+    CocoaTest::SetUp();
+    controller_ = [[PageInfoWindowController alloc] init];
+    EXPECT_TRUE([controller_ window]);
+  }
+
+  virtual void TearDown() {
+    [controller_ close];
+    CocoaTest::TearDown();
   }
 
  public:
-  CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
   BrowserTestHelper helper_;
-  scoped_nsobject<PageInfoWindowController> controller_;
+  PageInfoWindowController* controller_;
 };
 
 
 TEST_F(PageInfoWindowControllerTest, TestImages) {
-  [controller_ window];  // Force nib load.
   EXPECT_TRUE([controller_ goodImg]);
   EXPECT_TRUE([controller_ badImg]);
 }
 
 
 TEST_F(PageInfoWindowControllerTest, TestGrow) {
-  [controller_ window];  // Force nib load.
   NSRect frame = [[controller_ window] frame];
   [controller_ setShowHistoryBox:YES];
   NSRect newFrame = [[controller_ window] frame];
@@ -42,7 +41,6 @@ TEST_F(PageInfoWindowControllerTest, TestGrow) {
 
 
 TEST_F(PageInfoWindowControllerTest, TestShrink) {
-  [controller_ window];  // Force nib to load.
   [controller_ setShowHistoryBox:YES];
   NSRect frame = [[controller_ window] frame];
   [controller_ setShowHistoryBox:NO];