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

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 "base/bind.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 "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "third_party/WebKit/public/platform/WebDisplayMode.h"
 
 namespace {
 
 const char kPngExtension[] = ".png";
 
 // This constant is the icon size on Android (48dp) multiplied by the scale
 // factor of a Nexus 5 device (3x). For mobile and desktop platforms, a 144px
 // icon is an approximate, appropriate lower bound. It is the currently
 // advertised minimum icon size for triggering banners.
-// TODO(dominickn): consolidate with minimum_icon_size_in_dp across platforms.
+// TODO(dominickn): consolidate with minimum_icon_size_in_px across platforms.
 const int kIconMinimumSizeInPx = 144;
 
 // Returns true if |manifest| specifies a PNG icon >= 144x144px (or size "any").
 bool DoesManifestContainRequiredIcon(const content::Manifest& manifest) {
   for (const auto& icon : manifest.icons) {
     // The type field is optional. If it isn't present, fall back on checking
     // the src extension, and allow the icon if the extension ends with png.
     if (!base::EqualsASCII(icon.type, "image/png") &&
         !(icon.type.empty() && base::EndsWith(
             icon.src.ExtractFileName(), kPngExtension,
@@ skipping 70 matching lines @@
   tasks_.push_back({params, callback});
   if (is_active_)
     return;
 
   is_active_ = true;
   StartNextTask();
 }
 
 InstallableManager::IconProperty& InstallableManager::GetIcon(
     const InstallableParams& params) {
-  return icons_[{params.ideal_icon_size_in_dp, params.minimum_icon_size_in_dp}];
+  return icons_[{params.ideal_icon_size_in_px, params.minimum_icon_size_in_px}];
 }
 
 bool InstallableManager::IsIconFetched(const InstallableParams& params) const {
   const auto it = icons_.find(
-      {params.ideal_icon_size_in_dp, params.minimum_icon_size_in_dp});
+      {params.ideal_icon_size_in_px, params.minimum_icon_size_in_px});
   return it != icons_.end() && it->second.fetched;
 }
 
 void InstallableManager::SetIconFetched(const InstallableParams& params) {
   GetIcon(params).fetched = true;
 }
 
 InstallableStatusCode InstallableManager::GetErrorCode(
     const InstallableParams& params) {
   if (manifest_->error != NO_ERROR_DETECTED)
@@ skipping 240 matching lines @@
 
 void InstallableManager::CheckAndFetchBestIcon() {
   DCHECK(!manifest().IsEmpty());
   DCHECK(!tasks_.empty());
 
   const InstallableParams& params = tasks_[0].first;
   IconProperty& icon = GetIcon(params);
   icon.fetched = true;
 
   GURL icon_url = ManifestIconSelector::FindBestMatchingIcon(
-      manifest().icons, params.ideal_icon_size_in_dp,
-      params.minimum_icon_size_in_dp);
+      manifest().icons, params.ideal_icon_size_in_px,
+      params.minimum_icon_size_in_px);
 
   if (icon_url.is_empty()) {
     icon.error = NO_ACCEPTABLE_ICON;
   } else {
     bool can_download_icon = ManifestIconDownloader::Download(
-        GetWebContents(), icon_url, params.ideal_icon_size_in_dp,
-        params.minimum_icon_size_in_dp,
+        GetWebContents(), icon_url, params.ideal_icon_size_in_px,
+        params.minimum_icon_size_in_px,
         base::Bind(&InstallableManager::OnAppIconFetched,
                    weak_factory_.GetWeakPtr(), icon_url));
     if (can_download_icon)
       return;
     icon.error = CANNOT_DOWNLOAD_ICON;
   }
 
   WorkOnTask();
 }
 
@@ skipping 33 matching lines @@
   return manifest_->url;
 }
 
 const content::Manifest& InstallableManager::manifest() const {
   return manifest_->manifest;
 }
 
 bool InstallableManager::is_installable() const {
   return installable_->installable;
 }