Reverting 22541.

chrome/browser/cocoa/bookmark_bar_bridge_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 "chrome/browser/cocoa/bookmark_bar_bridge.h"
 #include "chrome/browser/cocoa/bookmark_bar_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 14 matching lines @@
 @interface FakeBookmarkBarController :
   BookmarkBarController<BookmarkURLOpener> {
  @public
   scoped_nsobject<NSMutableArray> callbacks_;
   std::vector<OpenInfo> opens_;
 }
 @end
 
 @implementation FakeBookmarkBarController
 
-- (id)initWithProfile:(Profile*)profile
-           parentView:(NSView*)parentView
-       webContentView:(NSView*)webContentView
-         infoBarsView:(NSView*)infoBarsView {
+- (id)initWithProfile:(Profile*)profile {
   if ((self = [super initWithProfile:profile
-                          parentView:parentView
-                      webContentView:webContentView
-                        infoBarsView:infoBarsView
-                            delegate:self])) {
+                        initialWidth:100  // arbitrary
+                      resizeDelegate:nil
+                         urlDelegate:self])) {
     callbacks_.reset([[NSMutableArray alloc] init]);
   }
   return self;
 }
 
 - (void)loaded:(BookmarkModel*)model {
   [callbacks_ addObject:[NSNumber numberWithInt:0]];
 }
 
 - (void)beingDeleted:(BookmarkModel*)model {
@@ skipping 35 matching lines @@
 - (void)openBookmarkURL:(const GURL&)url
             disposition:(WindowOpenDisposition)disposition {
   opens_.push_back(OpenInfo(url, disposition));
 }
 
 @end
 
 
 class BookmarkBarBridgeTest : public testing::Test {
  public:
-  BookmarkBarBridgeTest() {
-    NSRect content_frame = NSMakeRect(0, 0, 100, 100);
-    view_.reset([[NSView alloc] initWithFrame:content_frame]);
-  }
-
   CocoaTestHelper cocoa_helper_;
   BrowserTestHelper browser_test_helper_;
-  scoped_nsobject<NSView> view_;
 };
 
 // Call all the callbacks; make sure they are all redirected to the objc object.
 TEST_F(BookmarkBarBridgeTest, TestRedirect) {
   Profile *profile = browser_test_helper_.profile();
   BookmarkModel *model = profile->GetBookmarkModel();
 
   scoped_nsobject<NSView> parentView([[NSView alloc]
                                        initWithFrame:NSMakeRect(0,0,100,100)]);
   scoped_nsobject<NSView> webView([[NSView alloc]
                                        initWithFrame:NSMakeRect(0,0,100,100)]);
   scoped_nsobject<NSView> infoBarsView(
       [[NSView alloc] initWithFrame:NSMakeRect(0,0,100,100)]);
 
   scoped_nsobject<FakeBookmarkBarController>
-    controller([[FakeBookmarkBarController alloc]
-                 initWithProfile:profile
-                      parentView:parentView.get()
-                  webContentView:webView.get()
-                    infoBarsView:infoBarsView.get()]);
+      controller([[FakeBookmarkBarController alloc] initWithProfile:profile]);
   EXPECT_TRUE(controller.get());
   scoped_ptr<BookmarkBarBridge> bridge(new BookmarkBarBridge(controller.get(),
                                                              model));
   EXPECT_TRUE(bridge.get());
 
   bridge->Loaded(NULL);
   bridge->BookmarkModelBeingDeleted(NULL);
   bridge->BookmarkNodeMoved(NULL, NULL, 0, NULL, 0);
   bridge->BookmarkNodeAdded(NULL, NULL, 0);
   bridge->BookmarkNodeChanged(NULL, NULL);
   bridge->BookmarkNodeFavIconLoaded(NULL, NULL);
   bridge->BookmarkNodeChildrenReordered(NULL, NULL);
   bridge->BookmarkNodeRemoved(NULL, NULL, 0, NULL);
 
   // 8 calls above plus an initial Loaded() in init routine makes 9
   EXPECT_TRUE([controller.get()->callbacks_ count] == 9);
 
   for (int x = 1; x < 9; x++) {
     NSNumber *num = [NSNumber numberWithInt:x-1];
     EXPECT_TRUE([[controller.get()->callbacks_ objectAtIndex:x] isEqual:num]);
   }
 }