Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/history/shortcuts_backend.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/shortcuts_backend.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 209 matching lines @@
 void ShortcutsBackend::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   if (current_state_ != INITIALIZED)
     return;
   if (type == chrome::NOTIFICATION_HISTORY_URLS_DELETED) {
     if (content::Details<const history::URLsDeletedDetails>(details)->
             all_history) {
       DeleteAllShortcuts();
     }
-    const URLRows& rows(
-        content::Details<const history::URLsDeletedDetails>(details)->rows);
+    const std::set<GURL>& urls =
+        content::Details<const history::URLsDeletedDetails>(details)->urls;
     std::vector<std::string> shortcut_ids;
 
     for (GuidToShortcutsIteratorMap::iterator it = guid_map_.begin();
          it != guid_map_.end(); ++it) {
-      if (std::find_if(rows.begin(), rows.end(),
-                       URLRow::URLRowHasURL(it->second->second.url)) !=
-          rows.end())
+      if (urls.find(it->second->second.url) != urls.end())
         shortcut_ids.push_back(it->first);
     }
     DeleteShortcutsWithIds(shortcut_ids);
     return;
   }
 
   DCHECK(type == chrome::NOTIFICATION_OMNIBOX_OPENED_URL);
 
   AutocompleteLog* log = content::Details<AutocompleteLog>(details).ptr();
   string16 text_lowercase(base::i18n::ToLower(log->text));
 
   const AutocompleteMatch& match(log->result.match_at(log->selected_index));
   for (ShortcutMap::iterator it = shortcuts_map_.lower_bound(text_lowercase);
        it != shortcuts_map_.end() &&
            StartsWith(it->first, text_lowercase, true); ++it) {
     if (match.destination_url == it->second.url) {
       UpdateShortcut(Shortcut(it->second.id, log->text, match.destination_url,
           match.contents, match.contents_class, match.description,
           match.description_class, base::Time::Now(),
           it->second.number_of_hits + 1));
       return;
     }
   }
   AddShortcut(Shortcut(guid::GenerateGUID(), log->text, match.destination_url,
       match.contents, match.contents_class, match.description,
       match.description_class, base::Time::Now(), 1));
 }
 
 }  // namespace history