Make minimum PWA icon size the same accross all device densities

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"
 
 using IconPurpose = content::Manifest::Icon::IconPurpose;
 
 namespace {
 
-const std::tuple<int, int, IconPurpose> kPrimaryIconParams{144, 144,
-                                                           IconPurpose::ANY};
+const std::pair<int, IconPurpose> kPrimaryIconParams{144, IconPurpose::ANY};
 
 InstallableParams GetManifestParams() {
   InstallableParams params;
   params.check_installable = false;
   params.fetch_valid_primary_icon = false;
   return params;
 }
 
 InstallableParams GetWebAppParams() {
   InstallableParams params = GetManifestParams();
   params.ideal_primary_icon_size_in_px = 144;
-  params.minimum_primary_icon_size_in_px = 144;
   params.check_installable = true;
   params.fetch_valid_primary_icon = true;
   return params;
 }
 
 InstallableParams GetPrimaryIconParams() {
   InstallableParams params = GetManifestParams();
   params.ideal_primary_icon_size_in_px = 144;
-  params.minimum_primary_icon_size_in_px = 144;
   params.fetch_valid_primary_icon = true;
   return params;
 }
 
 InstallableParams GetPrimaryIconAndBadgeIconParams() {
   InstallableParams params = GetManifestParams();
   params.ideal_primary_icon_size_in_px = 144;
-  params.minimum_primary_icon_size_in_px = 144;
   params.fetch_valid_primary_icon = true;
   params.ideal_badge_icon_size_in_px = 72;
-  params.minimum_badge_icon_size_in_px = 72;
   params.fetch_valid_badge_icon = true;
   return params;
 }
 
 }  // anonymous namespace
 
 class CallbackTester {
  public:
   explicit CallbackTester(base::Closure quit_closure)
       : quit_closure_(quit_closure) { }
@@ skipping 314 matching lines @@
 
   // Ask for a different size primary 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_primary_icon_size_in_px = 96;
-    params.minimum_primary_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->primary_icon_url().is_empty());
     EXPECT_EQ(nullptr, tester->primary_icon());
     EXPECT_TRUE(tester->badge_icon_url().is_empty());
@@ skipping 47 matching lines @@
 
   // Request an oversized badge icon. This should fetch only the manifest and
   // the primary icon, and return no errors.
   {
     base::RunLoop run_loop;
     std::unique_ptr<CallbackTester> tester(
         new CallbackTester(run_loop.QuitClosure()));
 
     InstallableParams params = GetPrimaryIconAndBadgeIconParams();
     params.ideal_badge_icon_size_in_px = 2000;
-    params.minimum_badge_icon_size_in_px = 2000;
     RunInstallableManager(tester.get(), params);
     run_loop.Run();
 
     EXPECT_FALSE(tester->manifest().IsEmpty());
     EXPECT_FALSE(tester->manifest_url().is_empty());
 
     EXPECT_FALSE(tester->primary_icon_url().is_empty());
     EXPECT_NE(nullptr, tester->primary_icon());
     EXPECT_TRUE(tester->badge_icon_url().is_empty());
     EXPECT_EQ(nullptr, tester->badge_icon());
@@ skipping 231 matching lines @@
     std::unique_ptr<CallbackTester> tester(
         new CallbackTester(run_loop.QuitClosure()));
 
     NavigateAndRunInstallableManager(tester.get(), GetWebAppParams(),
                                      "/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_FALSE(tester->primary_icon_url().is_empty());
+    EXPECT_EQ(embedded_test_server()->GetURL("/banners/launcher-icon-3x.png"),
+              tester->primary_icon_url());
     EXPECT_NE(nullptr, tester->primary_icon());
     EXPECT_TRUE(tester->badge_icon_url().is_empty());
     EXPECT_EQ(nullptr, tester->badge_icon());
     EXPECT_EQ(NO_ERROR_DETECTED, tester->error_code());
   }
 
   {
     base::RunLoop run_loop;
     std::unique_ptr<CallbackTester> tester(
         new CallbackTester(run_loop.QuitClosure()));
 
-    // Dial up the primary icon size requirements to something that isn't
-    // available. This should now fail with NoIconMatchingRequirements.
+    // Change the requested primary icon size. A different primary icon should
+    // be returned.
     InstallableParams params = GetWebAppParams();
-    params.ideal_primary_icon_size_in_px = 2000;
-    params.minimum_primary_icon_size_in_px = 2000;
+    params.ideal_primary_icon_size_in_px = 512;
     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->primary_icon_url().is_empty());
-    EXPECT_EQ(nullptr, tester->primary_icon());
-    EXPECT_TRUE(tester->badge_icon_url().is_empty());
-    EXPECT_EQ(nullptr, tester->badge_icon());
-    EXPECT_EQ(NO_ACCEPTABLE_ICON, tester->error_code());
-  }
-
-  // Navigate and verify the reverse: an overly large primary icon requested
-  // first fails, but a smaller primary 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_primary_icon_size_in_px = 2000;
-    params.minimum_primary_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->primary_icon_url().is_empty());
-    EXPECT_EQ(nullptr, tester->primary_icon());
-    EXPECT_TRUE(tester->badge_icon_url().is_empty());
-    EXPECT_EQ(nullptr, tester->badge_icon());
-    EXPECT_EQ(NO_ACCEPTABLE_ICON, tester->error_code());
-  }
-
-  {
-    base::RunLoop run_loop;
-    std::unique_ptr<CallbackTester> tester(
-        new CallbackTester(run_loop.QuitClosure()));
-    RunInstallableManager(tester.get(), GetWebAppParams());
-
-    run_loop.Run();
-
-    // The smaller primary icon requirements should allow this to pass.
-    EXPECT_FALSE(tester->manifest_url().is_empty());
-    EXPECT_FALSE(tester->manifest().IsEmpty());
-    EXPECT_TRUE(tester->is_installable());
-    EXPECT_FALSE(tester->primary_icon_url().is_empty());
+    EXPECT_EQ(embedded_test_server()->GetURL("/banners/image-512px.png"),
+              tester->primary_icon_url());
     EXPECT_NE(nullptr, tester->primary_icon());
     EXPECT_TRUE(tester->badge_icon_url().is_empty());
     EXPECT_EQ(nullptr, tester->badge_icon());
     EXPECT_EQ(NO_ERROR_DETECTED, tester->error_code());
   }
 }
 
 IN_PROC_BROWSER_TEST_F(InstallableManagerBrowserTest,
                        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();
 }