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

chrome/browser/manifest/manifest_icon_downloader.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_downloader.h"
 
 #include <stddef.h>
 
 #include <limits>
 
 #include "chrome/browser/manifest/manifest_icon_selector.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/console_message_level.h"
 #include "skia/ext/image_operations.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"
 
 // DevToolsConsoleHelper is a class that holds a WebContents in order to be able
 // to send a message to the WebContents' main frame. It is used so
 // ManifestIconDownloader and the callers do not have to worry about
 // |web_contents| lifetime. If the |web_contents| is invalidated before the
 // message can be sent, the message will simply be ignored.
 class ManifestIconDownloader::DevToolsConsoleHelper
     : public content::WebContentsObserver {
  public:
@@ skipping 13 matching lines @@
     content::ConsoleMessageLevel level,
     const std::string& message) {
   if (!web_contents())
     return;
   web_contents()->GetMainFrame()->AddMessageToConsole(level, message);
 }
 
 bool ManifestIconDownloader::Download(
     content::WebContents* web_contents,
     const GURL& icon_url,
-    int ideal_icon_size_in_dp,
-    int minimum_icon_size_in_dp,
+    int ideal_icon_size_in_px,
+    int minimum_icon_size_in_px,
     const ManifestIconDownloader::IconFetchCallback& callback) {
-  DCHECK(minimum_icon_size_in_dp <= ideal_icon_size_in_dp);
+  DCHECK(minimum_icon_size_in_px <= ideal_icon_size_in_px);
   if (!web_contents || !icon_url.is_valid())
     return false;
 
-  const float device_scale_factor =
-      display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
-  const int ideal_icon_size_in_px =
-      static_cast<int>(round(ideal_icon_size_in_dp * device_scale_factor));
-  const int minimum_icon_size_in_px =
-      static_cast<int>(round(minimum_icon_size_in_dp * device_scale_factor));
-
   web_contents->DownloadImage(
       icon_url,
       false, // is_favicon
       0,     // max_bitmap_size - 0 means no maximum size.
       false, // bypass_cache
       base::Bind(&ManifestIconDownloader::OnIconFetched,
                  ideal_icon_size_in_px,
                  minimum_icon_size_in_px,
                  base::Owned(new DevToolsConsoleHelper(web_contents)),
                  callback));
@@ skipping 118 matching lines @@
     float ratio = height / width;
     float ratio_difference = fabs(ratio - 1);
     if (ratio_difference < best_ratio_difference) {
       best_index = i;
       best_ratio_difference = ratio_difference;
     }
   }
 
   return best_index;
 }