Fix leaking of AddToHomescreenManager for WebAPKs.

chrome/browser/android/webapps/add_to_homescreen_manager.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_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
@@ skipping 144 matching lines @@
   ScopedJavaLocalRef<jstring> j_user_title =
       base::android::ConvertUTF16ToJavaString(env, user_title);
   Java_AddToHomescreenManager_onUserTitleAvailable(env,
                                                    java_ref_,
                                                    j_user_title);
 }
 
 void AddToHomescreenManager::OnDataAvailable(const ShortcutInfo& info,
                                              const SkBitmap& primary_icon,
                                              const SkBitmap& badge_icon) {
+  JNIEnv* env = base::android::AttachCurrentThread();

[pkotwicz, 2017/03/08 21:57:29]

Nit: Can you move this right before you call
Java_AddToHomescreenManager_finish() ?

[Xi Han, 2017/03/08 22:13:52]

I move it here since both line 175 and 183 use the |env|. Yes, it would be nicer
if it is closed to the jni call. Updated.

   if (is_webapk_compatible_) {
     // TODO(zpeng): Add badge to WebAPK installation flow.
     WebApkInstallService* install_service =
         WebApkInstallService::Get(
             data_fetcher_->web_contents()->GetBrowserContext());
     if (install_service->IsInstallInProgress(info.manifest_url))
       ShortcutHelper::ShowWebApkInstallInProgressToast();
     else
       CreateInfoBarForWebApk(info, primary_icon);
+    Java_AddToHomescreenManager_finish(env, java_ref_);
     return;
   }
 
-  JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (!primary_icon.drawsNothing())
     java_bitmap = gfx::ConvertToJavaBitmap(&primary_icon);
 
   Java_AddToHomescreenManager_onReadyToAdd(env, java_ref_, java_bitmap);
 
   if (add_shortcut_pending_)
     AddShortcut(info, primary_icon);
 }
 
 void AddToHomescreenManager::CreateInfoBarForWebApk(const ShortcutInfo& info,
                                                     const SkBitmap& icon) {
   banners::AppBannerInfoBarDelegateAndroid::Create(
       data_fetcher_->web_contents(), nullptr, info.user_title,
       base::MakeUnique<ShortcutInfo>(info), base::MakeUnique<SkBitmap>(icon),
       -1 /* event_request_id */, webapk::INSTALL_SOURCE_MENU);
 }
 
 SkBitmap AddToHomescreenManager::FinalizeLauncherIconInBackground(
     const SkBitmap& bitmap,
     const GURL& url,
     bool* is_generated) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   return ShortcutHelper::FinalizeLauncherIconInBackground(bitmap, url,
                                                           is_generated);
 }