Moved a whole pile of unittests over to CocoaTest.

chrome/browser/cocoa/bookmark_button_cell_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.
 
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/bookmark_button_cell.h"
 #import "chrome/browser/cocoa/bookmark_menu.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
-class BookmarkButtonCellTest : public PlatformTest {
- public:
-  CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
-  scoped_nsobject<NSButton> view_;
+class BookmarkButtonCellTest : public CocoaTest {
 };
 
 // Make sure it's not totally bogus
 TEST_F(BookmarkButtonCellTest, SizeForBounds) {
   NSRect frame = NSMakeRect(0, 0, 50, 30);
-  view_.reset([[NSButton alloc] initWithFrame:frame]);
-  scoped_nsobject<BookmarkButtonCell> cell([[BookmarkButtonCell alloc]
-                                               initTextCell:@"Testing"]);
-  [view_ setCell:cell.get()];
-  [cocoa_helper_.contentView() addSubview:view_.get()];
+  scoped_nsobject<NSButton> view([[NSButton alloc] initWithFrame:frame]);
+  scoped_nsobject<BookmarkButtonCell> cell(
+      [[BookmarkButtonCell alloc] initTextCell:@"Testing"]);
+  [view setCell:cell.get()];
+  [[test_window() contentView] addSubview:view];
 
   NSRect r = NSMakeRect(0, 0, 100, 100);
   NSSize size = [cell.get() cellSizeForBounds:r];
   EXPECT_TRUE(size.width > 0 && size.height > 0);
   EXPECT_TRUE(size.width < 200 && size.height < 200);
 }
 
 // Make sure the default from the base class is overridden
 TEST_F(BookmarkButtonCellTest, MouseEnterStuff) {
-  scoped_nsobject<BookmarkButtonCell> cell([[BookmarkButtonCell alloc]
-                                               initTextCell:@"Testing"]);
+  scoped_nsobject<BookmarkButtonCell> cell(
+      [[BookmarkButtonCell alloc] initTextCell:@"Testing"]);
   EXPECT_TRUE([cell.get() showsBorderOnlyWhileMouseInside]);
 }
 
 }  // namespace