Remove unused open WebAPK logic in AppBannerInfoBarDelegateAndroid.

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 37 matching lines @@
 // static
 bool AppBannerInfoBarDelegateAndroid::Create(
     content::WebContents* web_contents,
     base::WeakPtr<AppBannerManager> weak_manager,
     const base::string16& app_title,
     std::unique_ptr<ShortcutInfo> shortcut_info,
     std::unique_ptr<SkBitmap> icon,
     int event_request_id,
     webapk::InstallSource webapk_install_source) {
   bool is_webapk = ChromeWebApkHost::CanInstallWebApk();
-  std::string webapk_package_name = "";
-  const GURL& url = shortcut_info->url;
-  if (is_webapk)
-    webapk_package_name = ShortcutHelper::QueryWebApkPackage(url);
-  bool is_webapk_already_installed = !webapk_package_name.empty();
   auto infobar_delegate =
       base::WrapUnique(new banners::AppBannerInfoBarDelegateAndroid(
           weak_manager, app_title, std::move(shortcut_info), std::move(icon),
-          event_request_id, is_webapk, is_webapk_already_installed,
-          webapk_install_source));
+          event_request_id, is_webapk, webapk_install_source));
   auto* raw_delegate = infobar_delegate.get();
   auto infobar = base::MakeUnique<AppBannerInfoBarAndroid>(
-      std::move(infobar_delegate), url, is_webapk);
+      std::move(infobar_delegate), shortcut_info->url, is_webapk);

[dominickn, 2017/03/19 22:56:56]

Oops, I gave you bad advice here. |shortcut_info| was std::move'd into the
AppBannerInfoBarDelegateAndroid on line 58, so accessing shortcut_info->url
segmentation faults and fails the tests.

That being said, I think |url| should never have been a reference type before
because the thing it's referring to is on an object that is being std::move'd
out from under it. Can you bring the |url| variable back except make it a value,
not a reference?

[F, 2017/03/22 18:49:23]

Thanks for finding the cause! Done :)

   if (!InfoBarService::FromWebContents(web_contents)
            ->AddInfoBar(std::move(infobar)))
     return false;
 
   if (is_webapk) {
     if (webapk_install_source == webapk::INSTALL_SOURCE_MENU) {
       webapk::TrackInstallInfoBarShown(
           webapk::WEBAPK_INFOBAR_SHOWN_FROM_MENU);
-      if (is_webapk_already_installed)
-        raw_delegate->UpdateStateForInstalledWebAPK(webapk_package_name);
-      else
-        raw_delegate->Accept();
+      raw_delegate->Accept();
     } else {
       webapk::TrackInstallInfoBarShown(
           webapk::WEBAPK_INFOBAR_SHOWN_FROM_BANNER);
     }
   }
 
   return true;
 }
 
 // static
@@ skipping 119 matching lines @@
   install_state_ = INSTALLED;
 }
 
 AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     base::WeakPtr<AppBannerManager> weak_manager,
     const base::string16& app_title,
     std::unique_ptr<ShortcutInfo> shortcut_info,
     std::unique_ptr<SkBitmap> icon,
     int event_request_id,
     bool is_webapk,
-    bool is_webapk_already_installed,
     webapk::InstallSource webapk_install_source)
     : weak_manager_(weak_manager),
       app_title_(app_title),
       shortcut_info_(std::move(shortcut_info)),
       icon_(std::move(icon)),
       event_request_id_(event_request_id),
       has_user_interaction_(false),
       is_webapk_(is_webapk),
-      is_webapk_already_installed_(is_webapk_already_installed),
       install_state_(INSTALL_NOT_STARTED),
       webapk_install_source_(webapk_install_source),
       weak_ptr_factory_(this) {
   DCHECK(!IsInfoEmpty(shortcut_info_));
   CreateJavaDelegate();
 }
 
 AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid(
     const base::string16& app_title,
     const base::android::ScopedJavaGlobalRef<jobject>& native_app_data,
@@ skipping 63 matching lines @@
     content::WebContents* web_contents) {
   if (IsInfoEmpty(shortcut_info_))
     return true;
 
   JNIEnv* env = base::android::AttachCurrentThread();
 
   // If the WebAPK is installed and the "Open" button is clicked, open the
   // WebAPK.
   if (install_state_ == INSTALLED) {
     Java_AppBannerInfoBarDelegateAndroid_openWebApk(env, java_delegate_);
-    if (is_webapk_already_installed_)
-      webapk::TrackUserAction(webapk::USER_ACTION_OPEN);
-    else
-      webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN);
+    webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN);
     SendBannerAccepted();
     return true;
   }
 
   // If the WebAPK is not installed and the "Add to Home Screen" button is
   // clicked, install the WebAPK.
   timer_.reset(new base::ElapsedTimer());
   install_state_ = INSTALLING;
   webapk::TrackInstallSource(webapk_install_source_);
 
@@ skipping 81 matching lines @@
 
 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);
   } else if (install_state == INSTALLED) {
     // If WebAPK is installed from this banner, TrackInstallEvent() is called in
     // OnWebApkInstallFinished().
-    if (is_webapk_already_installed_)
-      webapk::TrackUserAction(webapk::USER_ACTION_OPEN_DISMISS);
-    else
-      webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN_DISMISS);
+    webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN_DISMISS);
   }
 }
 
 infobars::InfoBarDelegate::InfoBarIdentifier
 AppBannerInfoBarDelegateAndroid::GetIdentifier() const {
   return APP_BANNER_INFOBAR_DELEGATE_ANDROID;
 }
 
 gfx::Image AppBannerInfoBarDelegateAndroid::GetIcon() const {
   return gfx::Image::CreateFrom1xBitmap(*icon_.get());
@@ skipping 50 matching lines @@
 
   TrackDismissEvent(DISMISS_EVENT_BANNER_CLICK);
   return true;
 }
 
 bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace banners