Fix leaking of AddToHomescreenManager for WebAPKs.

chrome/browser/android/webapps/add_to_homescreen_manager.cc

Index: chrome/browser/android/webapps/add_to_homescreen_manager.cc
diff --git a/chrome/browser/android/webapps/add_to_homescreen_manager.cc b/chrome/browser/android/webapps/add_to_homescreen_manager.cc
index d3eac8c211cf364215675da53d57d0dc2fd8f961..79ce4dcb558853885282337b8ed78502ac2b7744 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_manager.cc
+++ b/chrome/browser/android/webapps/add_to_homescreen_manager.cc
@@ -162,6 +162,7 @@ void AddToHomescreenManager::OnUserTitleAvailable(
 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 =
@@ -171,10 +172,10 @@ void AddToHomescreenManager::OnDataAvailable(const ShortcutInfo& info,
       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);