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

chrome/browser/history/expire_history_backend.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/history/expire_history_backend.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 323 matching lines @@
 
 void ExpireHistoryBackend::BroadcastDeleteNotifications(
     DeleteDependencies* dependencies) {
   if (!dependencies->deleted_urls.empty()) {
     // Broadcast the URL deleted notification. Note that we also broadcast when
     // we were requested to delete everything even if that was a NOP, since
     // some components care to know when history is deleted (it's up to them to
     // determine if they care whether anything was deleted).
     URLsDeletedDetails* deleted_details = new URLsDeletedDetails;
     deleted_details->all_history = false;
+    std::vector<URLRow> typed_urls_changed;  // Collect this for later.
     for (size_t i = 0; i < dependencies->deleted_urls.size(); i++) {
-      deleted_details->rows.push_back(dependencies->deleted_urls[i]);
       deleted_details->urls.insert(dependencies->deleted_urls[i].url());
+      if (dependencies->deleted_urls[i].typed_count() > 0)
+        typed_urls_changed.push_back(dependencies->deleted_urls[i]);
     }
     delegate_->BroadcastNotifications(
         chrome::NOTIFICATION_HISTORY_URLS_DELETED, deleted_details);
   }
 }
 
 void ExpireHistoryBackend::DeleteVisitRelatedInfo(
     const VisitVector& visits,
     DeleteDependencies* dependencies) {
   for (size_t i = 0; i < visits.size(); i++) {
@@ skipping 342 matching lines @@
   // We use the bookmark service to determine if a URL is bookmarked. The
   // bookmark service is loaded on a separate thread and may not be done by the
   // time we get here. We therefor block until the bookmarks have finished
   // loading.
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history