Clean up bookmark_bar_folder_view testing. Specifically get it working with OCMock.

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

 // Copyright (c) 2010 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 "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"
 
 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #include "content/browser/user_metrics.h"
 
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 
 @implementation BookmarkBarFolderView
 
 @synthesize dropIndicatorShown = dropIndicatorShown_;
 @synthesize dropIndicatorPosition = dropIndicatorPosition_;
+@synthesize controller = controller_;
 
 - (void)awakeFromNib {
   NSArray* types = [NSArray arrayWithObjects:
                     NSStringPboardType,
                     NSHTMLPboardType,
                     NSURLPboardType,
                     kBookmarkButtonDragType,
                     kBookmarkDictionaryListPboardType,
                     nil];
   [self registerForDraggedTypes:types];
 }
 
 - (void)dealloc {
   [self unregisterDraggedTypes];
   [super dealloc];
 }
 
-- (id<BookmarkButtonControllerProtocol>)controller {
+- (BookmarkBarFolderController*)controller {
   // When needed for testing, set the local data member |controller_| to
   // the test controller.
   return controller_ ? controller_ : [[self window] windowController];
 }
 
-- (void)setController:(id)controller {
-  controller_ = controller;
-}
-
 - (void)drawRect:(NSRect)rect {
   // TODO(jrg): copied from bookmark_bar_view but orientation changed.
   // Code dup sucks but I'm not sure I can take 16 lines and make it
   // generic for horiz vs vertical while keeping things simple.
   // TODO(jrg): when throwing it all away and using animations, try
   // hard to make a common routine for both.
   // http://crbug.com/35966, http://crbug.com/35968
 
   // Draw the bookmark-button-dragging drop indicator if necessary.
   if (dropIndicatorShown_) {
@@ skipping 143 matching lines @@
   NSPasteboard* pboard = [info draggingPasteboard];
   if ([pboard dataForType:kBookmarkButtonDragType] &&
       [self performDragOperationForBookmarkButton:info])
     return YES;
   if ([pboard containsURLData] && [self performDragOperationForURL:info])
     return YES;
   return NO;
 }
 
 @end