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

chrome/browser/cocoa/bookmark_bar_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/basictypes.h"
 #include "base/scoped_nsobject.h"
 #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
 @interface BookmarkURLOpenerPong : NSObject<BookmarkURLOpener> {
  @public
   std::vector<GURL> urls_;
   std::vector<WindowOpenDisposition> dispositions_;
 }
 @end
 
@@ skipping 52 matching lines @@
 
 
 namespace {
 
 static const int kContentAreaHeight = 500;
 static const int kInfoBarViewHeight = 30;
 
 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());
 
     // Create a menu/item to act like a sender
     menu_.reset([[NSMenu alloc] initWithTitle:@"I_dont_care"]);
     menu_item_.reset([[NSMenuItem alloc]
                        initWithTitle:@"still_dont_care"
                               action:NULL
                        keyEquivalent:@""]);
     cell_.reset([[NSButtonCell alloc] init]);
@@ skipping 23 matching lines @@
   }
 
   // Does NOT take ownership of node.
   NSMenuItem* ItemForBookmarkBarMenu(const BookmarkNode* node) {
     [cell_ setRepresentedObject:[NSValue valueWithPointer:node]];
     return menu_item_;
   }
 
 
   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_;
   scoped_nsobject<NSButtonCell> cell_;
   scoped_ptr<BookmarkNode> node_;
 };
 
 TEST_F(BookmarkBarControllerTest, ShowHide) {
   // The test class opens the bar by default since many actions are
   // no-ops with it closed.  Set back to closed as a baseline.
   if ([bar_ isBookmarkBarVisible])
     [bar_ toggleBookmarkBar];
 
   // Start hidden.
   EXPECT_FALSE([bar_ isBookmarkBarVisible]);
   EXPECT_TRUE([[bar_ view] isHidden]);
 
   // Show and hide it by toggling.
   [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.
 TEST_F(BookmarkBarControllerTest, FrameChangeNotification) {
   scoped_nsobject<BookmarkBarControllerTogglePong> bar;
   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);
 
   // Hard to force toggles -- simple whacking the frame is inadequate.
   // TODO(jrg): find a way to set frame, force a toggle, and verify it.
 }
 
 // Confirm off the side button only enabled when reasonable.
 TEST_F(BookmarkBarControllerTest, OffTheSideButtonEnable) {
@@ skipping 82 matching lines @@
   EXPECT_TRUE([submenu itemWithTitle:@"f1"]);
   EXPECT_TRUE([submenu itemWithTitle:@"f2"]);
 }
 
 // Confirm openBookmark: forwards the request to the controller's delegate
 TEST_F(BookmarkBarControllerTest, OpenBookmark) {
   GURL gurl("http://walla.walla.ding.dong.com");
   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]);
   [button setCell:cell.get()];
   [cell setRepresentedObject:[NSValue valueWithPointer:node.get()]];
 
   [bar_ openBookmark:button];
   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
 // dispositions than clicking on the button).
 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",
                          "http://cee.enn.enn.dot.com" };
   SEL selectors[] = { @selector(openBookmarkInNewForegroundTab:),
                       @selector(openBookmarkInNewWindow:),
                       @selector(openBookmarkInIncognitoWindow:) };
   WindowOpenDisposition dispositions[] = { NEW_FOREGROUND_TAB,
                                            NEW_WINDOW,
                                            OFF_THE_RECORD };
   for (unsigned int i = 0;
        i < sizeof(dispositions)/sizeof(dispositions[0]);
        i++) {
     GURL gurl(urls[i]);
     [bar_ performSelector:selectors[i]
                withObject:ItemForBookmarkBarMenu(gurl)];
     EXPECT_EQ(pong.get()->urls_[0], gurl);
     EXPECT_EQ(pong.get()->dispositions_[0], dispositions[i]);
     [pong clear];
   }
-  [bar_ setDelegate:nil];
+  [bar_ setUrlDelegate:nil];
 }
 
 TEST_F(BookmarkBarControllerTest, TestAddRemoveAndClear) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   NSView* buttonView = [bar_ buttonView];
   EXPECT_EQ(0U, [[bar_ buttons] count]);
   unsigned int initial_subview_count = [[buttonView subviews] count];
 
   // Make sure a redundant call doesn't choke
   [bar_ clearBookmarkBar];
@@ skipping 103 matching lines @@
   [bar_ deleteBookmark:item];
   EXPECT_EQ(2, parent->GetChildCount());
   EXPECT_EQ(parent->GetChild(0)->GetURL(), GURL(urls[0]));
   // node 2 moved into spot 1
   EXPECT_EQ(parent->GetChild(1)->GetURL(), GURL(urls[2]));
 }
 
 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();
   // { one, { two-one, two-two }, three }
   model->AddURL(parent, parent->GetChildCount(),
                 L"title", GURL("http://one.com"));
   const BookmarkNode* folder = model->AddGroup(parent,
                                                parent->GetChildCount(),
                                                L"group");
   model->AddURL(folder, folder->GetChildCount(),
@@ skipping 14 matching lines @@
   std::vector<GURL>::iterator end = pong.get()->urls_.end();
   i = find(begin, end, GURL("http://two-one.com"));
   EXPECT_FALSE(i == end);
   i = find(begin, end, GURL("https://three.com"));
   EXPECT_FALSE(i == end);
   i = find(begin, end, GURL("https://will-not-be-found.com"));
   EXPECT_TRUE(i == end);
 
   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
 // checkForBookmarkButtonGrowth:.
 
 // TODO(jrg): Make sure showing the bookmark bar calls loaded: (to
 // process bookmarks)
 TEST_F(BookmarkBarControllerTest, ShowAndLoad) {
 }
 
@@ skipping 10 matching lines @@
 TEST_F(BookmarkBarControllerTest, Display) {
   [[bar_ view] display];
 }
 
 // Cannot test these methods since they simply call a single static
 // method, BookmarkEditor::Show(), which is impossible to mock.
 // editBookmark:, addPage:
 
 
 }  // namespace