Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/autocomplete/network_action_predictor.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_NETWORK_ACTION_PREDICTOR_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_NETWORK_ACTION_PREDICTOR_H_
 #pragma once
 
 #include <map>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/autocomplete/network_action_predictor_database.h"
-#include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
 struct AutocompleteLog;
 struct AutocompleteMatch;
 class AutocompleteResult;
 class HistoryService;
 class Profile;
@@ skipping 143 matching lines @@
   void AddRow(const DBCacheKey& key,
               const NetworkActionPredictorDatabase::Row& row);
 
   // Updates a row in the database and the caches.
   void UpdateRow(DBCacheMap::iterator it,
                  const NetworkActionPredictorDatabase::Row& row);
 
   // Removes all rows from the database and caches.
   void DeleteAllRows();
 
-  // Removes rows from the database and caches that contain a URL in |rows|.
-  void DeleteRowsWithURLs(const history::URLRows& rows);
+  // Removes rows from the database and caches that contain a URL in |urls|.
+  void DeleteRowsWithURLs(const std::set<GURL>& urls);
 
   // Used to batch operations on the database.
   void BeginTransaction();
   void CommitTransaction();
 
   Profile* profile_;
   scoped_refptr<NetworkActionPredictorDatabase> db_;
   content::NotificationRegistrar notification_registrar_;
 
   // This is cleared after every Omnibox navigation.
   std::vector<TransitionalMatch> transitional_matches_;
 
   // This allows us to predict the effect of confidence threshold changes on
   // accuracy.
   mutable std::vector<std::pair<GURL, double> > tracked_urls_;
 
   DBCacheMap db_cache_;
   DBIdCacheMap db_id_cache_;
 
   bool initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkActionPredictor);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_NETWORK_ACTION_PREDICTOR_H_