Revert 105300 - HQP Refactoring (in Preparation for SQLite Cache)

chrome/browser/autocomplete/history_provider.cc

 // Copyright (c) 2011 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"
@@ skipping 13 matching lines @@
 
 void HistoryProvider::DeleteMatch(const AutocompleteMatch& match) {
   DCHECK(done_);
   DCHECK(profile_);
   DCHECK(match.deletable);
 
   HistoryService* const history_service =
       profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
 
   // Delete the match from the history DB.
-  DCHECK(history_service);
-  DCHECK(match.destination_url.is_valid());
-  history_service->DeleteURL(match.destination_url);
-  DeleteMatchFromMatches(match);
-}
+  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);
 
-void HistoryProvider::DeleteMatchFromMatches(const AutocompleteMatch& match) {
+  // 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 == match.destination_url && i->type == match.type) {
+    if (i->destination_url == selected_url && i->type == match.type) {
       found = true;
       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);
       }
@@ skipping 97 matching lines @@
   return (scheme_pos == 0) ? prefix_end : 0;
 }
 
 // static
 bool HistoryProvider::PreventInlineAutocomplete(
     const AutocompleteInput& input) {
   return input.prevent_inline_autocomplete() ||
         (!input.text().empty() &&
          IsWhitespace(input.text()[input.text().length() - 1]));
 }