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

chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc

 // 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 "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h"
 
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 
 BookmarkExpandedStateTracker::BookmarkExpandedStateTracker(
     Profile* profile,
     const char* path,
     BookmarkModel* bookmark_model)
     : profile_(profile),
       pref_path_(path) {
   bookmark_model->AddObserver(this);
 }
 
 BookmarkExpandedStateTracker::~BookmarkExpandedStateTracker() {
 }
 
 void BookmarkExpandedStateTracker::SetExpandedNodes(const Nodes& nodes) {
   UpdatePrefs(nodes);
 }
 
 BookmarkExpandedStateTracker::Nodes
 BookmarkExpandedStateTracker::GetExpandedNodes() {
   Nodes nodes;
-  BookmarkModel* model = profile_->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_);
   if (!model->IsLoaded())
     return nodes;
 
   PrefService* prefs = profile_->GetPrefs();
   if (!prefs)
     return nodes;
 
   const ListValue* value = prefs->GetList(pref_path_);
   if (!value)
     return nodes;
@@ skipping 48 matching lines @@
   if (!profile_->GetPrefs())
     return;
 
   ListValue values;
   for (Nodes::const_iterator i = nodes.begin(); i != nodes.end(); ++i) {
     values.Set(values.GetSize(),
                new StringValue(base::Int64ToString((*i)->id())));
   }
   profile_->GetPrefs()->Set(pref_path_, values);
 }