Pass icon and icon murmur2 hash to WebApkInstaller when updating WebAPKs.

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 166 matching lines @@
   DownloadAppIconAndComputeMurmur2Hash();
 }
 
 void WebApkInstaller::SetTimeoutMs(int timeout_ms) {
   webapk_download_url_timeout_ms_ = timeout_ms;
   download_timeout_ms_ = timeout_ms;
 }
 
 void WebApkInstaller::UpdateAsync(content::BrowserContext* browser_context,
                                   const FinishCallback& finish_callback,
+                                  const std::string& icon_murmur2_hash,
                                   const std::string& webapk_package,
                                   int webapk_version) {
   UpdateAsyncWithURLRequestContextGetter(
       Profile::FromBrowserContext(browser_context)->GetRequestContext(),
-      finish_callback, webapk_package, webapk_version);
+      finish_callback, icon_murmur2_hash, webapk_package, webapk_version);
 }
 
 void WebApkInstaller::UpdateAsyncWithURLRequestContextGetter(
     net::URLRequestContextGetter* request_context_getter,
     const FinishCallback& finish_callback,
+    const std::string& icon_murmur2_hash,
     const std::string& webapk_package,
     int webapk_version) {
   request_context_getter_ = request_context_getter;
   finish_callback_ = finish_callback;
+  shortcut_icon_murmur2_hash_ = icon_murmur2_hash;
   webapk_package_ = webapk_package;
   webapk_version_ = webapk_version;
   task_type_ = UPDATE;
 

[pkotwicz, 2016/08/19 23:38:17]

The purpose of the check is to ensure that we do not pass an invalid URL to
WebApkIconHasher::DownloadAndComputeMurmur2Hash() because that causes a crash.
Perhaps, move the check to DownloadAndComputeMurmur2Hash() and out of
InstallAsyncWithURLRequestContextGetter() and add a comment

My suggestion for the comment: "Safeguard. WebApkIconHasher crashes if asked to
fetch an invalid URL."

[Xi Han, 2016/08/26 17:54:08]

Done.

   if (!shortcut_info_.icon_url.is_valid()) {
     OnFailure();
     return;
   }
 
-  DownloadAppIconAndComputeMurmur2Hash();
+  base::PostTaskAndReplyWithResult(
+      GetBackgroundTaskRunner().get(), FROM_HERE,
+      base::Bind(&BuildWebApkProtoInBackground, shortcut_info_,
+                  shortcut_icon_, shortcut_icon_murmur2_hash_),
+      base::Bind(&WebApkInstaller::SendUpdateWebApkRequest,
+                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 bool WebApkInstaller::StartInstallingDownloadedWebApk(
     JNIEnv* env,
     const base::android::ScopedJavaLocalRef<jstring>& java_file_path,
     const base::android::ScopedJavaLocalRef<jstring>& java_package_name) {
   return Java_WebApkInstaller_installAsyncFromNative(env, java_file_path,
                                                      java_package_name);
 }
 
@@ skipping 50 matching lines @@
   icon_hasher_.reset();
 
   shortcut_icon_murmur2_hash_ = icon_murmur2_hash;
 
   // An empty hash indicates that |icon_hasher_| encountered an error.
   if (icon_murmur2_hash.empty()) {
     OnFailure();
     return;
   }
 
-  if (task_type_ == INSTALL) {
-    base::PostTaskAndReplyWithResult(
-        GetBackgroundTaskRunner().get(), FROM_HERE,
-        base::Bind(&BuildWebApkProtoInBackground, shortcut_info_,
-                   shortcut_icon_, shortcut_icon_murmur2_hash_),
-        base::Bind(&WebApkInstaller::SendCreateWebApkRequest,
-                   weak_ptr_factory_.GetWeakPtr()));
-  } else if (task_type_ == UPDATE) {
-    base::PostTaskAndReplyWithResult(
-        GetBackgroundTaskRunner().get(), FROM_HERE,
-        base::Bind(&BuildWebApkProtoInBackground, shortcut_info_,
-                   shortcut_icon_, shortcut_icon_murmur2_hash_),
-        base::Bind(&WebApkInstaller::SendUpdateWebApkRequest,
-                   weak_ptr_factory_.GetWeakPtr()));
-  }
+  base::PostTaskAndReplyWithResult(
+      GetBackgroundTaskRunner().get(), FROM_HERE,
+      base::Bind(&BuildWebApkProtoInBackground, shortcut_info_,
+                  shortcut_icon_, shortcut_icon_murmur2_hash_),
+      base::Bind(&WebApkInstaller::SendCreateWebApkRequest,
+                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void WebApkInstaller::SendCreateWebApkRequest(
     std::unique_ptr<webapk::WebApk> webapk) {
   GURL server_url(server_url_.spec() + kDefaultWebApkServerUrlResponseType);
   SendRequest(std::move(webapk), net::URLFetcher::POST, server_url);
 }
 
 void WebApkInstaller::SendUpdateWebApkRequest(
     std::unique_ptr<webapk::WebApk> webapk) {
@@ skipping 96 matching lines @@
   FinishCallback callback = finish_callback_;
   delete this;
   callback.Run(true);
 }
 
 void WebApkInstaller::OnFailure() {
   FinishCallback callback = finish_callback_;
   delete this;
   callback.Run(false);
 }