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

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/string16.h"
 #include "base/sys_string_conversions.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_editor_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 class BookmarkEditorControllerTest : public CocoaProfileTest {
  public:
   const BookmarkNode* default_node_;
   const BookmarkNode* default_parent_;
   const char* default_name_;
   string16 default_title_;
   BookmarkEditorController* controller_;
 
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
-    BookmarkModel* model = profile()->GetBookmarkModel();
+    BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
     default_parent_ = model->bookmark_bar_node();
     default_name_ = "http://www.zim-bop-a-dee.com/";
     default_title_ = ASCIIToUTF16("ooh title");
     const BookmarkNode* default_node = model->AddURL(default_parent_, 0,
                                                      default_title_,
                                                      GURL(default_name_));
     controller_ = [[BookmarkEditorController alloc]
                    initWithParentWindow:test_window()
                                 profile:profile()
                                  parent:default_parent_
@@ skipping 42 matching lines @@
   [controller_ setDisplayURL:@"x"];
   [controller_ ok:nil];
   ASSERT_EQ(default_parent_->child_count(), 1);
   const BookmarkNode* child = default_parent_->GetChild(0);
   EXPECT_TRUE(child->url().is_valid());
 }
 
 TEST_F(BookmarkEditorControllerTest, NodeDeleted) {
   // Delete the bookmark being edited and verify the sheet cancels itself:
   ASSERT_TRUE([test_window() attachedSheet]);
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   model->Remove(default_parent_, 0);
   ASSERT_FALSE([test_window() attachedSheet]);
 }
 
 TEST_F(BookmarkEditorControllerTest, EditAndConfirmOKButton) {
   // Confirm OK button enabled/disabled as appropriate:
   // First test the URL.
   EXPECT_TRUE([controller_ okButtonEnabled]);
   [controller_ setDisplayURL:@""];
   EXPECT_FALSE([controller_ okButtonEnabled]);
@@ skipping 30 matching lines @@
 }
 
 class BookmarkEditorControllerNoNodeTest : public CocoaProfileTest {
  public:
   BookmarkEditorController* controller_;
 
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
-    BookmarkModel* model = profile()->GetBookmarkModel();
+    BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
     const BookmarkNode* parent = model->bookmark_bar_node();
     controller_ = [[BookmarkEditorController alloc]
                    initWithParentWindow:test_window()
                                 profile:profile()
                                  parent:parent
                                    node:NULL
                                     url:GURL()
                                   title:string16()
                           configuration:BookmarkEditor::NO_TREE];
 
@@ skipping 16 matching lines @@
 class BookmarkEditorControllerYesNodeTest : public CocoaProfileTest {
  public:
   string16 default_title_;
   const char* url_name_;
   BookmarkEditorController* controller_;
 
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
-    BookmarkModel* model = profile()->GetBookmarkModel();
+    BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
     const BookmarkNode* parent = model->bookmark_bar_node();
     default_title_ = ASCIIToUTF16("wooh title");
     url_name_ = "http://www.zoom-baby-doo-da.com/";
     const BookmarkNode* node = model->AddURL(parent, 0, default_title_,
                                              GURL(url_name_));
     controller_ = [[BookmarkEditorController alloc]
                    initWithParentWindow:test_window()
                                 profile:profile()
                                  parent:parent
                                    node:node
@@ skipping 35 matching lines @@
     // Set up a small bookmark hierarchy, which will look as follows:
     //    a      b      c    d
     //     a-0    b-0    c-0
     //     a-1     bb-0  c-1
     //     a-2     bb-1  c-2
     //             bb-2
     //             bb-3
     //             bb-4
     //            b-1
     //            b-2
-    BookmarkModel& model(*(profile()->GetBookmarkModel()));
+    BookmarkModel& model(*(BookmarkModelFactory::GetForProfile(profile())));
     const BookmarkNode* root = model.bookmark_bar_node();
     folder_a_ = model.AddFolder(root, 0, ASCIIToUTF16("a"));
     model.AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com"));
     model.AddURL(folder_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com"));
     model.AddURL(folder_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com"));
 
     folder_b_ = model.AddFolder(root, 1, ASCIIToUTF16("b"));
     model.AddURL(folder_b_, 0, ASCIIToUTF16("b-0"), GURL("http://b-0.com"));
     folder_bb_ = model.AddFolder(folder_b_, 1, ASCIIToUTF16("bb"));
     model.AddURL(folder_bb_, 0, ASCIIToUTF16("bb-0"), GURL("http://bb-0.com"));
@@ skipping 45 matching lines @@
     CocoaProfileTest::TearDown();
   }
 
   // After changing a node, pointers to the node may be invalid.  This
   // is because the node itself may not be updated; it may removed and
   // a new one is added in that location.  (Implementation detail of
   // BookmarkEditorController).  This method updates the class's
   // bookmark_bb_3_ so that it points to the new node for testing.
   void UpdateBB3() {
     std::vector<const BookmarkNode*> nodes;
-    BookmarkModel* model = profile()->GetBookmarkModel();
+    BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
     model->GetNodesByURL(bb3_url_1_, &nodes);
     if (nodes.empty())
       model->GetNodesByURL(bb3_url_2_, &nodes);
     DCHECK(nodes.size());
     bookmark_bb_3_ = nodes[0];
   }
 
 };
 
 TEST_F(BookmarkEditorControllerTreeTest, VerifyBookmarkTestModel) {
-  BookmarkModel& model(*(profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(BookmarkModelFactory::GetForProfile(profile())));
   model.root_node();
   const BookmarkNode& root(*model.bookmark_bar_node());
   EXPECT_EQ(4, root.child_count());
   const BookmarkNode* child = root.GetChild(0);
   EXPECT_EQ(3, child->child_count());
   const BookmarkNode* subchild = child->GetChild(0);
   EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(1);
   EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(2);
@@ skipping 105 matching lines @@
 
 TEST_F(BookmarkEditorControllerTreeNoNodeTest, NewBookmarkNoNode) {
   [controller_ setDisplayName:@"NEW BOOKMARK"];
   [controller_ setDisplayURL:@"http://NEWURL.com"];
   [controller_ ok:nil];
   const BookmarkNode* new_node = folder_bb_->GetChild(5);
   ASSERT_EQ(0, new_node->child_count());
   EXPECT_EQ(new_node->GetTitle(), ASCIIToUTF16("NEW BOOKMARK"));
   EXPECT_EQ(new_node->url(), GURL("http://NEWURL.com"));
 }