Make starred History*Provider results stay in the autocomplete dropdown, update tests

chrome/browser/autocomplete/history_provider.cc

 // Copyright (c) 2010 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_url_provider.h"
 
 #include <string>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/url_util.h"
 
 HistoryProvider::HistoryProvider(ACProviderListener* listener,
                                  Profile* profile,
                                  const char* name)
     : AutocompleteProvider(listener, profile, name) {
 }
 
 void HistoryProvider::DeleteMatch(const AutocompleteMatch& match) {

[Peter Kasting, 2011/01/04 22:16:01]

Nit: Move above constructor

   DCHECK(done_);
   DCHECK(profile_);
   DCHECK(match.deletable);
 
   HistoryService* const history_service =
       profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
 
   // Delete the match from the history DB.
   GURL selected_url(match.destination_url);
   if (!history_service || !selected_url.is_valid()) {
     NOTREACHED() << "Can't delete requested URL";
     return;
   }
   history_service->DeleteURL(selected_url);
 
   // Delete the match from the current set of matches.
   bool found = false;
   for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) {
     if (i->destination_url == selected_url && i->type == match.type) {
       found = true;
-      if (i->is_history_what_you_typed_match) {
-        // We can't get rid of the What You Typed match, but we can make it
-        // look like it has no backing data.
+      if (i->is_history_what_you_typed_match || i->starred) {
+        // 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;
     }
   }
   DCHECK(found) << "Asked to delete a URL that isn't in our set of matches";
@@ skipping 76 matching lines @@
   DCHECK(scheme_pos != std::wstring::npos);
 
   // Erase scheme plus up to two slashes.
   size_t prefix_end = scheme_pos + strlen(chrome::kHttpScheme) + 1;
   const size_t after_slashes = std::min(url->length(), prefix_end + 2);
   while ((prefix_end < after_slashes) && ((*url)[prefix_end] == L'/'))
     ++prefix_end;
   url->erase(scheme_pos, prefix_end - scheme_pos);
   return (scheme_pos == 0) ? prefix_end : 0;
 }