Make HistoryQuickProvider::DeleteMatch also delete the underlying URL from the History Database.

chrome/browser/autocomplete/history_quick_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_quick_provider.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 72 matching lines @@
       std::string name = "HistoryQuickProvider.QueryIndexTime." +
           base::IntToString(input.text().length());
       base::HistogramBase* counter = base::Histogram::FactoryGet(
           name, 1, 1000, 50, base::Histogram::kUmaTargetedHistogramFlag);
       counter->Add(static_cast<int>((end_time - start_time).InMilliseconds()));
     }
     UpdateStarredStateOfMatches();
   }
 }
 
 void HistoryQuickProvider::DeleteMatch(const AutocompleteMatch& match) {

[Peter Kasting, 2014/06/11 18:32:34]

This function seems like it now just does what HistoryProvider::DeleteMatch()
does (except for deleting from the in-memory index, which ought not to be
necessary, since deleting from the main index should cause that to happen
automatically).

Can you just eliminate this method entirely and verify (preferably in the test)
that the base class method causes the item to get deleted from both the main and
in-memory DBs?

[engedy, 2014/06/12 08:47:59]

Done. You are entirely correct. I actually feel kinda bad for not noticing this
after having been hacking on history code for so long. /o\

   DCHECK(match.deletable);
   DCHECK(match.destination_url.is_valid());
-  // Delete the match from the InMemoryURLIndex.
+
+  // Delete the underlying URL along with all its visits from the history DB.
+  HistoryService* const history_service =
+      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  DCHECK(history_service);
+  history_service->DeleteURL(match.destination_url);
+
+  // Delete derived information stored about the URL in the InMemoryURLIndex.
   GetIndex()->DeleteURL(match.destination_url);
+
   DeleteMatchFromMatches(match);
 }
 
 HistoryQuickProvider::~HistoryQuickProvider() {}
 
 void HistoryQuickProvider::DoAutocomplete() {
   // Get the matching URLs from the DB.
   ScoredHistoryMatches matches = GetIndex()->HistoryItemsForTerms(
       autocomplete_input_.text(),
       autocomplete_input_.cursor_position(),
@@ skipping 191 matching lines @@
   if (index_for_testing_.get())
     return index_for_testing_.get();
 
   HistoryService* const history_service =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!history_service)
     return NULL;
 
   return history_service->InMemoryIndex();
 }