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

chrome/browser/ui/cocoa/bookmarks/bookmark_button_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/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #import "ui/base/test/cocoa_test_event_utils.h"
 
 // Fake BookmarkButton delegate to get a pong on mouse entered/exited
 @interface FakeButtonDelegate : NSObject<BookmarkButtonDelegate> {
  @public
@@ skipping 61 matching lines @@
 
   EXPECT_TRUE([button isEmpty]);
   EXPECT_FALSE([button isFolder]);
   EXPECT_FALSE([button bookmarkNode]);
 
   NSEvent* downEvent =
       cocoa_test_event_utils::LeftMouseDownAtPoint(NSMakePoint(10,10));
   // Since this returns (does not actually begin a modal drag), success!
   [button beginDrag:downEvent];
 
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* node = model->bookmark_bar_node();
   [cell setBookmarkNode:node];
   EXPECT_FALSE([button isEmpty]);
   EXPECT_TRUE([button isFolder]);
   EXPECT_EQ([button bookmarkNode], node);
 
   node = model->AddURL(node, 0, ASCIIToUTF16("hi mom"),
                        GURL("http://www.google.com"));
   [cell setBookmarkNode:node];
   EXPECT_FALSE([button isEmpty]);
@@ skipping 32 matching lines @@
   scoped_nsobject<BookmarkButton> button;
   scoped_nsobject<BookmarkButtonCell> cell;
   scoped_nsobject<FakeButtonDelegate>
       delegate([[FakeButtonDelegate alloc] init]);
   button.reset([[BookmarkButton alloc] initWithFrame:NSMakeRect(0,0,500,500)]);
   cell.reset([[BookmarkButtonCell alloc] initTextCell:@"hi mom"]);
   [button setCell:cell];
   [button setDelegate:delegate];
 
   // Add a deletable bookmark to the button.
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* barNode = model->bookmark_bar_node();
   const BookmarkNode* node = model->AddURL(barNode, 0, ASCIIToUTF16("hi mom"),
                                            GURL("http://www.google.com"));
   [cell setBookmarkNode:node];
 
   // Verify that if canDragBookmarkButtonToTrash is NO then the button can't
   // be dragged to the trash.
   delegate.get()->canDragToTrash_ = NO;
   NSDragOperation operation = [button draggingSourceOperationMaskForLocal:NO];
   EXPECT_EQ(0u, operation & NSDragOperationDelete);
@@ skipping 13 matching lines @@
   EXPECT_EQ(0, delegate.get()->didDragToTrashCount_);
   [button draggedImage:nil endedAt:NSZeroPoint operation:NSDragOperationCopy];
   EXPECT_EQ(0, delegate.get()->didDragToTrashCount_);
   [button draggedImage:nil endedAt:NSZeroPoint operation:NSDragOperationMove];
   EXPECT_EQ(0, delegate.get()->didDragToTrashCount_);
   [button draggedImage:nil endedAt:NSZeroPoint operation:NSDragOperationDelete];
   EXPECT_EQ(1, delegate.get()->didDragToTrashCount_);
 }
 
 }