Pass in extra parameters to WebApkBuilder#buildWebApkAsync()

chrome/browser/android/webapps/add_to_homescreen_dialog_helper.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/android/webapps/add_to_homescreen_dialog_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 46 matching lines @@
     const base::string16& user_title) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_user_title =
       base::android::ConvertUTF16ToJavaString(env, user_title);
   Java_AddToHomescreenDialogHelper_onUserTitleAvailable(env,
                                                   java_ref_.obj(),
                                                   j_user_title.obj());
 }
 
 void AddToHomescreenDialogHelper::OnDataAvailable(const ShortcutInfo& info,
+                                                  const GURL& icon_url,
                                                   const SkBitmap& icon) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon);
 
-  Java_AddToHomescreenDialogHelper_onIconAvailable(env,
-                                             java_ref_.obj(),
-                                             java_bitmap.obj());
+  Java_AddToHomescreenDialogHelper_onIconAvailable(env, java_ref_.obj(),

[Xi Han, 2016/06/15 14:09:35]

Revert changes here?

[pkotwicz, 2016/06/15 14:19:13]

I think that my change fixes the indentation in
Java_AddToHomescreenDialogHelper_onIconAvailable()

I know that I am a bit of a hypocrite here because I dislike unrelated changes
to the CL.

+                                                   java_bitmap.obj());
 
   if (add_shortcut_pending_)
-    AddShortcut(info, icon);
+    AddShortcut(info, icon_url, icon);
 }
 
 void AddToHomescreenDialogHelper::Destroy(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 SkBitmap AddToHomescreenDialogHelper::FinalizeLauncherIcon(
       const SkBitmap& bitmap,
       const GURL& url,
@@ skipping 10 matching lines @@
   add_shortcut_pending_ = true;
 
   base::string16 user_title =
       base::android::ConvertJavaStringToUTF16(env, j_user_title);
   if (!user_title.empty())
     data_fetcher_->shortcut_info().user_title = user_title;
 
   if (data_fetcher_->is_ready()) {
     // If the fetcher isn't ready yet, the shortcut will be added when it is
     // via OnDataAvailable();
-    AddShortcut(data_fetcher_->shortcut_info(), data_fetcher_->shortcut_icon());
+    AddShortcut(data_fetcher_->shortcut_info(),
+                data_fetcher_->shortcut_icon_url(),
+                data_fetcher_->shortcut_icon());
   }
 }
 
 void AddToHomescreenDialogHelper::AddShortcut(const ShortcutInfo& info,
+                                              const GURL& icon_url,
                                               const SkBitmap& icon) {
   DCHECK(add_shortcut_pending_);
   if (!add_shortcut_pending_)
     return;
   add_shortcut_pending_ = false;
 
   RecordAddToHomescreen();
 
   const std::string& uid = base::GenerateGUID();
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&ShortcutHelper::AddShortcutInBackgroundWithSkBitmap, info,
-                 uid, icon,
+                 uid, icon_url, icon,
                  data_fetcher_->FetchSplashScreenImageCallback(uid)));
 }
 
 bool AddToHomescreenDialogHelper::RegisterAddToHomescreenDialogHelper(
       JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void AddToHomescreenDialogHelper::RecordAddToHomescreen() {
   // Record that the shortcut has been added, so no banners will be shown
   // for this app.
   content::WebContents* web_contents = data_fetcher_->web_contents();
   if (!web_contents)
     return;
 
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents, web_contents->GetURL(),
       data_fetcher_->shortcut_info().url.spec(),
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
       base::Time::Now());
 }