Renames BoomarkBarModel to BookmarkModel.

chrome/browser/autocomplete/autocomplete.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 <algorithm>
 
 #include "chrome/browser/autocomplete/autocomplete.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/autocomplete/history_contents_provider.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/autocomplete/search_provider.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/history_tab_ui.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/url_fixer_upper.h"
 #include "chrome/common/gfx/url_elider.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "googleurl/src/url_canon_ip.h"
 #include "net/base/net_util.h"
@@ skipping 362 matching lines @@
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) :
       std::wstring());
 }
 
 void AutocompleteProvider::UpdateStarredStateOfMatches() {
   if (matches_.empty())
     return;
 
   if (!profile_)
     return;
-  BookmarkBarModel* bookmark_bar_model = profile_->GetBookmarkBarModel();
-  if (!bookmark_bar_model || !bookmark_bar_model->IsLoaded())
+  BookmarkModel* bookmark_model = profile_->GetBookmarkModel();
+  if (!bookmark_model || !bookmark_model->IsLoaded())
     return;
 
   for (ACMatches::iterator i = matches_.begin(); i != matches_.end(); ++i)
-    i->starred = bookmark_bar_model->IsBookmarked(GURL(i->destination_url));
+    i->starred = bookmark_model->IsBookmarked(GURL(i->destination_url));
 }
 
 // AutocompleteResult ---------------------------------------------------------
 
 // static
 size_t AutocompleteResult::max_matches_ = 6;
 
 void AutocompleteResult::Selection::Clear() {
   destination_url.clear();
   provider_affinity = NULL;
@@ skipping 323 matching lines @@
         ACMatchClassification(keyword_offset + input_.text().size(),
                               ACMatchClassification::NONE));
   }
   match.destination_url =
       UTF8ToWide(HistoryTabUI::GetHistoryURLWithSearchText(
           input_.text()).spec());
   match.transition = PageTransition::AUTO_BOOKMARK;
   match.provider = history_contents_provider_;
   result->AddMatch(match);
 }