Send all of the icon URLs listed in Web Manifest to WebAPK Server.

chrome/browser/android/webapk/webapk_installer.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 "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/path_utils.h"
@@ skipping 98 matching lines @@
       content::WebScreenOrientationLockTypeToString(
           shortcut_info.orientation));
   web_app_manifest->set_display_mode(
       content::WebDisplayModeToString(shortcut_info.display));
   web_app_manifest->set_background_color(
       ColorToString(shortcut_info.background_color));
   web_app_manifest->set_theme_color(ColorToString(shortcut_info.theme_color));
 
   std::string* scope = web_app_manifest->add_scopes();
   scope->assign(GetScope(shortcut_info).spec());
   webapk::Image* image = web_app_manifest->add_icons();

[pkotwicz, 2016/11/01 00:29:50]

Nit: Rename |image| -> |best_image|

[Xi Han, 2016/11/07 16:51:43]

Done.

-  image->set_src(shortcut_info.icon_url.spec());
+  image->set_src(shortcut_info.best_icon_url.spec());
   image->set_hash(shortcut_icon_murmur2_hash);
   std::vector<unsigned char> png_bytes;
   gfx::PNGCodec::EncodeBGRASkBitmap(shortcut_icon, false, &png_bytes);
   image->set_image_data(&png_bytes.front(), png_bytes.size());
 
+  for (const auto& icon_url : shortcut_info.icon_urls) {

[pkotwicz, 2016/11/01 00:29:50]

Nit: "const auto& icon_url" -> "const GURL& icon_url"

[Xi Han, 2016/11/07 16:51:43]

Done.

+    if (icon_url == shortcut_info.best_icon_url)
+      continue;
+    webapk::Image* image = web_app_manifest->add_icons();
+    image->set_src(icon_url.spec());
+  }

[pkotwicz, 2016/11/01 00:29:49]

Can you check with Glenn whether reordering is ok? When I talked to Glenn
offline about something unrelated he mentioned that the reordering might be
suboptimial. (I guess we could asssume that reordering is OK and fix it once we
know whether it actually is ok)

[Xi Han, 2016/11/07 16:51:43]

I talked to Glenn and he prefers to have the best one as the first, and others
as ordered in the Web Manifest. Since we didn't change the orders of the urls
except the best, I assume it should be just fine.

+
   return webapk;
 }
 
 // Returns task runner for running background tasks.
 scoped_refptr<base::TaskRunner> GetBackgroundTaskRunner() {
   return content::BrowserThread::GetBlockingPool()
       ->GetTaskRunnerWithShutdownBehavior(
           base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
 }
 
@@ skipping 168 matching lines @@
   GURL signed_download_url(response->signed_download_url());
   if (!signed_download_url.is_valid() || response->package_name().empty()) {
     OnFailure();
     return;
   }
   OnGotWebApkDownloadUrl(signed_download_url, response->package_name());
 }
 
 void WebApkInstaller::DownloadAppIconAndComputeMurmur2Hash() {
   // Safeguard. WebApkIconHasher crashes if asked to fetch an invalid URL.
-  if (!shortcut_info_.icon_url.is_valid()) {
+  if (!shortcut_info_.best_icon_url.is_valid()) {
     OnFailure();
     return;
   }
 
   timer_.Start(
       FROM_HERE, base::TimeDelta::FromMilliseconds(download_timeout_ms_),
       base::Bind(&WebApkInstaller::OnTimeout, weak_ptr_factory_.GetWeakPtr()));
 
   icon_hasher_.reset(new WebApkIconHasher());
   icon_hasher_->DownloadAndComputeMurmur2Hash(
-      request_context_getter_, shortcut_info_.icon_url,
+      request_context_getter_, shortcut_info_.best_icon_url,
       base::Bind(&WebApkInstaller::OnGotIconMurmur2Hash,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void WebApkInstaller::OnGotIconMurmur2Hash(
     const std::string& icon_murmur2_hash) {
   timer_.Stop();
   icon_hasher_.reset();
 
   shortcut_icon_murmur2_hash_ = icon_murmur2_hash;
@@ skipping 145 matching lines @@
 
 void WebApkInstaller::OnSuccess() {
   finish_callback_.Run(true, webapk_package_);
   delete this;
 }
 
 void WebApkInstaller::OnFailure() {
   finish_callback_.Run(false, webapk_package_);
   delete this;
 }