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

chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_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/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_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "grit/ui_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/mac/nsimage_cache.h"
@@ skipping 70 matching lines @@
 
 // Make sure the default from the base class is overridden.
 TEST_F(BookmarkButtonCellTest, MouseEnterStuff) {
   scoped_nsobject<BookmarkButtonCell> cell(
       [[BookmarkButtonCell alloc] initTextCell:@"Testing"]);
   // Setting the menu should have no affect since we either share or
   // dynamically compose the menu given a node.
   [cell setMenu:[[[BookmarkMenu alloc] initWithTitle:@"foo"] autorelease]];
   EXPECT_FALSE([cell menu]);
 
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* node = model->bookmark_bar_node();
   [cell setEmpty:NO];
   [cell setBookmarkNode:node];
   EXPECT_TRUE([cell showsBorderOnlyWhileMouseInside]);
   EXPECT_TRUE([cell menu]);
 
   [cell setEmpty:YES];
   EXPECT_FALSE([cell.get() showsBorderOnlyWhileMouseInside]);
   EXPECT_FALSE([cell menu]);
 }
 
 TEST_F(BookmarkButtonCellTest, BookmarkNode) {
-  BookmarkModel& model(*(profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(BookmarkModelFactory::GetForProfile(profile())));
   scoped_nsobject<BookmarkButtonCell> cell(
       [[BookmarkButtonCell alloc] initTextCell:@"Testing"]);
 
   const BookmarkNode* node = model.bookmark_bar_node();
   [cell setBookmarkNode:node];
   EXPECT_EQ(node, [cell bookmarkNode]);
 
   node = model.other_node();
   [cell setBookmarkNode:node];
   EXPECT_EQ(node, [cell bookmarkNode]);
@@ skipping 28 matching lines @@
 
 // Confirms a cell created in a nib is initialized properly
 TEST_F(BookmarkButtonCellTest, Awake) {
   scoped_nsobject<BookmarkButtonCell> cell([[BookmarkButtonCell alloc] init]);
   [cell awakeFromNib];
   EXPECT_EQ(NSLeftTextAlignment, [cell alignment]);
 }
 
 // Subfolder arrow details.
 TEST_F(BookmarkButtonCellTest, FolderArrow) {
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* bar = model->bookmark_bar_node();
   const BookmarkNode* node = model->AddURL(bar, bar->child_count(),
                                            ASCIIToUTF16("title"),
                                            GURL("http://www.google.com"));
   scoped_nsobject<BookmarkButtonCell> cell(
     [[BookmarkButtonCell alloc] initForNode:node
                                 contextMenu:nil
                                    cellText:@"small"
                                   cellImage:nil]);
   EXPECT_TRUE(cell.get());
 
   NSSize size = [cell cellSize];
   // sanity check
   EXPECT_GE(size.width, 2);
   EXPECT_GE(size.height, 2);
 
   // Once we turn on arrow drawing make sure there is now room for it.
   [cell setDrawFolderArrow:YES];
   NSSize arrowSize = [cell cellSize];
   EXPECT_GT(arrowSize.width, size.width);
 }
 
 TEST_F(BookmarkButtonCellTest, VerticalTextOffset) {
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* bar = model->bookmark_bar_node();
   const BookmarkNode* node = model->AddURL(bar, bar->child_count(),
                                            ASCIIToUTF16("title"),
                                            GURL("http://www.google.com"));
 
   scoped_nsobject<GradientButtonCell> gradient_cell(
       [[GradientButtonCell alloc] initTextCell:@"Testing"]);
   scoped_nsobject<BookmarkButtonCell> bookmark_cell(
       [[BookmarkButtonCell alloc] initForNode:node
                                   contextMenu:nil
                                      cellText:@"small"
                                     cellImage:nil]);
 
   ASSERT_TRUE(gradient_cell.get());
   ASSERT_TRUE(bookmark_cell.get());
 
   EXPECT_EQ(1, [gradient_cell verticalTextOffset]);
   EXPECT_EQ(0, [bookmark_cell verticalTextOffset]);
 
   EXPECT_NE([bookmark_cell verticalTextOffset],
             [gradient_cell verticalTextOffset]);
 }
 
 }  // namespace