Refactor ManifestIconSelector and update it for Manifest.icon.purpose

chrome/browser/installable/installable_manager.cc

 // Copyright 2016 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/installable/installable_manager.h"
 
 #include <algorithm>

[dominickn, 2017/01/31 18:13:03]

This is unused now?

[F, 2017/01/31 18:42:50]

Done.

 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "chrome/browser/manifest/manifest_icon_selector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "components/security_state/core/security_state.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 414 matching lines @@
 void InstallableManager::CheckAndFetchBestIcon(const IconParams& params) {
   DCHECK(!manifest().IsEmpty());
 
   int ideal_icon_size_in_px = std::get<0>(params);
   int minimum_icon_size_in_px = std::get<1>(params);
   IconPurpose icon_purpose = std::get<2>(params);
 
   IconProperty& icon = icons_[params];
   icon.fetched = true;
 
-  // Filter by icon purpose.
-  std::vector<content::Manifest::Icon> filtered_icons;
-  std::copy_if(manifest().icons.begin(), manifest().icons.end(),
-               std::back_inserter(filtered_icons),
-               [icon_purpose](const content::Manifest::Icon& icon) {
-                 return base::ContainsValue(icon.purpose, icon_purpose);
-               });
-
   GURL icon_url = ManifestIconSelector::FindBestMatchingIcon(
-      filtered_icons, ideal_icon_size_in_px, minimum_icon_size_in_px);
+      manifest().icons, ideal_icon_size_in_px, minimum_icon_size_in_px,
+      icon_purpose);
 
   if (icon_url.is_empty()) {
     icon.error = NO_ACCEPTABLE_ICON;
   } else {
     bool can_download_icon = ManifestIconDownloader::Download(
         GetWebContents(), icon_url, ideal_icon_size_in_px,
         minimum_icon_size_in_px,
         base::Bind(&InstallableManager::OnIconFetched,
                    weak_factory_.GetWeakPtr(), icon_url, params));
     if (can_download_icon)
@@ skipping 38 matching lines @@
   return manifest_->url;
 }
 
 const content::Manifest& InstallableManager::manifest() const {
   return manifest_->manifest;
 }
 
 bool InstallableManager::is_installable() const {
   return installable_->installable;
 }