Pass in extra parameters to WebApkBuilder#buildWebApkAsync()

chrome/browser/banners/app_banner_data_fetcher.cc

 // Copyright 2015 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/banners/app_banner_data_fetcher.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 184 matching lines @@
     return;
   }
 
   AppBannerSettingsHelper::RecordMinutesFromFirstVisitToShow(
       web_contents, validated_url_, GetAppIdentifier(), GetCurrentTime());
 
   // Definitely going to show the banner now.
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnDecidedWhetherToShow(this, true));
 
-  ShowBanner(app_icon_.get(), app_title_, referrer);
+  ShowBanner(app_icon_url_, app_icon_.get(), app_title_, referrer);
   is_active_ = false;
 }
 
 void AppBannerDataFetcher::OnRequestShowAppBanner(
     content::RenderFrameHost* render_frame_host,
     int request_id) {
   if (was_canceled_by_page_) {
     // Simulate an "OK" from the website to restart the banner display pipeline.
     was_canceled_by_page_ = false;
     OnBannerPromptReply(render_frame_host, request_id,
@@ skipping 152 matching lines @@
 }
 
 bool AppBannerDataFetcher::FetchAppIcon(content::WebContents* web_contents,
                                         const GURL& icon_url) {
   return ManifestIconDownloader::Download(
       web_contents,
       icon_url,
       ideal_icon_size_in_dp_,
       minimum_icon_size_in_dp_,
       base::Bind(&AppBannerDataFetcher::OnAppIconFetched,
-                 this));
+                 this, icon_url));
 }
 
-void AppBannerDataFetcher::OnAppIconFetched(const SkBitmap& bitmap) {
+void AppBannerDataFetcher::OnAppIconFetched(const GURL& icon_url,
+                                            const SkBitmap& bitmap) {
   if (!is_active_) return;
 
   content::WebContents* web_contents = GetWebContents();
   if (!CheckFetcherIsStillAlive(web_contents)) {
     Cancel();
     return;
   }
   if (bitmap.drawsNothing()) {
     OutputDeveloperNotShownMessage(web_contents, kNoIconAvailable,
                                    is_debug_mode_);
     Cancel();
     return;
   }
 
   RecordCouldShowBanner();
   if (!is_debug_mode_ && !CheckIfShouldShowBanner()) {
     // At this point, the only possible case is that the banner has been added
     // to the homescreen, given all of the other checks that have been made.
     Cancel();
     return;
   }
 
+  app_icon_url_ = icon_url;

[dominickn, 2016/06/16 21:16:36]

Can this be done in FetchAppIcon(), so that it doesn't need to be passed through
Bind() and into this method's signature? I think either the code downloads the
icon successfully and reaches here, or or it fails and Cancel() gets called to
stop the pipeline anyway.

   app_icon_.reset(new SkBitmap(bitmap));
   event_request_id_ = ++gCurrentRequestID;
   web_contents->GetMainFrame()->Send(
       new ChromeViewMsg_AppBannerPromptRequest(
         web_contents->GetMainFrame()->GetRoutingID(),
         event_request_id_,
         GetBannerType()));
 }
 
 bool AppBannerDataFetcher::IsWebAppInstalled(
@@ skipping 65 matching lines @@
 
   if (!DoesManifestContainRequiredIcon(manifest)) {
     OutputDeveloperNotShownMessage(web_contents, kManifestMissingSuitableIcon,
                                    is_debug_mode);
     return false;
   }
   return true;
 }
 
 }  // namespace banners