Remove AutocompleteMatch::is_starred

chrome/browser/autocomplete/history_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_provider.h"
 
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/in_memory_url_index_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "components/autocomplete/autocomplete_input.h"
+#include "components/bookmarks/browser/bookmark_model.h"
 #include "url/url_util.h"
 
 void HistoryProvider::DeleteMatch(const AutocompleteMatch& match) {
   DCHECK(done_);
   DCHECK(profile_);
   DCHECK(match.deletable);
 
   HistoryService* const history_service =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
 
@@ skipping 18 matching lines @@
 HistoryProvider::HistoryProvider(Profile* profile,
                                  AutocompleteProvider::Type type)
     : AutocompleteProvider(type),
       profile_(profile) {
 }
 
 HistoryProvider::~HistoryProvider() {}
 
 void HistoryProvider::DeleteMatchFromMatches(const AutocompleteMatch& match) {
   bool found = false;
+  BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_);
   for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) {
     if (i->destination_url == match.destination_url && i->type == match.type) {
       found = true;
-      if (i->is_history_what_you_typed_match || i->starred) {
+      if (i->is_history_what_you_typed_match ||
+          (bookmark_model &&
+           bookmark_model->IsBookmarked(i->destination_url))) {
         // We can't get rid of What-You-Typed or Bookmarked matches,
         // but we can make them look like they have no backing data.
         i->deletable = false;
         i->description.clear();
         i->description_class.clear();
       } else {
         matches_.erase(i);
       }
       break;
     }
@@ skipping 25 matching lines @@
     do {
       offset += matches[i].length;
       ++i;
     } while ((i < match_count) && (offset == matches[i].offset));
     if (offset < text_length)
       spans.push_back(ACMatchClassification(offset, url_style));
   }
 
   return spans;
 }