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

chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc

 // 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 "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 class BookmarkExpandedStateTrackerTest : public testing::Test {
  public:
   BookmarkExpandedStateTrackerTest();
 
@@ skipping 17 matching lines @@
       file_thread_(BrowserThread::FILE, &message_loop_) {
 }
 
 void BookmarkExpandedStateTrackerTest::SetUp() {
   profile_.reset(new TestingProfile);
   profile_->CreateBookmarkModel(true);
   profile_->BlockUntilBookmarkModelLoaded();
 }
 
 BookmarkModel* BookmarkExpandedStateTrackerTest::GetModel() {
-  return profile_->GetBookmarkModel();
+  return BookmarkModelFactory::GetForProfile(profile_.get());
 }
 
 void BookmarkExpandedStateTrackerTest::TearDown() {
   profile_.reset(NULL);
 }
 
 // Various assertions for SetExpandedNodes.
 TEST_F(BookmarkExpandedStateTrackerTest, SetExpandedNodes) {
   BookmarkModel* model = GetModel();
   BookmarkExpandedStateTracker* tracker = model->expanded_state_tracker();
@@ skipping 12 matching lines @@
   nodes.insert(n1);
   tracker->SetExpandedNodes(nodes);
   EXPECT_EQ(nodes, tracker->GetExpandedNodes());
 
   // Remove the folder, which should remove it from the list of expanded nodes.
   model->Remove(model->bookmark_bar_node(), 0);
   nodes.erase(n1);
   n1 = NULL;
   EXPECT_EQ(nodes, tracker->GetExpandedNodes());
 }