[Mac] Remove no-op method in bookmark bar controller

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm

 // Copyright (c) 2012 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/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 13 matching lines @@
 typedef std::pair<GURL,WindowOpenDisposition> OpenInfo;
 
 }  // The namespace must end here -- I need to use OpenInfo in
    // FakeBookmarkBarController but can't place
    // FakeBookmarkBarController itself in the namespace ("error:
    // Objective-C declarations may only appear in global scope")
 
 // Oddly, we are our own delegate.
 @interface FakeBookmarkBarController : BookmarkBarController {
  @public
-  base::scoped_nsobject<NSMutableArray> callbacks_;
+  std::vector<SEL> called_selectors_;
   std::vector<OpenInfo> opens_;
 }
 @end
 
 @implementation FakeBookmarkBarController
 
-- (id)initWithBrowser:(Browser*)browser {
-  if ((self = [super initWithBrowser:browser
-                        initialWidth:100  // arbitrary
-                            delegate:nil])) {
-    callbacks_.reset([[NSMutableArray alloc] init]);
-  }
-  return self;
-}
-
 - (void)loaded:(BookmarkModel*)model {
-  [callbacks_ addObject:[NSNumber numberWithInt:0]];
-}
-
-- (void)beingDeleted:(BookmarkModel*)model {
-  [callbacks_ addObject:[NSNumber numberWithInt:1]];
+  called_selectors_.push_back(_cmd);
 }
 
 - (void)nodeMoved:(BookmarkModel*)model
         oldParent:(const BookmarkNode*)oldParent oldIndex:(int)oldIndex
         newParent:(const BookmarkNode*)newParent newIndex:(int)newIndex {
-  [callbacks_ addObject:[NSNumber numberWithInt:2]];
+  called_selectors_.push_back(_cmd);
 }
 
 - (void)nodeAdded:(BookmarkModel*)model
            parent:(const BookmarkNode*)oldParent index:(int)index {
-  [callbacks_ addObject:[NSNumber numberWithInt:3]];
+  called_selectors_.push_back(_cmd);
 }
 
 - (void)nodeChanged:(BookmarkModel*)model
                node:(const BookmarkNode*)node {
-  [callbacks_ addObject:[NSNumber numberWithInt:4]];
+  called_selectors_.push_back(_cmd);
 }
 
 - (void)nodeFaviconLoaded:(BookmarkModel*)model
                      node:(const BookmarkNode*)node {
-  [callbacks_ addObject:[NSNumber numberWithInt:5]];
+  called_selectors_.push_back(_cmd);
 }
 
 - (void)nodeChildrenReordered:(BookmarkModel*)model
                          node:(const BookmarkNode*)node {
-  [callbacks_ addObject:[NSNumber numberWithInt:6]];
+  called_selectors_.push_back(_cmd);
 }
 
 - (void)nodeRemoved:(BookmarkModel*)model
              parent:(const BookmarkNode*)oldParent index:(int)index {
-  [callbacks_ addObject:[NSNumber numberWithInt:7]];
+  called_selectors_.push_back(_cmd);
 }
 
 // Save the request.
 - (void)openBookmarkURL:(const GURL&)url
             disposition:(WindowOpenDisposition)disposition {
   opens_.push_back(OpenInfo(url, disposition));
 }
 
 @end
 
 
 class BookmarkBarBridgeTest : public CocoaProfileTest {
 };
 
 // Call all the callbacks; make sure they are all redirected to the objc object.
 TEST_F(BookmarkBarBridgeTest, TestRedirect) {
   BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
 
   base::scoped_nsobject<NSView> parentView(
       [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
   base::scoped_nsobject<NSView> webView(
       [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
   base::scoped_nsobject<NSView> infoBarsView(
       [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
 
   base::scoped_nsobject<FakeBookmarkBarController> controller(
-      [[FakeBookmarkBarController alloc] initWithBrowser:browser()]);
+      [[FakeBookmarkBarController alloc] initWithBrowser:browser()
+                                            initialWidth:100  // arbitrary
+                                                delegate:nil]);
   EXPECT_TRUE(controller.get());
   std::unique_ptr<BookmarkBarBridge> bridge(
       new BookmarkBarBridge(profile(), controller.get(), model));
   EXPECT_TRUE(bridge.get());
 
   bridge->BookmarkModelLoaded(NULL, false);
-  bridge->BookmarkModelBeingDeleted(NULL);
+  // |BookmarkModelBeingDeleted| is a no-op.
   bridge->BookmarkNodeMoved(NULL, NULL, 0, NULL, 0);
   bridge->BookmarkNodeAdded(NULL, NULL, 0);
   bridge->BookmarkNodeChanged(NULL, NULL);
   bridge->BookmarkNodeFaviconChanged(NULL, NULL);
   bridge->BookmarkNodeChildrenReordered(NULL, NULL);
   bridge->BookmarkNodeRemoved(NULL, NULL, 0, NULL, std::set<GURL>());
-
-  // 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_NSEQ(num, [controller.get()->callbacks_ objectAtIndex:x]);
-  }
+  // 7 calls above plus an initial Loaded() in init routine makes 8.
+  EXPECT_EQ(controller.get()->called_selectors_.size(), 8U);
+  std::vector<SEL> expected_selectors = {
+    @selector(loaded:),  // initial from init
+    @selector(loaded:),
+    @selector(nodeMoved:oldParent:oldIndex:newParent:newIndex:),
+    @selector(nodeAdded:parent:index:),
+    @selector(nodeChanged:node:),
+    @selector(nodeFaviconLoaded:node:),
+    @selector(nodeChildrenReordered:node:),
+    @selector(nodeRemoved:parent:index:)
+  };
+  EXPECT_EQ(controller.get()->called_selectors_, expected_selectors);
 }