Enable and implement last 2 items in bookmark bar context menu: "Open...

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"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/bookmark_bar_constants.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 #import "chrome/browser/cocoa/bookmark_bar_view.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/toolbar_compressable.h"
 #include "chrome/browser/cocoa/test_event_utils.h"
 #import "chrome/browser/cocoa/view_resizer_pong.h"
 #include "chrome/common/pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
-// Pretend BookmarkURLOpener delegate to keep track of requests
-@interface BookmarkURLOpenerPong : NSObject<BookmarkURLOpener> {
+// Just like a BookmarkBarController but openURL: is stubbed out.
+@interface BookmarkBarControllerNoOpen : BookmarkBarController {
  @public
   std::vector<GURL> urls_;
   std::vector<WindowOpenDisposition> dispositions_;
 }
 @end
 
-@implementation BookmarkURLOpenerPong
-- (void)openBookmarkURL:(const GURL&)url
-            disposition:(WindowOpenDisposition)disposition {
+@implementation BookmarkBarControllerNoOpen
+- (void)openURL:(GURL)url disposition:(WindowOpenDisposition)disposition {
   urls_.push_back(url);
   dispositions_.push_back(disposition);
 }
 - (void)clear {
   urls_.clear();
   dispositions_.clear();
 }
 @end
 
 
@@ skipping 13 matching lines @@
 - (id)initTextCell:(NSString*)string desiredSize:(NSSize)size {
   if ((self = [super initTextCell:string])) {
     cellSize_ = size;
   }
   return self;
 }
 
 @end
 
 // Remember the number of times we've gotten a frameDidChange notification.
-@interface BookmarkBarControllerTogglePong : BookmarkBarController {
+@interface BookmarkBarControllerTogglePong : BookmarkBarControllerNoOpen {
 @private
   int toggles_;
 }
 @property (readonly) int toggles;
 @end
 
 @implementation BookmarkBarControllerTogglePong
 
 @synthesize toggles = toggles_;
 
 - (void)frameDidChange {
   toggles_++;
 }
 
 @end
 
 // A BookmarkBarController that always beleives that it's on the new tab page.
-@interface AlwaysNewTabPageBookmarkBarController : BookmarkBarController {
+@interface AlwaysNewTabPageBookmarkBarController : BookmarkBarControllerNoOpen {
 }
 @end
 
 @implementation AlwaysNewTabPageBookmarkBarController
 -(BOOL)isNewTabPage {
   return YES;
 }
 @end
 
 @interface CompressablePong : NSObject<ToolbarCompressable> {
@@ skipping 20 matching lines @@
 
 class BookmarkBarControllerTest : public PlatformTest {
  public:
   BookmarkBarControllerTest() {
     resizeDelegate_.reset([[ViewResizerPong alloc] init]);
     compressDelegate_.reset([[CompressablePong alloc] init]);
     NSRect parent_frame = NSMakeRect(0, 0, 800, 50);
     parent_view_.reset([[NSView alloc] initWithFrame:parent_frame]);
     [parent_view_ setHidden:YES];
     bar_.reset(
-        [[BookmarkBarController alloc] initWithBrowser:helper_.browser()
-                                          initialWidth:NSWidth(parent_frame)
-                                      compressDelegate:compressDelegate_.get()
-                                        resizeDelegate:resizeDelegate_.get()
-                                           urlDelegate:nil]);
+      [[BookmarkBarControllerNoOpen alloc]
+          initWithBrowser:helper_.browser()
+             initialWidth:NSWidth(parent_frame)
+         compressDelegate:compressDelegate_.get()
+           resizeDelegate:resizeDelegate_.get()]);
 
     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 26 matching lines @@
     [cell_ setRepresentedObject:[NSValue valueWithPointer:node]];
     return menu_item_;
   }
 
 
   CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
   scoped_nsobject<NSView> parent_view_;
   BrowserTestHelper helper_;
   scoped_nsobject<ViewResizerPong> resizeDelegate_;
   scoped_nsobject<CompressablePong> compressDelegate_;
-  scoped_nsobject<BookmarkBarController> bar_;
+  scoped_nsobject<BookmarkBarControllerNoOpen> bar_;
   scoped_nsobject<NSMenu> menu_;
   scoped_nsobject<NSMenuItem> menu_item_;
   scoped_nsobject<NSButtonCell> cell_;
   scoped_ptr<BookmarkNode> node_;
 };
 
 TEST_F(BookmarkBarControllerTest, ShowWhenShowBookmarkBarTrue) {
   helper_.profile()->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true);
   [bar_ updateVisibility];
 
@@ skipping 26 matching lines @@
 
 TEST_F(BookmarkBarControllerTest, ShowOnNewTabPage) {
   helper_.profile()->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, false);
 
   scoped_nsobject<BookmarkBarControllerTogglePong> bar;
   bar.reset(
       [[AlwaysNewTabPageBookmarkBarController alloc]
           initWithBrowser:helper_.browser()
              initialWidth:800  // arbitrary
          compressDelegate:compressDelegate_.get()
-           resizeDelegate:resizeDelegate_.get()
-              urlDelegate:nil]);
+           resizeDelegate:resizeDelegate_.get()]);
   InstallAndToggleBar(bar.get());
 
   [bar setBookmarkBarEnabled:NO];
   [bar updateVisibility];
 
   EXPECT_TRUE([bar isVisible]);
   EXPECT_FALSE([[bar view] isHidden]);
   EXPECT_GT([resizeDelegate_ height], 0);
   EXPECT_GT([[bar view] frame].size.height, 0);
 
@@ skipping 25 matching lines @@
 }
 
 // Make sure we're watching for frame change notifications.
 TEST_F(BookmarkBarControllerTest, FrameChangeNotification) {
   scoped_nsobject<BookmarkBarControllerTogglePong> bar;
   bar.reset(
     [[BookmarkBarControllerTogglePong alloc]
           initWithBrowser:helper_.browser()
              initialWidth:100  // arbitrary
          compressDelegate:compressDelegate_.get()
-           resizeDelegate:resizeDelegate_.get()
-              urlDelegate:nil]);
+           resizeDelegate:resizeDelegate_.get()]);
   InstallAndToggleBar(bar.get());
 
   // Send a frame did change notification for the pong's view.
   [[NSNotificationCenter defaultCenter]
     postNotificationName:NSViewFrameDidChangeNotification
                   object:[bar view]];
 
   EXPECT_GT([bar toggles], 0);
 }
 
@@ skipping 82 matching lines @@
   EXPECT_TRUE(submenu);
   EXPECT_EQ(2, [submenu numberOfItems]);
   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_ 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_ setUrlDelegate:nil];
+  EXPECT_EQ(bar_.get()->urls_[0], node->GetURL());
+  EXPECT_EQ(bar_.get()->dispositions_[0], CURRENT_TAB);
 }
 
 // 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_ 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];
+    EXPECT_EQ(bar_.get()->urls_[0], gurl);
+    EXPECT_EQ(bar_.get()->dispositions_[0], dispositions[i]);
+    [bar_ clear];
   }
-  [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 101 matching lines @@
 
   NSMenuItem* item = ItemForBookmarkBarMenu(middle_node);
   [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_ 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(),
                 L"title", GURL("http://two-one.com"));
   model->AddURL(folder, folder->GetChildCount(),
                 L"title", GURL("http://two-two.com"));
   model->AddURL(parent, parent->GetChildCount(),
                 L"title", GURL("https://three.com"));
   [bar_ openAllBookmarks:nil];
 
-  EXPECT_EQ(pong.get()->urls_.size(), 4U);
-  EXPECT_EQ(pong.get()->dispositions_.size(), 4U);
+  EXPECT_EQ(bar_.get()->urls_.size(), 4U);
+  EXPECT_EQ(bar_.get()->dispositions_.size(), 4U);
 
   // I can't use EXPECT_EQ() here since the macro can't expand
   // properly (no way to print the value of an iterator).
   std::vector<GURL>::iterator i;
-  std::vector<GURL>::iterator begin = pong.get()->urls_.begin();
-  std::vector<GURL>::iterator end = pong.get()->urls_.end();
+  std::vector<GURL>::iterator begin = bar_.get()->urls_.begin();
+  std::vector<GURL>::iterator end = bar_.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_ setUrlDelegate:nil];
+  EXPECT_EQ(bar_.get()->dispositions_[3], NEW_BACKGROUND_TAB);
 }
 
 // TODO(jrg): write a test to confirm that nodeFavIconLoaded calls
 // checkForBookmarkButtonGrowth:.
 
 TEST_F(BookmarkBarControllerTest, Cell) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   [bar_ loaded:model];
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
@@ skipping 19 matching lines @@
 TEST_F(BookmarkBarControllerTest, MiddleClick) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   GURL gurl1("http://www.google.com/");
   std::wstring title1(L"x");
   model->SetURLStarred(gurl1, title1, true);
 
   EXPECT_EQ(1U, [[bar_ buttons] count]);
   NSButton* first = [[bar_ buttons] objectAtIndex:0];
   EXPECT_TRUE(first);
 
-  scoped_nsobject<BookmarkURLOpenerPong> pong([[BookmarkURLOpenerPong alloc]
-                                                  init]);
-  [bar_ setUrlDelegate:pong.get()];
   [first otherMouseUp:test_event_utils::MakeMouseEvent(NSOtherMouseUp, 0)];
-  EXPECT_EQ(pong.get()->urls_.size(), 1U);
-  [bar_ setUrlDelegate:nil];
+  EXPECT_EQ(bar_.get()->urls_.size(), 1U);
 }
 
 TEST_F(BookmarkBarControllerTest, TestBuildOffTheSideMenu) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   NSMenu* menu = [bar_ offTheSideMenu];
   ASSERT_TRUE(menu);
 
   // The bookmark bar should start out with nothing.
   EXPECT_EQ(0U, [[bar_ buttons] count]);
 
@@ skipping 93 matching lines @@
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   [bar_ addURLs:nsurls withTitles:nstitles at:NSZeroPoint];
   EXPECT_EQ(3, parent->GetChildCount());
   for (int i = 0; i < parent->GetChildCount(); ++i) {
     EXPECT_EQ(parent->GetChild(i)->GetURL(), GURL(urls[i]));
     EXPECT_EQ(parent->GetChild(i)->GetTitle(), titles[i]);
   }
 }
 
 }  // namespace