Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/history/history_notifications.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.
 
 // Structs that hold data used in broadcasting notifications.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_NOTIFICATIONS_H__
 #define CHROME_BROWSER_HISTORY_HISTORY_NOTIFICATIONS_H__
 #pragma once
 
@@ skipping 39 matching lines @@
 };
 
 // Details for NOTIFICATION_HISTORY_URLS_DELETED.
 struct URLsDeletedDetails : public HistoryDetails {
   URLsDeletedDetails();
   virtual ~URLsDeletedDetails();
 
   // Set when all history was deleted. False means just a subset was deleted.
   bool all_history;
 
-  // The URLRows of URLs deleted. This is valid only when all_history is false
-  // indicating that a subset of history has been deleted.
+  // The URLRows which have been deleted.
   URLRows rows;
+
+  // The list of unique URLs affected. This is valid only when a subset of
+  // history is deleted. When all of it is deleted, this will be empty, since
+  // we do not bother to list all URLs. (This information can be gleaned from
+  // |rows| but, since there are several clients who need the set, we pre-build
+  // it so that the clients don't have to.)
+  std::set<GURL> urls;
 };
 
 // Details for NOTIFY_URLS_STARRED.
 struct URLsStarredDetails : public HistoryDetails {
   explicit URLsStarredDetails(bool being_starred);
   virtual ~URLsStarredDetails();
 
   // The new starred state of the list of URLs. True when they are being
   // starred, false when they are being unstarred.
   bool starred;
@@ skipping 16 matching lines @@
   virtual ~KeywordSearchTermDetails();
 
   GURL url;
   TemplateURLID keyword_id;
   string16 term;
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_NOTIFICATIONS_H__