Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS.

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

 // Copyright (c) 2011 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/memory/scoped_nsobject.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ skipping 33 matching lines @@
 const CGFloat kFakeIndicatorPos = 7.0;
 const NSPoint kPoint = {10, 10};
 
 class BookmarkBarFolderViewTest : public CocoaProfileTest {
  public:
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
 
     view_.reset([[BookmarkBarFolderView alloc] init]);
 
-    mock_controller_.reset(GetMockController(YES,
-                                             profile()->GetBookmarkModel()));
+    mock_controller_.reset(GetMockController(
+        YES, BookmarkModelFactory::GetForProfile(profile())));
 
     mock_button_.reset(GetMockButton(mock_controller_.get()));
     [view_ awakeFromNib];
     [view_ setController:mock_controller_];
   }
 
   virtual void TearDown() {
     [mock_controller_ verify];
     CocoaProfileTest::TearDown();
   }
@@ skipping 37 matching lines @@
      draggingAllowed:OCMOCK_ANY];
     [[[mock_controller stub] andReturnBool:show_indicator]
      shouldShowIndicatorShownForPoint:kPoint];
     [[[mock_controller stub] andReturnFloat:kFakeIndicatorPos]
      indicatorPosForDragToPoint:kPoint];
     [[[mock_controller stub] andReturnValue:OCMOCK_VALUE(model)] bookmarkModel];
     return [mock_controller retain];
   }
 
   id GetMockButton(id mock_controller) {
-    BookmarkModel* bookmark_model = profile()->GetBookmarkModel();
+    BookmarkModel* bookmark_model =
+        BookmarkModelFactory::GetForProfile(profile());
     const BookmarkNode* node =
         bookmark_model->AddURL(bookmark_model->bookmark_bar_node(),
                                0,
                                ASCIIToUTF16("Test Bookmark"),
                                GURL("http://www.exmaple.com"));
 
     id mock_button = [OCMockObject mockForClass:[BookmarkButton class]];
     [[[mock_button stub] andReturnValue:OCMOCK_VALUE(node)] bookmarkNode];
     return [mock_button retain];
   }
@@ skipping 17 matching lines @@
 }
 
 // When dragging bookmarks across profiles, we should always copy, never move.
 TEST_F(BookmarkBarFolderViewTest, BookmarkButtonDragAndDropAcrossProfiles) {
   // |other_profile| is owned by the |testing_profile_manager|.
   TestingProfile* other_profile =
       testing_profile_manager()->CreateTestingProfile("other");
   other_profile->CreateBookmarkModel(true);
   other_profile->BlockUntilBookmarkModelLoaded();
 
-  mock_controller_.reset(GetMockController(YES,
-                                           other_profile->GetBookmarkModel()));
+  mock_controller_.reset(GetMockController(
+      YES, BookmarkModelFactory::GetForProfile(other_profile)));
   [view_ setController:mock_controller_];
 
   id drag_info = GetFakeDragInfoForType(kBookmarkButtonDragType);
   [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
    draggingEntered:drag_info];
   [[[mock_controller_ expect] andReturnBool:NO] dragBookmarkData:drag_info];
   [[[mock_controller_ expect] andReturnBool:YES] dragButton:OCMOCK_ANY
                                                          to:kPoint
                                                        copy:YES];
 
@@ skipping 18 matching lines @@
 }
 
 TEST_F(BookmarkBarFolderViewTest, BookmarkButtonDropIndicator) {
   id drag_info = GetFakeDragInfoForType(kBookmarkButtonDragType);
   [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
    draggingEntered:drag_info];
   EXPECT_EQ([view_ draggingEntered:drag_info], NSDragOperationMove);
   [mock_controller_ verify];
   EXPECT_TRUE([view_ dropIndicatorShown]);
   EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos);
-  mock_controller_.reset(GetMockController(NO, profile()->GetBookmarkModel()));
+  mock_controller_.reset(GetMockController(
+      NO, BookmarkModelFactory::GetForProfile(profile())));
   [view_ setController:mock_controller_];
   [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
    draggingEntered:drag_info];
   EXPECT_EQ([view_ draggingEntered:drag_info], NSDragOperationMove);
   EXPECT_FALSE([view_ dropIndicatorShown]);
 }
 
 }  // namespace