Single URL Expires Were Not Being Deleted.

chrome/browser/autocomplete/network_action_predictor.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/network_action_predictor.h"
 
 #include <math.h>
 
 #include <vector>
 
@@ skipping 184 matching lines @@
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_HISTORY_URLS_DELETED: {
       DCHECK(initialized_);
       const content::Details<const history::URLsDeletedDetails>
           urls_deleted_details =
               content::Details<const history::URLsDeletedDetails>(details);
       if (urls_deleted_details->all_history)
         DeleteAllRows();
       else
-        DeleteRowsWithURLs(urls_deleted_details->urls);
+        DeleteRowsWithURLs(urls_deleted_details->rows);
       break;
     }
 
     // This notification does not catch all instances of the user navigating
     // from the Omnibox, but it does catch the cases where the dropdown is open
     // and those are the events we're most interested in.
     case chrome::NOTIFICATION_OMNIBOX_OPENED_URL: {
       DCHECK(initialized_);
 
       // TODO(dominich): This doesn't need to be synchronous. Investigate
@@ skipping 242 matching lines @@
     return;
 
   db_cache_.clear();
   db_id_cache_.clear();
   content::BrowserThread::PostTask(content::BrowserThread::DB, FROM_HERE,
       base::Bind(&NetworkActionPredictorDatabase::DeleteAllRows, db_));
   UMA_HISTOGRAM_ENUMERATION("NetworkActionPredictor.DatabaseAction",
                             DATABASE_ACTION_DELETE_ALL, DATABASE_ACTION_COUNT);
 }
 
-void NetworkActionPredictor::DeleteRowsWithURLs(const std::set<GURL>& urls) {
+void NetworkActionPredictor::DeleteRowsWithURLs(const history::URLRows& rows) {
   if (!initialized_)
     return;
 
   std::vector<NetworkActionPredictorDatabase::Row::Id> id_list;
 
   for (DBCacheMap::iterator it = db_cache_.begin(); it != db_cache_.end();) {
-    if (urls.find(it->first.url) != urls.end()) {
+    if (std::find_if(rows.begin(), rows.end(),
+        history::URLRow::URLRowHasURL(it->first.url)) != rows.end()) {
       const DBIdCacheMap::iterator id_it = db_id_cache_.find(it->first);
       DCHECK(id_it != db_id_cache_.end());
       id_list.push_back(id_it->second);
       db_id_cache_.erase(id_it);
       db_cache_.erase(it++);
     } else {
       ++it;
     }
   }
 
@@ skipping 17 matching lines @@
 
   content::BrowserThread::PostTask(content::BrowserThread::DB, FROM_HERE,
       base::Bind(&NetworkActionPredictorDatabase::CommitTransaction, db_));
 }
 
 NetworkActionPredictor::TransitionalMatch::TransitionalMatch() {
 }
 
 NetworkActionPredictor::TransitionalMatch::~TransitionalMatch() {
 }