Refactoring recently closed tab filtering

chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc

 // Copyright (c) 2011 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/ui/webui/ntp/recently_closed_tabs_handler.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sessions/session_utils.h"
 #include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 namespace {
 
-bool IsTabUnique(const DictionaryValue* tab,
-                 std::set<std::string>* unique_items) {
-  DCHECK(unique_items);
-  std::string title;
-  std::string url;
-  if (tab->GetString("title", &title) &&
-      tab->GetString("url", &url)) {
-    // TODO(viettrungluu): this isn't obviously reliable, since different
-    // combinations of titles/urls may conceivably yield the same string.
-    std::string unique_key = title + url;
-    if (unique_items->find(unique_key) != unique_items->end())
-      return false;
-    else
-      unique_items->insert(unique_key);
-  }
-  return true;
-}
-
 bool TabToValue(const TabRestoreService::Tab& tab,
                 DictionaryValue* dictionary) {
   if (tab.navigations.empty())
     return false;
 
   const TabNavigation& current_navigation =
       tab.navigations.at(tab.current_navigation_index);
   if (current_navigation.virtual_url() == GURL(chrome::kChromeUINewTabURL))
     return false;
   NewTabUI::SetURLTitleAndDirection(dictionary, current_navigation.title(),
@@ skipping 42 matching lines @@
   TabRestoreServiceDelegate* delegate =
       TabRestoreServiceDelegate::FindDelegateForController(
       &web_ui_->tab_contents()->controller(), NULL);
   if (!delegate || !tab_restore_service_)
     return;
 
   int session_to_restore;
   if (!ExtractIntegerValue(args, &session_to_restore))
     return;
 
-  const TabRestoreService::Entries& entries = tab_restore_service_->entries();
+  TabRestoreService::Entries entries;
+  SessionUtils::FilteredEntries(tab_restore_service_, &entries);
   int index = 0;
   for (TabRestoreService::Entries::const_iterator iter = entries.begin();
        iter != entries.end(); ++iter, ++index) {
     if (session_to_restore == (*iter)->id)
       break;
   }
   // There are actually less than 20 restore tab items displayed in the UI.
   UMA_HISTOGRAM_ENUMERATION("NewTabPage.SessionRestore", index, 20);
 
   tab_restore_service_->RestoreEntryById(delegate, session_to_restore, true);
@@ skipping 18 matching lines @@
     }
   }
 
   if (tab_restore_service_)
     TabRestoreServiceChanged(tab_restore_service_);
 }
 
 void RecentlyClosedTabsHandler::TabRestoreServiceChanged(
     TabRestoreService* service) {
   ListValue list_value;
-  AddRecentlyClosedEntries(service->entries(), &list_value);
+  TabRestoreService::Entries entries;
+  SessionUtils::FilteredEntries(service, &entries);
+
+  AddRecentlyClosedEntries(entries, &list_value);
 
   web_ui_->CallJavascriptFunction("recentlyClosedTabs", list_value);
 }
 
 void RecentlyClosedTabsHandler::TabRestoreServiceDestroyed(
     TabRestoreService* service) {
   tab_restore_service_ = NULL;
 }
 
 // static
 void RecentlyClosedTabsHandler::AddRecentlyClosedEntries(
     const TabRestoreService::Entries& entries, ListValue* entry_list_value) {
   const int max_count = 10;
   int added_count = 0;
-  std::set<std::string> unique_items;
   // We filter the list of recently closed to only show 'interesting' entries,
   // where an interesting entry is either a closed window or a closed tab
   // whose selected navigation is not the new tab ui.
   for (TabRestoreService::Entries::const_iterator it = entries.begin();
        it != entries.end() && added_count < max_count; ++it) {
     TabRestoreService::Entry* entry = *it;
     scoped_ptr<DictionaryValue> entry_dict(new DictionaryValue());
     if ((entry->type == TabRestoreService::TAB &&
          TabToValue(
              *static_cast<TabRestoreService::Tab*>(entry),
-             entry_dict.get()) &&
-         IsTabUnique(entry_dict.get(), &unique_items)) ||
+             entry_dict.get())) ||
         (entry->type == TabRestoreService::WINDOW &&
          WindowToValue(
              *static_cast<TabRestoreService::Window*>(entry),
              entry_dict.get()))) {
       entry_dict->SetInteger("sessionId", entry->id);
       entry_list_value->Append(entry_dict.release());
       added_count++;
     }
   }
 }