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

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_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/memory/scoped_nsobject.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 "chrome/test/base/test_browser_window.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 class BookmarkEditorBaseControllerTest : public CocoaProfileTest {
  public:
   BookmarkEditorBaseController* controller_;  // weak
   const BookmarkNode* folder_a_;
   const BookmarkNode* folder_b_;
   const BookmarkNode* folder_b_0_;
   const BookmarkNode* folder_b_3_;
   const BookmarkNode* folder_c_;
 
   void CreateModel() {
     // Set up a small bookmark hierarchy, which will look as follows:
     //    a      b      c    d
     //     a-0    b-0    c-0
     //     a-1     b-00  c-1
     //     a-2    b-1    c-2
     //            b-2    c-3
     //            b-3
     //             b-30
     //             b-31
     //            b-4
-    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"));
     folder_b_0_ = model.AddFolder(folder_b_, 0, ASCIIToUTF16("b-0"));
     model.AddURL(folder_b_0_, 0, ASCIIToUTF16("bb-0"), GURL("http://bb-0.com"));
     model.AddURL(folder_b_, 1, ASCIIToUTF16("b-1"), GURL("http://b-1.com"));
@@ skipping 38 matching lines @@
     controller_ = NULL;
     CocoaTest::TearDown();
   }
 
   virtual Browser* CreateBrowser() OVERRIDE {
     return chrome::CreateBrowserWithTestWindowForProfile(profile());
   }
 };
 
 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) {
-  BookmarkModel& model(*(profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(BookmarkModelFactory::GetForProfile(profile())));
   const BookmarkNode& root(*model.bookmark_bar_node());
   EXPECT_EQ(4, root.child_count());
   // a
   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 59 matching lines @@
   EXPECT_TRUE(newFolderInfo);
   NSString* newFolderName = [newFolderInfo folderName];
   EXPECT_NSEQ(expectedName, newFolderName);
   [controller_ createNewFolders];
   // Verify that the tab folder was added to the new folder.
   EXPECT_EQ(3, folder_b_3_->child_count());
   [controller_ cancel:nil];
 }
 
 TEST_F(BookmarkEditorBaseControllerTest, CreateTwoFolders) {
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* bar = model->bookmark_bar_node();
   // Create 2 folders which are children of the bar.
   [controller_ selectTestNodeInBrowser:bar];
   [controller_ newFolder:nil];
   [controller_ selectTestNodeInBrowser:bar];
   [controller_ newFolder:nil];
   // If we do NOT crash on createNewFolders, success!
   // (e.g. http://crbug.com/47877 is fixed).
   [controller_ createNewFolders];
   [controller_ cancel:nil];
 }
 
 TEST_F(BookmarkEditorBaseControllerTest, SelectedFolderDeleted) {
-  BookmarkModel& model(*(profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(BookmarkModelFactory::GetForProfile(profile())));
   [controller_ selectTestNodeInBrowser:folder_b_3_];
   EXPECT_EQ(folder_b_3_, [controller_ selectedNode]);
 
   // Delete the selected node, and verify it's no longer selected:
   model.Remove(folder_b_, 3);
   EXPECT_NE(folder_b_3_, [controller_ selectedNode]);
 
   [controller_ cancel:nil];
 }
 
 TEST_F(BookmarkEditorBaseControllerTest, SelectedFoldersParentDeleted) {
-  BookmarkModel& model(*(profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(BookmarkModelFactory::GetForProfile(profile())));
   const BookmarkNode* root = model.bookmark_bar_node();
   [controller_ selectTestNodeInBrowser:folder_b_3_];
   EXPECT_EQ(folder_b_3_, [controller_ selectedNode]);
 
   // Delete the selected node's parent, and verify it's no longer selected:
   model.Remove(root, 1);
   EXPECT_NE(folder_b_3_, [controller_ selectedNode]);
 
   [controller_ cancel:nil];
 }
 
 TEST_F(BookmarkEditorBaseControllerTest, FolderAdded) {
-  BookmarkModel& model(*(profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(BookmarkModelFactory::GetForProfile(profile())));
   const BookmarkNode* root = model.bookmark_bar_node();
 
   // Add a folder node to the model, and verify it can be selected in the tree:
   const BookmarkNode* folder_added = model.AddFolder(
       root, 0, ASCIIToUTF16("added"));
   [controller_ selectTestNodeInBrowser:folder_added];
   EXPECT_EQ(folder_added, [controller_ selectedNode]);
 
   [controller_ cancel:nil];
 }
 
 // Verifies expandeNodes and getExpandedNodes.
 TEST_F(BookmarkEditorBaseControllerTest, ExpandedState) {
-  BookmarkModel& model(*(profile()->GetBookmarkModel()));
+  BookmarkModel& model(*(BookmarkModelFactory::GetForProfile(profile())));
 
   // Sets up the state we're going to expand.
   BookmarkExpandedStateTracker::Nodes nodes;
   nodes.insert(model.bookmark_bar_node());
   nodes.insert(folder_b_);
   nodes.insert(folder_c_);
 
   // Initial state shouldn't match expected state, otherwise this test isn't
   // really going to test anything.
   BookmarkExpandedStateTracker::Nodes actual = [controller_ getExpandedNodes];
@@ skipping 17 matching lines @@
       reinterpret_cast<const BookmarkNode*>(&children);
   BookmarkFolderInfo* info =
     [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:@"name"
                                               folderNode:fakeNode
                                                 children:children];
   EXPECT_TRUE(info);
   EXPECT_EQ([info folderName], @"name");
   EXPECT_EQ([info children], children);
   EXPECT_EQ([info folderNode], fakeNode);
 }