[Android:WebAPK] Don't add webapp to homescreen if WebAPK install times out part 1/3

chrome/browser/android/banners/app_banner_infobar_delegate_android.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/banners/app_banner_infobar_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
@@ skipping 355 matching lines @@
   if (weak_manager_ && TriggeredFromBanner()) {
     weak_manager_->SendBannerAccepted(event_request_id_);
     // TODO(mgiuca): Send the appinstalled event for WebAPKs (but just removing
     // this check won't be sufficient).
     if (!is_webapk_)
       weak_manager_->OnInstall();
   }
 }
 
 void AppBannerInfoBarDelegateAndroid::OnWebApkInstallFinished(
-    bool success,
+    WebApkInstallResult result,
     bool relax_updates,
     const std::string& webapk_package_name) {
-  if (!success) {
-    OnWebApkInstallFailed();
+  if (result != WebApkInstallResult::SUCCESS) {
+    OnWebApkInstallFailed(result);
     return;
   }
   UpdateStateForInstalledWebAPK(webapk_package_name);
   webapk::TrackInstallDuration(timer_->Elapsed());
   timer_.reset();
   webapk::TrackInstallEvent(webapk::INSTALL_COMPLETED);
 }
 
-void AppBannerInfoBarDelegateAndroid::OnWebApkInstallFailed() {
+void AppBannerInfoBarDelegateAndroid::OnWebApkInstallFailed(
+    WebApkInstallResult result) {
   DVLOG(1) << "The WebAPK installation failed.";
   webapk::TrackInstallEvent(webapk::INSTALL_FAILED);
 
   if (!infobar())
     return;
 
-  content::WebContents* web_contents =
-      InfoBarService::WebContentsFromInfoBar(infobar());
-  // Add webapp shortcut to the homescreen.
-  // TODO(pkotwicz): Only add webapp shortcut to the homescreen if
-  // WebAPK install did not timeout. If the WebAPK install timed out
-  // it is possible that Google Play is taking a long time and will
-  // eventually installs the WebAPK.
-  ShortcutHelper::AddToLauncherWithSkBitmap(web_contents, *shortcut_info_,
-                                            *icon_.get());
+  if (result == WebApkInstallResult::FAILURE) {
+    content::WebContents* web_contents =
+        InfoBarService::WebContentsFromInfoBar(infobar());
+    // Add webapp shortcut to the homescreen.
+    ShortcutHelper::AddToLauncherWithSkBitmap(web_contents, *shortcut_info_,
+                                              *icon_.get());
+  }
+  // Else: the WebAPK install timed out. Don't add shortcut because the install

[dominickn, 2017/03/14 23:25:19]

This comment is a bit weirdly placed now. Can you move it above the conditional
and change it to say something like:

If the install didn't definitely fail, we don't add a shortcut. This could
happen if Play was busy with another install and this one is still queued (and
hence might succeed in the future).

[pkotwicz, 2017/03/14 23:43:29]

Done.

+  // might still succeed (e.g. the install timed out because Google Play was
+  // busy with another install). It is confusing for a user to have homescreen
+  // shortcuts for both a WebAPK and a webapp for the same page URL.
 
   infobar()->RemoveSelf();
 }
 
 void AppBannerInfoBarDelegateAndroid::TrackWebApkInstallationDismissEvents(
     InstallState install_state) {
   if (install_state == INSTALL_NOT_STARTED) {
     webapk::TrackInstallEvent(webapk::INFOBAR_DISMISSED_BEFORE_INSTALLATION);
   } else if (install_state == INSTALLING) {
     webapk::TrackInstallEvent(webapk::INFOBAR_DISMISSED_DURING_INSTALLATION);
@@ skipping 67 matching lines @@
 
   TrackDismissEvent(DISMISS_EVENT_BANNER_CLICK);
   return true;
 }
 
 bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace banners