Use exact pixel sizes instead of dip in webapp/WebAPK installability code

chrome/browser/manifest/manifest_icon_selector.cc

 // Copyright 2015 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/manifest/manifest_icon_selector.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/mime_util/mime_util.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/display/display.h"

[dominickn, 2016/12/19 06:23:32]

Nit: remove display.h and screen.h includes.

 #include "ui/display/screen.h"
 
 using content::Manifest;
 
 ManifestIconSelector::ManifestIconSelector(int ideal_icon_size_in_px,
                                            int minimum_icon_size_in_px)
     : ideal_icon_size_in_px_(ideal_icon_size_in_px),
       minimum_icon_size_in_px_(minimum_icon_size_in_px) {
 }
 
@@ skipping 96 matching lines @@
       result.push_back(icons[i]);
     }
   }
 
   return result;
 }
 
 // static
 GURL ManifestIconSelector::FindBestMatchingIcon(
     const std::vector<Manifest::Icon>& unfiltered_icons,
-    const int ideal_icon_size_in_dp,
-    const int minimum_icon_size_in_dp) {
-  DCHECK(minimum_icon_size_in_dp <= ideal_icon_size_in_dp);
-
-  const int ideal_icon_size_in_px =
-    ConvertIconSizeFromDpToPx(ideal_icon_size_in_dp);
-  const int minimum_icon_size_in_px =
-    ConvertIconSizeFromDpToPx(minimum_icon_size_in_dp);
+    const int ideal_icon_size_in_px,
+    const int minimum_icon_size_in_px) {
+  DCHECK(minimum_icon_size_in_px <= ideal_icon_size_in_px);
 
   std::vector<Manifest::Icon> icons =
       ManifestIconSelector::FilterIconsByType(unfiltered_icons);
 
   ManifestIconSelector selector(ideal_icon_size_in_px,
                                 minimum_icon_size_in_px);
   int index = selector.FindBestMatchingIcon(icons);
   if (index == -1)
     return GURL();
   return icons[index].src;
 }
-
-// static
-int ManifestIconSelector::ConvertIconSizeFromDpToPx(int icon_size_in_dp) {
-  return static_cast<int>(round(
-      icon_size_in_dp *
-      display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor()));
-}