bookmarks: Remove Profile getter accessor from BookmarkModel.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_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 "base/basictypes.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #import "chrome/browser/ui/cocoa/animation_utils.h"
@@ skipping 191 matching lines @@
     return kLotsOfNodesCount;
   }
 
   // Return a simple BookmarkBarFolderController.
   BookmarkBarFolderControllerPong* SimpleBookmarkBarFolderController() {
     BookmarkButton* parentButton = [[bar_ buttons] objectAtIndex:0];
     BookmarkBarFolderControllerPong* c =
       [[BookmarkBarFolderControllerPong alloc]
                initWithParentButton:parentButton
                    parentController:nil
-                      barController:bar_];
+                      barController:bar_
+                            profile:profile()];
     [c window];  // Force nib load.
     return c;
   }
 };
 
 TEST_F(BookmarkBarFolderControllerTest, InitCreateAndDelete) {
   scoped_nsobject<BookmarkBarFolderController> bbfc;
   bbfc.reset(SimpleBookmarkBarFolderController());
 
   // Make sure none of the buttons overlap, that all are inside
@@ skipping 37 matching lines @@
 
 TEST_F(BookmarkBarFolderControllerTest, BasicPosition) {
   BookmarkButton* parentButton = [[bar_ buttons] objectAtIndex:0];
   EXPECT_TRUE(parentButton);
 
   // If parent is a BookmarkBarController, grow down.
   scoped_nsobject<BookmarkBarFolderController> bbfc;
   bbfc.reset([[BookmarkBarFolderController alloc]
                initWithParentButton:parentButton
                    parentController:nil
-                      barController:bar_]);
+                      barController:bar_
+                            profile:profile()]);
   [bbfc window];
   NSPoint pt = [bbfc windowTopLeftForWidth:0 height:100];  // screen coords
   NSPoint buttonOriginInWindow =
       [parentButton convertRect:[parentButton bounds]
                          toView:nil].origin;
   NSPoint buttonOriginInScreen =
       [[parentButton window] convertBaseToScreen:buttonOriginInWindow];
   // Within margin
   EXPECT_LE(abs(pt.x - buttonOriginInScreen.x),
             bookmarks::kBookmarkMenuOverlap + 1);
   EXPECT_LE(abs(pt.y - buttonOriginInScreen.y),
             bookmarks::kBookmarkMenuOverlap + 1);
 
   // Make sure we see the window shift left if it spills off the screen
   pt = [bbfc windowTopLeftForWidth:0 height:100];
   NSPoint shifted = [bbfc windowTopLeftForWidth:9999999 height:100];
   EXPECT_LT(shifted.x, pt.x);
 
   // If parent is a BookmarkBarFolderController, grow right.
   scoped_nsobject<BookmarkBarFolderController> bbfc2;
   bbfc2.reset([[BookmarkBarFolderController alloc]
                 initWithParentButton:[[bbfc buttons] objectAtIndex:0]
                     parentController:bbfc.get()
-                       barController:bar_]);
+                       barController:bar_
+                             profile:profile()]);
   [bbfc2 window];
   pt = [bbfc2 windowTopLeftForWidth:0 height:100];
   // We're now overlapping the window a bit.
   EXPECT_EQ(pt.x, NSMaxX([[bbfc.get() window] frame]) -
             bookmarks::kBookmarkMenuOverlap);
 }
 
 // Confirm we grow right until end of screen, then start growing left
 // until end of screen again, then right.
 TEST_F(BookmarkBarFolderControllerTest, PositionRightLeftRight) {
@@ skipping 15 matching lines @@
   EXPECT_TRUE(parentButton);
 
   // Open them all.
   scoped_nsobject<NSMutableArray> folder_controller_array;
   folder_controller_array.reset([[NSMutableArray array] retain]);
   for (i=0; i<count; i++) {
     BookmarkBarFolderControllerNoLevel* bbfcl =
         [[BookmarkBarFolderControllerNoLevel alloc]
           initWithParentButton:parentButton
               parentController:parentController
-                 barController:bar_];
+                 barController:bar_
+                       profile:profile()];
     [folder_controller_array addObject:bbfcl];
     [bbfcl autorelease];
     [bbfcl window];
     parentController = bbfcl;
     parentButton = [[bbfcl buttons] objectAtIndex:0];
   }
 
   // Make vector of all x positions.
   std::vector<CGFloat> leftPositions;
   for (i=0; i<count; i++) {
@@ skipping 968 matching lines @@
 @interface BookmarkBarFolderControllerDragData : BookmarkBarFolderController {
   const BookmarkNode* dragDataNode_;  // Weak
 }
 - (void)setDragDataNode:(const BookmarkNode*)node;
 @end
 
 @implementation BookmarkBarFolderControllerDragData
 
 - (id)initWithParentButton:(BookmarkButton*)button
           parentController:(BookmarkBarFolderController*)parentController
-             barController:(BookmarkBarController*)barController {
+             barController:(BookmarkBarController*)barController
+                   profile:(Profile*)profile {
   if ((self = [super initWithParentButton:button
                          parentController:parentController
-                            barController:barController])) {
+                            barController:barController
+                                  profile:profile])) {
     dragDataNode_ = NULL;
   }
   return self;
 }
 
 - (void)setDragDataNode:(const BookmarkNode*)node {
   dragDataNode_ = node;
 }
 
 - (std::vector<const BookmarkNode*>)retrieveBookmarkNodeData {
@@ skipping 22 matching lines @@
   EXPECT_EQ(model_string, actual);
   actual = model_test_utils::ModelStringFromNode(other);
   EXPECT_EQ(other_string, actual);
 
   // Pop open a folder.
   BookmarkButton* button = [bar_ buttonWithTitleEqualTo:@"2f"];
   scoped_nsobject<BookmarkBarFolderControllerDragData> folderController;
   folderController.reset([[BookmarkBarFolderControllerDragData alloc]
                           initWithParentButton:button
                               parentController:nil
-                                 barController:bar_]);
+                                 barController:bar_
+                                       profile:profile()]);
   BookmarkButton* targetButton =
       [folderController buttonWithTitleEqualTo:@"2f1b"];
   ASSERT_TRUE(targetButton);
 
   // Gen up some dragging data.
   const BookmarkNode* newNode = other->GetChild(2);
   [folderController setDragDataNode:newNode];
   scoped_nsobject<FakedDragInfo> dragInfo([[FakedDragInfo alloc] init]);
   [dragInfo setDropLocation:[targetButton top]];
   [folderController dragBookmarkData:(id<NSDraggingInfo>)dragInfo.get()];
@@ skipping 37 matching lines @@
 
   const BookmarkNode* folderNode = root->GetChild(1);
   int oldFolderChildCount = folderNode->child_count();
 
   // Pop open a folder.
   BookmarkButton* button = [bar_ buttonWithTitleEqualTo:@"2f"];
   scoped_nsobject<BookmarkBarFolderControllerDragData> folderController;
   folderController.reset([[BookmarkBarFolderControllerDragData alloc]
                           initWithParentButton:button
                               parentController:nil
-                                 barController:bar_]);
+                                 barController:bar_
+                                       profile:profile()]);
 
   // Drag a button to the trash.
   BookmarkButton* buttonToDelete =
       [folderController buttonWithTitleEqualTo:@"2f1b"];
   ASSERT_TRUE(buttonToDelete);
   EXPECT_TRUE([folderController canDragBookmarkButtonToTrash:buttonToDelete]);
   [folderController didDragBookmarkToTrash:buttonToDelete];
 
   // There should be one less button in the folder.
   int newFolderChildCount = folderNode->child_count();
@@ skipping 142 matching lines @@
   DeleteBookmark([folder parentButton], profile());
   EXPECT_FALSE([folder folderController]);
 }
 
 // TODO(jrg): draggingEntered: and draggingExited: trigger timers so
 // they are hard to test.  Factor out "fire timers" into routines
 // which can be overridden to fire immediately to make behavior
 // confirmable.
 // There is a similar problem with mouseEnteredButton: and
 // mouseExitedButton:.