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

chrome/browser/installable/installable_manager_browsertest.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/command_line.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace {
 
 InstallableParams GetManifestParams() {
   InstallableParams params;
   params.check_installable = false;
   params.fetch_valid_icon = false;
   return params;
 }
 
 InstallableParams GetWebAppParams() {
   InstallableParams params = GetManifestParams();
-  params.ideal_icon_size_in_dp = 48;
-  params.minimum_icon_size_in_dp = 48;
+  params.ideal_icon_size_in_px = 144;
+  params.minimum_icon_size_in_px = 144;
   params.check_installable = true;
   params.fetch_valid_icon = true;
   return params;
 }
 
 InstallableParams GetIconParams() {
   InstallableParams params = GetManifestParams();
-  params.ideal_icon_size_in_dp = 48;
-  params.minimum_icon_size_in_dp = 48;
+  params.ideal_icon_size_in_px = 144;
+  params.minimum_icon_size_in_px = 144;
   params.fetch_valid_icon = true;
   return params;
 }
 
 }  // anonymous namespace
 
 class CallbackTester {
  public:
   explicit CallbackTester(base::Closure quit_closure)
       : quit_closure_(quit_closure) { }
@@ skipping 292 matching lines @@
   }
 
   // Ask for a different size icon. This should fail with START_URL_NOT_VALID
   // since we won't have a cached icon error.
   {
     base::RunLoop run_loop;
     std::unique_ptr<CallbackTester> tester(
         new CallbackTester(run_loop.QuitClosure()));
 
     InstallableParams params = GetWebAppParams();
-    params.ideal_icon_size_in_dp = 32;
-    params.minimum_icon_size_in_dp = 32;
+    params.ideal_icon_size_in_px = 96;
+    params.minimum_icon_size_in_px = 96;
     RunInstallableManager(tester.get(), params);
     run_loop.Run();
 
     EXPECT_FALSE(tester->manifest().IsEmpty());
     EXPECT_FALSE(tester->manifest_url().is_empty());
     EXPECT_TRUE(tester->manifest().prefer_related_applications);
 
     EXPECT_TRUE(tester->icon_url().is_empty());
     EXPECT_EQ(nullptr, tester->icon());
     EXPECT_FALSE(tester->is_installable());
@@ skipping 39 matching lines @@
     EXPECT_NE(nullptr, tester->icon());
     EXPECT_EQ(NO_ERROR_DETECTED, tester->error_code());
 
     // Verify that the returned state matches manager internal state.
     InstallableManager* manager = GetManager();
 
     EXPECT_FALSE(manager->manifest().IsEmpty());
     EXPECT_FALSE(manager->manifest_url().is_empty());
     EXPECT_TRUE(manager->is_installable());
     EXPECT_EQ(1u, manager->icons_.size());
-    EXPECT_FALSE((manager->icon_url({48,48}).is_empty()));
-    EXPECT_NE(nullptr, (manager->icon({48,48})));
+    EXPECT_FALSE((manager->icon_url({144,144}).is_empty()));
+    EXPECT_NE(nullptr, (manager->icon({144,144})));
     EXPECT_EQ(NO_ERROR_DETECTED, manager->manifest_error());
     EXPECT_EQ(NO_ERROR_DETECTED, manager->installable_error());
-    EXPECT_EQ(NO_ERROR_DETECTED, (manager->icon_error({48,48})));
+    EXPECT_EQ(NO_ERROR_DETECTED, (manager->icon_error({144,144})));
     EXPECT_TRUE(manager->tasks_.empty());
   }
 
   // Request everything again without navigating away. This should work fine.
   {
     base::RunLoop run_loop;
     std::unique_ptr<CallbackTester> tester(
         new CallbackTester(run_loop.QuitClosure()));
 
     RunInstallableManager(tester.get(), GetWebAppParams());
     run_loop.Run();
 
     EXPECT_FALSE(tester->manifest().IsEmpty());
     EXPECT_FALSE(tester->manifest_url().is_empty());
     EXPECT_TRUE(tester->is_installable());
     EXPECT_FALSE(tester->icon_url().is_empty());
     EXPECT_NE(nullptr, tester->icon());
     EXPECT_EQ(NO_ERROR_DETECTED, tester->error_code());
 
     // Verify that the returned state matches manager internal state.
     InstallableManager* manager = GetManager();
 
     EXPECT_FALSE(manager->manifest().IsEmpty());
     EXPECT_FALSE(manager->manifest_url().is_empty());
     EXPECT_TRUE(manager->is_installable());
     EXPECT_EQ(1u, manager->icons_.size());
-    EXPECT_FALSE((manager->icon_url({48,48}).is_empty()));
-    EXPECT_NE(nullptr, (manager->icon({48,48})));
+    EXPECT_FALSE((manager->icon_url({144,144}).is_empty()));
+    EXPECT_NE(nullptr, (manager->icon({144,144})));
     EXPECT_EQ(NO_ERROR_DETECTED, manager->manifest_error());
     EXPECT_EQ(NO_ERROR_DETECTED, manager->installable_error());
-    EXPECT_EQ(NO_ERROR_DETECTED, (manager->icon_error({48,48})));
+    EXPECT_EQ(NO_ERROR_DETECTED, (manager->icon_error({144,144})));
     EXPECT_TRUE(manager->tasks_.empty());
   }
 
   {
     // Check that a subsequent navigation resets state.
     ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
     InstallableManager* manager = GetManager();
 
     EXPECT_TRUE(manager->manifest().IsEmpty());
     EXPECT_TRUE(manager->manifest_url().is_empty());
@@ skipping 107 matching lines @@
   }
 
   {
     base::RunLoop run_loop;
     std::unique_ptr<CallbackTester> tester(
         new CallbackTester(run_loop.QuitClosure()));
 
     // Dial up the icon size requirements to something that isn't available.
     // This should now fail with NoIconMatchingRequirements.
     InstallableParams params = GetWebAppParams();
-    params.ideal_icon_size_in_dp = 2000;
-    params.minimum_icon_size_in_dp = 2000;
+    params.ideal_icon_size_in_px = 2000;
+    params.minimum_icon_size_in_px = 2000;
     RunInstallableManager(tester.get(), params);
     run_loop.Run();
 
     EXPECT_FALSE(tester->manifest_url().is_empty());
     EXPECT_FALSE(tester->manifest().IsEmpty());
     EXPECT_TRUE(tester->is_installable());
     EXPECT_TRUE(tester->icon_url().is_empty());
     EXPECT_EQ(nullptr, tester->icon());
     EXPECT_EQ(NO_ACCEPTABLE_ICON, tester->error_code());
   }
 
   // Navigate and verify the reverse: an overly large icon requested first
   // fails, but a smaller icon requested second passes.
   {
     base::RunLoop run_loop;
     std::unique_ptr<CallbackTester> tester(
         new CallbackTester(run_loop.QuitClosure()));
 
     // This should fail with NoIconMatchingRequirements.
     InstallableParams params = GetWebAppParams();
-    params.ideal_icon_size_in_dp = 2000;
-    params.minimum_icon_size_in_dp = 2000;
+    params.ideal_icon_size_in_px = 2000;
+    params.minimum_icon_size_in_px = 2000;
     NavigateAndRunInstallableManager(tester.get(), params,
                                      "/banners/manifest_test_page.html");
     run_loop.Run();
 
     EXPECT_FALSE(tester->manifest_url().is_empty());
     EXPECT_FALSE(tester->manifest().IsEmpty());
     EXPECT_TRUE(tester->is_installable());
     EXPECT_TRUE(tester->icon_url().is_empty());
     EXPECT_EQ(nullptr, tester->icon());
     EXPECT_EQ(NO_ACCEPTABLE_ICON, tester->error_code());
@@ skipping 21 matching lines @@
                        CheckNestedCallsToGetData) {
   // Verify that we can call GetData while in a callback from GetData.
   base::RunLoop run_loop;
   InstallableParams params = GetWebAppParams();
   std::unique_ptr<NestedCallbackTester> tester(
       new NestedCallbackTester(GetManager(), params, run_loop.QuitClosure()));
 
   tester->Run();
   run_loop.Run();
 }