Support badge icon in WebAPK update components

chrome/browser/android/webapk/webapk_installer_unittest.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/android/webapk/webapk_installer.h"
 
 #include <jni.h>
 #include <memory>
 #include <string>
 
@@ skipping 184 matching lines @@
       const GURL& best_primary_icon_url,
       const GURL& best_badge_icon_url,
       const std::map<std::string, std::string>& icon_url_to_murmur2_hash,
       bool is_manifest_stale) {
     ShortcutInfo info(GURL::EmptyGURL());
     info.best_primary_icon_url = best_primary_icon_url;
     info.best_badge_icon_url = best_badge_icon_url;
 
     // WebApkInstaller owns itself.
     WebApkInstaller* installer =
         new TestWebApkInstaller(browser_context_, info, SkBitmap(), SkBitmap());

[pkotwicz, 2017/06/07 21:22:23]

The WebApkInstaller should use a non-empty primary icon. It should be impossible
for an empty primary icon to be passed in.

I am suggesting this because we may want the behavior in
WebApkInstallerTest.BuildWebApkProtoWhenManifestIsObsolete() to be different if
we "officially support" passing an empty primary icon to WebApkInstaller.

[F, 2017/06/08 20:01:12]

Done.

     installer->BuildWebApkProtoInBackgroundForTesting(
         base::Bind(&BuildProtoRunner::OnBuiltWebApkProto,
                    base::Unretained(this)),
         icon_url_to_murmur2_hash, is_manifest_stale);
 
     base::RunLoop run_loop;
     on_completed_callback_ = run_loop.QuitClosure();
     run_loop.Run();
   }
 
@@ skipping 187 matching lines @@
 //   one installed on the client.
 TEST_F(WebApkInstallerTest, UpdateSuccessWithEmptyDownloadUrlInResponse) {
   SetWebApkResponseBuilder(base::Bind(&BuildValidWebApkResponse, ""));
 
   std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
   runner->RunUpdateWebApk();
   EXPECT_EQ(WebApkInstallResult::SUCCESS, runner->result());
 }
 
 // When there is no Web Manifest available for a site, an empty
-// |best_primary_icon_url| is used to build a WebApk update request. Tests the
-// request can be built properly.
+// |best_primary_icon_url| and an empty |best_badge_icon_url| is used to build a
+// WebApk update request. Tests the request can be built properly.
 TEST_F(WebApkInstallerTest, BuildWebApkProtoWhenManifestIsObsolete) {
   std::string icon_url_1 = test_server()->GetURL("/icon1.png").spec();
   std::string icon_url_2 = test_server()->GetURL("/icon2.png").spec();
   std::map<std::string, std::string> icon_url_to_murmur2_hash;
   icon_url_to_murmur2_hash[icon_url_1] = "1";
   icon_url_to_murmur2_hash[icon_url_2] = "2";
 
   std::unique_ptr<BuildProtoRunner> runner = CreateBuildProtoRunner();
   runner->BuildSync(GURL(), GURL(), icon_url_to_murmur2_hash,
                     true /* is_manifest_stale*/);
   webapk::WebApk* webapk_request = runner->GetWebApkRequest();
   ASSERT_NE(nullptr, webapk_request);
 
   webapk::WebAppManifest manifest = webapk_request->manifest();
+  // The manifest only has 3 icons because the request is built with empty
+  // SKBitmaps as primary icon and badge icon, and empty badge icons are not
+  // added to WebAPK proto.
   ASSERT_EQ(3, manifest.icons_size());
 
   webapk::Image icons[3];
   for (int i = 0; i < 3; ++i)
     icons[i] = manifest.icons(i);
 
   EXPECT_EQ("", icons[0].src());
   EXPECT_FALSE(icons[0].has_hash());
   EXPECT_TRUE(icons[0].has_image_data());
 
@@ skipping 83 matching lines @@
   EXPECT_FALSE(icons[0].has_image_data());
 
   // Check protobuf fields for kBestPrimaryIconUrl.
   EXPECT_EQ(best_icon_url, icons[1].src());
   EXPECT_EQ(icon_url_to_murmur2_hash[best_icon_url], icons[1].hash());
   EXPECT_THAT(icons[1].usages(),
               testing::ElementsAre(webapk::Image::PRIMARY_ICON,
                                    webapk::Image::BADGE_ICON));
   EXPECT_TRUE(icons[1].has_image_data());
 }