Renames BoomarkBarModel to BookmarkModel.

chrome/browser/autocomplete/history_contents_provider.cc

 // Copyright (c) 2006-2008 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/histogram.h"
 #include "base/string_util.h"
 #include "chrome/browser/history/query_parser.h"
 #include "chrome/browser/profile.h"
@@ skipping 27 matching lines @@
 using history::HistoryDatabase;
 
 void HistoryContentsProvider::Start(const AutocompleteInput& input,
                                     bool minimal_changes,
                                     bool synchronous_only) {
   matches_.clear();
 
   if (input.text().empty() || (input.type() == AutocompleteInput::INVALID) ||
       // The history service or bookmark bar model must exist.
       !(profile_->GetHistoryService(Profile::EXPLICIT_ACCESS) ||
-        profile_->GetBookmarkBarModel())) {
+        profile_->GetBookmarkModel())) {
     Stop();
     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 125 matching lines @@
   // TODO(sky): if matched title highlight matching words in title.
   // Also show star in popup.
   AutocompleteMatch match(this, score, false);
   match.fill_into_edit = StringForURLDisplay(result.url(), true);
   match.destination_url = UTF8ToWide(result.url().spec());
   match.contents = match.fill_into_edit;
   match.contents_class.push_back(
       ACMatchClassification(0, ACMatchClassification::URL));
   match.description = result.title();
   match.starred =
-      (profile_->GetBookmarkBarModel() &&
-       profile_->GetBookmarkBarModel()->IsBookmarked(result.url()));
+      (profile_->GetBookmarkModel() &&
+       profile_->GetBookmarkModel()->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 14 matching lines @@
   if (offset != result.title().size()) {
     match->description_class.push_back(
         ACMatchClassification(offset, ACMatchClassification::NONE));
   }
 }
 
 int HistoryContentsProvider::CalculateRelevance(
     const history::URLResult& result) {
   bool in_title = !!result.title_match_positions().size();
   bool is_starred =
-      (profile_->GetBookmarkBarModel() &&
-       profile_->GetBookmarkBarModel()->IsBookmarked(result.url()));
+      (profile_->GetBookmarkModel() &&
+       profile_->GetBookmarkModel()->IsBookmarked(result.url()));
 
   switch (input_type_) {
     case AutocompleteInput::UNKNOWN:
     case AutocompleteInput::REQUESTED_URL:
       if (is_starred) {
         return in_title ? 1000 + star_title_count_++ :
                           550 + star_contents_count_++;
       } else {
         return in_title ? 700 + title_count_++ :
                           500 + contents_count_++;
       }
 
     case AutocompleteInput::QUERY:
     case AutocompleteInput::FORCED_QUERY:
       if (is_starred) {
         return in_title ? 1200 + star_title_count_++ :
                           750 + star_contents_count_++;
       } else {
         return in_title ? 900 + title_count_++ :
                           700 + contents_count_++;
       }
 
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 void HistoryContentsProvider::QueryBookmarks(const AutocompleteInput& input) {
-  BookmarkBarModel* bookmark_model = profile_->GetBookmarkBarModel();
+  BookmarkModel* bookmark_model = profile_->GetBookmarkModel();
   if (!bookmark_model)
     return;
 
   DCHECK(results_.size() == 0);  // When we get here the results should be
                                  // empty.
 
   TimeTicks start_time = TimeTicks::Now();
-  std::vector<BookmarkBarModel::TitleMatch> matches;
+  std::vector<BookmarkModel::TitleMatch> matches;
   bookmark_model->GetBookmarksMatchingText(input.text(), kMaxMatchCount,
                                            &matches);
   for (size_t i = 0; i < matches.size(); ++i)
     AddBookmarkTitleMatchToResults(matches[i]);
   UMA_HISTOGRAM_TIMES(L"Omnibox.QueryBookmarksTime",
                       TimeTicks::Now() - start_time);
 }
 
 void HistoryContentsProvider::AddBookmarkTitleMatchToResults(
-    const BookmarkBarModel::TitleMatch& match) {
+    const BookmarkModel::TitleMatch& match) {
   history::URLResult url_result(match.node->GetURL(), match.match_positions);
   url_result.set_title(match.node->GetTitle());
   results_.AppendURLBySwapping(&url_result);
 }