Use JumpList icon caches to remove redundant favicon loading

chrome/browser/win/jumplist.cc

 // Copyright 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/win/jumplist.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 413 matching lines @@
     const history::MostVisitedURL& url = urls[i];
     scoped_refptr<ShellLinkItem> link = CreateShellLink();
     std::string url_string = url.url.spec();
     base::string16 url_string_wide = base::UTF8ToUTF16(url_string);
     link->GetCommandLine()->AppendArgNative(url_string_wide);
     link->GetCommandLine()->AppendSwitchASCII(switches::kWinJumplistAction,
                                               jumplist::kMostVisitedCategory);
     link->set_title(!url.title.empty() ? url.title : url_string_wide);
     link->set_url(url_string);
     most_visited_pages_.push_back(link);
-    icon_urls_.emplace_back(std::move(url_string), std::move(link));
+    if (most_visited_icons_.find(url_string) == most_visited_icons_.end())
+      icon_urls_.emplace_back(std::move(url_string), std::move(link));
   }
 
   most_visited_should_update_ = true;
 
   // Send a query that retrieves the first favicon.
   StartLoadingFavicon();
 }
 
 bool JumpList::AddTab(const sessions::TabRestoreService::Tab& tab,
                       size_t max_items) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   // This code adds the URL and the title strings of the given tab to the
   // JumpList variables.
   if (recently_closed_pages_.size() >= max_items)
     return false;
 
   scoped_refptr<ShellLinkItem> link = CreateShellLink();
   const sessions::SerializedNavigationEntry& current_navigation =
       tab.navigations.at(tab.current_navigation_index);
   std::string url = current_navigation.virtual_url().spec();
   link->GetCommandLine()->AppendArgNative(base::UTF8ToUTF16(url));
   link->GetCommandLine()->AppendSwitchASCII(switches::kWinJumplistAction,
                                             jumplist::kRecentlyClosedCategory);
   link->set_title(current_navigation.title());
   link->set_url(url);
   recently_closed_pages_.push_back(link);
-  icon_urls_.emplace_back(std::move(url), std::move(link));
+  if (recently_closed_icons_.find(url) == recently_closed_icons_.end())
+    icon_urls_.emplace_back(std::move(url), std::move(link));
 
   return true;
 }
 
 void JumpList::AddWindow(const sessions::TabRestoreService::Window& window,
                          size_t max_items) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(!window.tabs.empty());
 
   for (const auto& tab : window.tabs) {
@@ skipping 347 matching lines @@
                                URLIconCache* icon_cache) {
   // Put all cached icon file paths into a set.
   base::flat_set<base::FilePath> cached_files;
   cached_files.reserve(icon_cache->size());
 
   for (const auto& url_path_pair : *icon_cache)
     cached_files.insert(url_path_pair.second);
 
   DeleteNonCachedFiles(icon_dir, cached_files);
 }