Rewrites the Mac view resizing logic to have the BrowserWindowController...

chrome/browser/cocoa/bookmark_bar_controller_unittest.mm

Index: chrome/browser/cocoa/bookmark_bar_controller_unittest.mm
===================================================================
--- chrome/browser/cocoa/bookmark_bar_controller_unittest.mm	(revision 22499)
+++ chrome/browser/cocoa/bookmark_bar_controller_unittest.mm	(working copy)
@@ -9,6 +9,7 @@
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
+#import "chrome/browser/cocoa/view_resizer_pong.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Pretend BookmarkURLOpener delegate to keep track of requests
@@ -81,21 +82,15 @@
 class BookmarkBarControllerTest : public testing::Test {
  public:
   BookmarkBarControllerTest() {
-    NSRect content_frame = NSMakeRect(0, 0, 800, kContentAreaHeight);
-    // |infobar_frame| is set to be directly above |content_frame|.
-    NSRect infobar_frame = NSMakeRect(0, kContentAreaHeight,
-                                      800, kInfoBarViewHeight);
+    resizeDelegate_.reset([[ViewResizerPong alloc] init]);
     NSRect parent_frame = NSMakeRect(0, 0, 800, 50);
-    content_area_.reset([[NSView alloc] initWithFrame:content_frame]);
-    infobar_view_.reset([[NSView alloc] initWithFrame:infobar_frame]);
     parent_view_.reset([[NSView alloc] initWithFrame:parent_frame]);
     [parent_view_ setHidden:YES];
     bar_.reset(
         [[BookmarkBarController alloc] initWithProfile:helper_.profile()
-                                            parentView:parent_view_.get()
-                                        webContentView:content_area_.get()
-                                          infoBarsView:infobar_view_.get()
-                                              delegate:nil]);
+                                          initialWidth:NSWidth(parent_frame)
+                                        resizeDelegate:resizeDelegate_.get()
+                                           urlDelegate:nil]);
 
     InstallAndToggleBar(bar_.get());
 
@@ -139,10 +134,9 @@
 
 
   CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
-  scoped_nsobject<NSView> content_area_;
-  scoped_nsobject<NSView> infobar_view_;
   scoped_nsobject<NSView> parent_view_;
   BrowserTestHelper helper_;
+  scoped_nsobject<ViewResizerPong> resizeDelegate_;
   scoped_nsobject<BookmarkBarController> bar_;
   scoped_nsobject<NSMenu> menu_;
   scoped_nsobject<NSMenuItem> menu_item_;
@@ -164,22 +158,14 @@
   [bar_ toggleBookmarkBar];
   EXPECT_TRUE([bar_ isBookmarkBarVisible]);
   EXPECT_FALSE([[bar_ view] isHidden]);
-  NSRect content_frame = [content_area_ frame];
-  NSRect infobar_frame = [infobar_view_ frame];
-  EXPECT_NE(content_frame.size.height, kContentAreaHeight);
-  EXPECT_EQ(NSMaxY(content_frame), NSMinY(infobar_frame));
-  EXPECT_EQ(kInfoBarViewHeight, infobar_frame.size.height);
+  EXPECT_GT([resizeDelegate_ height], 0);
   EXPECT_GT([[bar_ view] frame].size.height, 0);
 
   [bar_ toggleBookmarkBar];
   EXPECT_FALSE([bar_ isBookmarkBarVisible]);
   EXPECT_TRUE([[bar_ view] isHidden]);
-  content_frame = [content_area_ frame];
-  infobar_frame = [infobar_view_ frame];
-  EXPECT_EQ(content_frame.size.height, kContentAreaHeight);
-  EXPECT_EQ(NSMaxY(content_frame), NSMinY(infobar_frame));
-  EXPECT_EQ(kInfoBarViewHeight, infobar_frame.size.height);
-  EXPECT_EQ([[bar_ view] frame].size.height, 0);
+  EXPECT_EQ(0, [resizeDelegate_ height]);
+  EXPECT_EQ(0, [[bar_ view] frame].size.height);
 }
 
 // Make sure we're watching for frame change notifications.
@@ -188,10 +174,9 @@
   bar.reset(
     [[BookmarkBarControllerTogglePong alloc]
           initWithProfile:helper_.profile()
-               parentView:parent_view_.get()
-           webContentView:content_area_.get()
-             infoBarsView:infobar_view_.get()
-                 delegate:nil]);
+             initialWidth:100  // arbitrary
+           resizeDelegate:resizeDelegate_.get()
+              urlDelegate:nil]);
   InstallAndToggleBar(bar.get());
 
   EXPECT_GT([bar toggles], 0);
@@ -294,7 +279,7 @@
   scoped_ptr<BookmarkNode> node(new BookmarkNode(gurl));
   scoped_nsobject<BookmarkURLOpenerPong> pong([[BookmarkURLOpenerPong alloc]
                                                 init]);
-  [bar_ setDelegate:pong.get()];
+  [bar_ setUrlDelegate:pong.get()];
 
   scoped_nsobject<NSButtonCell> cell([[NSButtonCell alloc] init]);
   scoped_nsobject<NSButton> button([[NSButton alloc] init]);
@@ -305,7 +290,7 @@
   EXPECT_EQ(pong.get()->urls_[0], node->GetURL());
   EXPECT_EQ(pong.get()->dispositions_[0], CURRENT_TAB);
 
-  [bar_ setDelegate:nil];
+  [bar_ setUrlDelegate:nil];
 }
 
 // Confirm opening of bookmarks works from the menus (different
@@ -313,7 +298,7 @@
 TEST_F(BookmarkBarControllerTest, OpenBookmarkFromMenus) {
   scoped_nsobject<BookmarkURLOpenerPong> pong([[BookmarkURLOpenerPong alloc]
                                                 init]);
-  [bar_ setDelegate:pong.get()];
+  [bar_ setUrlDelegate:pong.get()];
 
   const char* urls[] = { "http://walla.walla.ding.dong.com",
                          "http://i_dont_know.com",
@@ -334,7 +319,7 @@
     EXPECT_EQ(pong.get()->dispositions_[0], dispositions[i]);
     [pong clear];
   }
-  [bar_ setDelegate:nil];
+  [bar_ setUrlDelegate:nil];
 }
 
 TEST_F(BookmarkBarControllerTest, TestAddRemoveAndClear) {
@@ -458,7 +443,7 @@
 TEST_F(BookmarkBarControllerTest, OpenAllBookmarks) {
   scoped_nsobject<BookmarkURLOpenerPong> pong([[BookmarkURLOpenerPong alloc]
                                                 init]);
-  [bar_ setDelegate:pong.get()];
+  [bar_ setUrlDelegate:pong.get()];
 
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
@@ -493,7 +478,7 @@
 
   EXPECT_EQ(pong.get()->dispositions_[3], NEW_BACKGROUND_TAB);
 
-  [bar_ setDelegate:nil];
+  [bar_ setUrlDelegate:nil];
 }
 
 // TODO(jrg): write a test to confirm that nodeFavIconLoaded calls