Moved a whole pile of unittests over to CocoaTest.

chrome/browser/cocoa/tab_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>
 
 #include "base/scoped_nsautorelease_pool.h"
 #import "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/tab_controller.h"
 #import "chrome/browser/cocoa/tab_controller_target.h"
@@ skipping 45 matching lines @@
 }
 - (BOOL)isCommandEnabled:(TabStripModel::ContextMenuCommand)command
            forController:(TabController*)controller {
   return NO;
 }
 @end
 
 namespace {
 
 // The dragging code in TabView makes heavy use of autorelease pools so
-// inherit from Platform test to have one created for us.
-class TabControllerTest : public PlatformTest {
+// inherit from CocoaTest to have one created for us.
+class TabControllerTest : public CocoaTest {
  public:
   TabControllerTest() { }
-
-  CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
 };
 
 // Tests creating the controller, sticking it in a window, and removing it.
 TEST_F(TabControllerTest, Creation) {
-  NSWindow* window = cocoa_helper_.window();
+  NSWindow* window = test_window();
   scoped_nsobject<TabController> controller([[TabController alloc] init]);
   [[window contentView] addSubview:[controller view]];
   EXPECT_TRUE([controller tabView]);
   EXPECT_EQ([[controller view] window], window);
   [[controller view] display];  // Test drawing to ensure nothing leaks/crashes.
   [[controller view] removeFromSuperview];
 }
 
 // Tests sending it a close message and ensuring that the target/action get
 // called. Mimics the user clicking on the close button in the tab.
 TEST_F(TabControllerTest, Close) {
-  NSWindow* window = cocoa_helper_.window();
+  NSWindow* window = test_window();
   scoped_nsobject<TabController> controller([[TabController alloc] init]);
   [[window contentView] addSubview:[controller view]];
 
   scoped_nsobject<TabControllerTestTarget> target(
       [[TabControllerTestTarget alloc] init]);
   EXPECT_FALSE([target closed]);
   [controller setTarget:target];
   EXPECT_EQ(target.get(), [controller target]);
 
   [controller closeTab:nil];
   EXPECT_TRUE([target closed]);
 
   [[controller view] removeFromSuperview];
 }
 
 // Tests setting the |selected| property via code.
 TEST_F(TabControllerTest, APISelection) {
-  NSWindow* window = cocoa_helper_.window();
+  NSWindow* window = test_window();
   scoped_nsobject<TabController> controller([[TabController alloc] init]);
   [[window contentView] addSubview:[controller view]];
 
   EXPECT_FALSE([controller selected]);
   [controller setSelected:YES];
   EXPECT_TRUE([controller selected]);
 
   [[controller view] removeFromSuperview];
 }
 
 // Tests that setting the title of a tab sets the tooltip as well.
 TEST_F(TabControllerTest, ToolTip) {
-  NSWindow* window = cocoa_helper_.window();
+  NSWindow* window = test_window();
 
   scoped_nsobject<TabController> controller([[TabController alloc] init]);
   [[window contentView] addSubview:[controller view]];
 
   EXPECT_TRUE([[controller toolTip] length] == 0);
   NSString *tooltip_string = @"Some text to use as a tab title";
   [controller setTitle:tooltip_string];
   EXPECT_TRUE([tooltip_string isEqualToString:[controller toolTip]]);
 }
 
 // Tests setting the |loading| property via code.
 TEST_F(TabControllerTest, Loading) {
-  NSWindow* window = cocoa_helper_.window();
+  NSWindow* window = test_window();
   scoped_nsobject<TabController> controller([[TabController alloc] init]);
   [[window contentView] addSubview:[controller view]];
 
   EXPECT_EQ(kTabDone, [controller loadingState]);
   [controller setLoadingState:kTabWaiting];
   EXPECT_EQ(kTabWaiting, [controller loadingState]);
   [controller setLoadingState:kTabLoading];
   EXPECT_EQ(kTabLoading, [controller loadingState]);
   [controller setLoadingState:kTabDone];
   EXPECT_EQ(kTabDone, [controller loadingState]);
 
   [[controller view] removeFromSuperview];
 }
 
 // Tests selecting the tab with the mouse click and ensuring the target/action
 // get called.
 // TODO(pinkerton): It's yucky that TabView bakes in the dragging so that we
 // can't test this class w/out lots of extra effort. When cole finishes the
 // rewrite, we should move all that logic out into a separate controller which
 // we can dependency-inject/mock so it has very simple click behavior for unit
 // testing.
 TEST_F(TabControllerTest, UserSelection) {
-  NSWindow* window = cocoa_helper_.window();
+  NSWindow* window = test_window();
 
   // Create a tab at a known location in the window that we can click on
   // to activate selection.
   scoped_nsobject<TabController> controller([[TabController alloc] init]);
   [[window contentView] addSubview:[controller view]];
   NSRect frame = [[controller view] frame];
   frame.size.width = [TabController minTabWidth];
   frame.origin = NSMakePoint(0, 0);
   [[controller view] setFrame:frame];
 
@@ skipping 28 matching lines @@
                                      pressure:1.0];
   [[controller view] mouseDown:down];
 
   // Check our target was told the tab got selected.
   EXPECT_TRUE([target selected]);
 
   [[controller view] removeFromSuperview];
 }
 
 TEST_F(TabControllerTest, IconCapacity) {
-  NSWindow* window = cocoa_helper_.window();
+  NSWindow* window = test_window();
   scoped_nsobject<TabController> controller([[TabController alloc] init]);
   [[window contentView] addSubview:[controller view]];
   int cap = [controller iconCapacity];
   EXPECT_GE(cap, 1);
 
   NSRect frame = [[controller view] frame];
   frame.size.width += 500;
   [[controller view] setFrame:frame];
   int newcap = [controller iconCapacity];
   EXPECT_GT(newcap, cap);
 }
 
 TEST_F(TabControllerTest, ShouldShowIcon) {
-  NSWindow* window = cocoa_helper_.window();
+  NSWindow* window = test_window();
   scoped_nsobject<TabController> controller([[TabController alloc] init]);
   [[window contentView] addSubview:[controller view]];
   int cap = [controller iconCapacity];
   EXPECT_GT(cap, 0);
 
   // Tab is minimum width, both icon and close box should be hidden.
   NSRect frame = [[controller view] frame];
   frame.size.width = [TabController minTabWidth];
   [[controller view] setFrame:frame];
   EXPECT_FALSE([controller shouldShowIcon]);
@@ skipping 24 matching lines @@
   EXPECT_TRUE([controller shouldShowCloseButton]);
   [controller setSelected:NO];
   EXPECT_TRUE([controller shouldShowIcon]);
   EXPECT_TRUE([controller shouldShowCloseButton]);
 
   cap = [controller iconCapacity];
   EXPECT_GT(cap, 0);
 }
 
 }  // namespace