Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/history/history_extension_api.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/history/history_extension_api.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
@@ skipping 127 matching lines @@
   DispatchEvent(profile, kOnVisited, json_args);
 }
 
 void HistoryExtensionEventRouter::HistoryUrlsRemoved(
     Profile* profile,
     const history::URLsDeletedDetails* details) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetBoolean(kAllHistoryKey, details->all_history);
   ListValue* urls = new ListValue();
-  for (history::URLRows::const_iterator iterator = details->rows.begin();
-      iterator != details->rows.end(); ++iterator) {
-    urls->Append(new StringValue(iterator->url().spec()));
+  for (std::set<GURL>::const_iterator iterator = details->urls.begin();
+      iterator != details->urls.end();
+      ++iterator) {
+    urls->Append(new StringValue(iterator->spec()));
   }
   dict->Set(kUrlsKey, urls);
   args.Append(dict);
 
   std::string json_args;
   base::JSONWriter::Write(&args, &json_args);
   DispatchEvent(profile, kOnVisitRemoved, json_args);
 }
 
 void HistoryExtensionEventRouter::DispatchEvent(Profile* profile,
@@ skipping 231 matching lines @@
       &cancelable_consumer_,
       base::Bind(&DeleteAllHistoryFunction::DeleteComplete,
                  base::Unretained(this)));
 
   return true;
 }
 
 void DeleteAllHistoryFunction::DeleteComplete() {
   SendAsyncResponse();
 }