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

chrome/browser/autocomplete/history_contents_provider.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/autocomplete/history_contents_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/url_util.h"
 #include "net/base/net_util.h"
 
 using base::TimeTicks;
 using history::HistoryDatabase;
 
@@ skipping 39 matching lines @@
 void HistoryContentsProvider::Start(const AutocompleteInput& input,
                                     bool minimal_changes) {
   matches_.clear();
 
   if (input.text().empty() || (input.type() == AutocompleteInput::INVALID) ||
       (input.type() == AutocompleteInput::FORCED_QUERY) ||
       !profile_ ||
       // The history service or bookmark bar model must exist.
       !(HistoryServiceFactory::GetForProfile(profile_,
                                              Profile::EXPLICIT_ACCESS) ||
-        profile_->GetBookmarkModel())) {
+        BookmarkModelFactory::GetForProfile(profile_))) {
     Stop(false);
     return;
   }
 
   // TODO(pkasting): http://b/888148 We disallow URL input and "URL-like" input
   // (REQUESTED_URL or UNKNOWN with dots) because we get poor results for it,
   // but we could get better results if we did better tokenizing instead.
   if ((input.type() == AutocompleteInput::URL) ||
       (((input.type() == AutocompleteInput::REQUESTED_URL) ||
         (input.type() == AutocompleteInput::UNKNOWN)) &&
@@ skipping 130 matching lines @@
       MatchInTitle(result) ?
           AutocompleteMatch::HISTORY_TITLE : AutocompleteMatch::HISTORY_BODY);
   match.contents = StringForURLDisplay(result.url(), true, trim_http_);
   match.fill_into_edit =
       AutocompleteInput::FormattedStringWithEquivalentMeaning(result.url(),
                                                               match.contents);
   match.destination_url = result.url();
   match.contents_class.push_back(
       ACMatchClassification(0, ACMatchClassification::URL));
   match.description = result.title();
-  match.starred =
-      (profile_->GetBookmarkModel() &&
-       profile_->GetBookmarkModel()->IsBookmarked(result.url()));
+  BookmarkModel* bm_model = BookmarkModelFactory::GetForProfile(profile_);
+  match.starred = (bm_model && bm_model->IsBookmarked(result.url()));
 
   ClassifyDescription(result, &match);
   return match;
 }
 
 void HistoryContentsProvider::ClassifyDescription(
     const history::URLResult& result,
     AutocompleteMatch* match) const {
   const Snippet::MatchPositions& title_matches = result.title_match_positions();
 
@@ skipping 13 matching lines @@
   }
   if (offset != result.title().length()) {
     match->description_class.push_back(
         ACMatchClassification(offset, ACMatchClassification::NONE));
   }
 }
 
 int HistoryContentsProvider::CalculateRelevance(
     const history::URLResult& result) {
   const bool in_title = MatchInTitle(result);
-  if (!profile_->GetBookmarkModel() ||
-      !profile_->GetBookmarkModel()->IsBookmarked(result.url()))
+  BookmarkModel* bm_model = BookmarkModelFactory::GetForProfile(profile_);
+  if (!bm_model || !bm_model->IsBookmarked(result.url()))
     return in_title ? (700 + title_count_++) : (500 + contents_count_++);
   return in_title ?
       (1000 + star_title_count_++) : (550 + star_contents_count_++);
 }
 
 void HistoryContentsProvider::QueryBookmarks(const AutocompleteInput& input) {
-  BookmarkModel* bookmark_model = profile_->GetBookmarkModel();
+  BookmarkModel* bookmark_model =
+      BookmarkModelFactory::GetForProfile(profile_);
   if (!bookmark_model)
     return;
 
   DCHECK(results_.empty());
 
   TimeTicks start_time = TimeTicks::Now();
   std::vector<bookmark_utils::TitleMatch> matches;
   bookmark_model->GetBookmarksWithTitlesMatching(input.text(),
                                                  kMaxMatches, &matches);
   for (size_t i = 0; i < matches.size(); ++i)
     AddBookmarkTitleMatchToResults(matches[i]);
   UMA_HISTOGRAM_TIMES("Omnibox.QueryBookmarksTime",
                       TimeTicks::Now() - start_time);
 }
 
 void HistoryContentsProvider::AddBookmarkTitleMatchToResults(
     const bookmark_utils::TitleMatch& match) {
   history::URLResult url_result(match.node->url(), match.match_positions);
   url_result.set_title(match.node->GetTitle());
   results_.AppendURLBySwapping(&url_result);
 }