Moved a whole pile of unittests over to CocoaTest.

chrome/browser/cocoa/find_bar_cocoa_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_ptr.h"
-#include "base/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/find_notification_details.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/find_bar_cocoa_controller.h"
 #import "chrome/browser/cocoa/find_pasteboard.h"
 #import "chrome/browser/cocoa/find_bar_text_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ skipping 14 matching lines @@
   return [findText_ stringValue];
 }
 
 - (NSTextField*)findTextField {
   return findText_;
 }
 @end
 
 namespace {
 
-class FindBarCocoaControllerTest : public PlatformTest {
+class FindBarCocoaControllerTest : public CocoaTest {
  public:
   virtual void SetUp() {
-    PlatformTest::SetUp();
-
-    // TODO(rohitrao): We don't really need to do this once per test.
-    // Consider moving it to SetUpTestCase().
+    CocoaTest::SetUp();
     controller_.reset([[FindBarCocoaController alloc] init]);
-    [helper_.contentView() addSubview:[controller_ view]];
+    [[test_window() contentView] addSubview:[controller_ view]];
   }
 
  protected:
-  CocoaTestHelper helper_;
   scoped_nsobject<FindBarCocoaController> controller_;
 };
 
+TEST_VIEW(FindBarCocoaControllerTest, [controller_ view])
+
 TEST_F(FindBarCocoaControllerTest, ShowAndHide) {
   NSView* findBarView = [controller_ findBarView];
 
   ASSERT_GT([findBarView frame].origin.y, 0);
   ASSERT_FALSE([controller_ isFindBarVisible]);
 
   [controller_ showFindBar:NO];
   EXPECT_EQ([findBarView frame].origin.y, 0);
   EXPECT_TRUE([controller_ isFindBarVisible]);
 
@@ skipping 29 matching lines @@
 }
 
 TEST_F(FindBarCocoaControllerTest, ResultLabelUpdatesCorrectly) {
   // TODO(rohitrao): Test this.  It may involve creating some dummy
   // FindNotificationDetails objects.
 }
 
 TEST_F(FindBarCocoaControllerTest, FindTextIsGlobal) {
   scoped_nsobject<FindBarCocoaController> otherController(
       [[FindBarCocoaController alloc] init]);
-  [helper_.contentView() addSubview:[otherController view]];
+  [[test_window() contentView] addSubview:[otherController view]];
 
   // Setting the text in one controller should update the other controller's
   // text as well.
   const NSString* kFindText = @"Respect to the man in the ice cream van";
   [controller_ setFindText:kFindText];
   EXPECT_EQ(
       NSOrderedSame,
       [[controller_ findText] compare:kFindText]);
   EXPECT_EQ(
       NSOrderedSame,
       [[otherController.get() findText] compare:kFindText]);
 }
 
 TEST_F(FindBarCocoaControllerTest, SettingFindTextUpdatesFindPboard) {
   const NSString* kFindText =
       @"It's not a bird, it's not a plane, it must be Dave who's on the train";
   [controller_ setFindText:kFindText];
   EXPECT_EQ(
       NSOrderedSame,
       [[[FindPasteboard sharedInstance] findText] compare:kFindText]);
 }
 
 }  // namespace