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

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h
index b0a681747c47853148abd278d9ec5bb0ee0049cf..97ebe7ae4bf5bd002dad569d02ca9f8d13dd728e 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h
@@ -16,14 +16,13 @@
   CGFloat dropIndicatorPosition_;  // y position
   // The following |controller_| is weak; used for testing only. See the imple-
   // mentation comment for - (id<BookmarkButtonControllerProtocol>)controller.
-  BookmarkBarFolderController* controller_;
+  id<BookmarkButtonControllerProtocol> controller_;
 }
-// Return the controller that owns this view.
-- (id<BookmarkButtonControllerProtocol>)controller;
+@property(readonly, assign) id<BookmarkButtonControllerProtocol> controller;
 @end
 
 @interface BookmarkBarFolderView()  // TestingOrInternalAPI
 @property(assign) BOOL dropIndicatorShown;
 @property(readonly) CGFloat dropIndicatorPosition;
-- (void)setController:(id)controller;
+@property(assign) id<BookmarkButtonControllerProtocol> controller;
 @end