Moved a whole pile of unittests over to CocoaTest.

chrome/browser/cocoa/bookmark_bar_toolbar_view_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 "app/theme_provider.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
@@ skipping 51 matching lines @@
 @property(assign) ThemeProvider* themeProvider;
 @property(assign) BOOL isShownAsDetachedBar;
 @end
 
 @implementation DrawDetachedBarFakeController
 @synthesize currentTabContentsHeight = current_tab_contents_height_;
 @synthesize themeProvider = theme_provider_;
 @synthesize isShownAsDetachedBar = isShownAsDetachedBar_;
 @end
 
-class BookmarkBarToolbarViewTest : public PlatformTest {
+class BookmarkBarToolbarViewTest : public CocoaTest {
  public:
   BookmarkBarToolbarViewTest() {
     controller_.reset([[DrawDetachedBarFakeController alloc] init]);
     NSRect frame = NSMakeRect(0, 0, 400, 40);
-    view_.reset([[BookmarkBarToolbarView alloc] initWithFrame:frame]);
-    [cocoa_helper_.contentView() addSubview:view_.get()];
-    [view_.get() setController:controller_.get()];
+    scoped_nsobject<BookmarkBarToolbarView> view(
+        [[BookmarkBarToolbarView alloc] initWithFrame:frame]);
+    view_ = view.get();
+    [[test_window() contentView] addSubview:view_];
+    [view_ setController:controller_.get()];
   }
 
-  CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
   scoped_nsobject<DrawDetachedBarFakeController> controller_;
-  scoped_nsobject<BookmarkBarToolbarView> view_;
+  BookmarkBarToolbarView* view_;
 };
 
-// Test adding/removing from the view hierarchy, mostly to ensure nothing
-// leaks or crashes.
-TEST_F(BookmarkBarToolbarViewTest, AddRemove) {
-  EXPECT_EQ(cocoa_helper_.contentView(), [view_ superview]);
-  [view_.get() removeFromSuperview];
-  EXPECT_FALSE([view_ superview]);
-}
+TEST_VIEW(BookmarkBarToolbarViewTest, view_)
 
 // Test drawing (part 1), mostly to ensure nothing leaks or crashes.
 TEST_F(BookmarkBarToolbarViewTest, DisplayAsNormalBar) {
   [controller_.get() setIsShownAsDetachedBar:NO];
   [view_ display];
 }
 
 // Test drawing (part 2), mostly to ensure nothing leaks or crashes.
 TEST_F(BookmarkBarToolbarViewTest, DisplayAsDetachedBarWithNoImage) {
   [controller_.get() setIsShownAsDetachedBar:YES];
@@ skipping 47 matching lines @@
   fake_bg.allocPixels();
   fake_bg.eraseColor(SK_ColorGREEN);
   EXPECT_CALL(provider, GetBitmapNamed(IDR_THEME_NTP_BACKGROUND))
       .WillRepeatedly(Return(&fake_bg));
 
   [controller_.get() setThemeProvider:&provider];
   [controller_.get() setCurrentTabContentsHeight:200];
 
   [view_ display];
 }