Make AppBannerInfoBar install WebAPK.

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 129 matching lines @@
       weak_ptr_factory_(this) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   server_url_ =
       GURL(command_line->HasSwitch(switches::kWebApkServerUrl)
                ? command_line->GetSwitchValueASCII(switches::kWebApkServerUrl)
                : kDefaultWebApkServerUrl);
 }
 
 WebApkInstaller::~WebApkInstaller() {}
 
-void WebApkInstaller::InstallAsync(content::BrowserContext* browser_context,
-                                   const FinishCallback& finish_callback) {
+void WebApkInstaller::InstallAsync(
+    content::BrowserContext* browser_context,
+    const ShortcutHelper::WebApkPackageNameAvailableCallback& callback,
+    const FinishCallback& finish_callback) {
   InstallAsyncWithURLRequestContextGetter(
       Profile::FromBrowserContext(browser_context)->GetRequestContext(),
+      callback,
       finish_callback);
 }
 
 void WebApkInstaller::InstallAsyncWithURLRequestContextGetter(
     net::URLRequestContextGetter* request_context_getter,
+    const ShortcutHelper::WebApkPackageNameAvailableCallback& callback,
     const FinishCallback& finish_callback) {
   request_context_getter_ = request_context_getter;
+  package_available_callback_ = callback;
   finish_callback_ = finish_callback;
   task_type_ = INSTALL;
 
   if (!shortcut_info_.icon_url.is_valid()) {
     OnFailure();
     return;
   }
 
   // We need to take the hash of the bitmap at the icon URL prior to any
   // transformations being applied to the bitmap (such as encoding/decoding
@@ skipping 72 matching lines @@
   if (!response->ParseFromString(response_string)) {
     OnFailure();
     return;
   }
 
   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() {
   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(
@@ skipping 105 matching lines @@
 
 void WebApkInstaller::OnWebApkMadeWorldReadable(
     const base::FilePath& file_path,
     const std::string& package_name,
     bool change_permission_success) {
   if (!change_permission_success) {
     OnFailure();
     return;
   }
 
+  if (package_available_callback_)
+    package_available_callback_.Run(package_name);
+
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> java_file_path =
       base::android::ConvertUTF8ToJavaString(env, file_path.value());
   base::android::ScopedJavaLocalRef<jstring> java_package_name =
       base::android::ConvertUTF8ToJavaString(env, package_name);
   bool success = false;
   if (task_type_ == INSTALL) {
     success = StartInstallingDownloadedWebApk(env, java_file_path,
                                               java_package_name);
   } else if (task_type_ == UPDATE) {
@@ skipping 10 matching lines @@
   OnFailure();
 }
 
 void WebApkInstaller::OnSuccess() {
   FinishCallback callback = finish_callback_;
   delete this;
   callback.Run(true);
 }
 
 void WebApkInstaller::OnFailure() {
-  FinishCallback callback = finish_callback_;
+  ShortcutHelper::WebApkPackageNameAvailableCallback callback =
+    package_available_callback_;
+  FinishCallback finish_callback = finish_callback_;
   delete this;
-  callback.Run(false);
+  callback.Run("");
+  finish_callback.Run(false);
 }