Straighten up life cycle of native InfoBar pointers

chrome/browser/ui/android/infobars/account_chooser_infobar.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/ui/android/infobars/account_chooser_infobar.h"
 
 #include "base/android/scoped_java_ref.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/account_chooser_infobar_delegate_android.h"
@@ skipping 78 matching lines @@
 }
 
 };  // namespace
 
 AccountChooserInfoBar::AccountChooserInfoBar(
     scoped_ptr<AccountChooserInfoBarDelegateAndroid> delegate)
     : InfoBarAndroid(delegate.Pass()) {
 }
 
 AccountChooserInfoBar::~AccountChooserInfoBar() {
+  if (java_info_bar()) {

[David Trainor- moved to gerrit, 2015/06/03 19:38:46]

Just override onNativeDestroyed() in Java?

[Changwan Ryu, 2015/06/04 01:42:27]

Done.

+    JNIEnv* env = base::android::AttachCurrentThread();
+    Java_AccountChooserInfoBar_onNativeDestroyed(env, java_info_bar());
+  }
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 AccountChooserInfoBar::CreateRenderInfoBar(JNIEnv* env) {
   size_t credential_array_size =
       GetDelegate()->local_credentials_forms().size() +
       GetDelegate()->federated_credentials_forms().size();
   ScopedJavaLocalRef<jobjectArray> java_credentials_array =
       CreateNativeCredentialArray(env, credential_array_size);
   AddElementsToJavaCredentialArray(
       env, java_credentials_array, GetDelegate()->local_credentials_forms(),
       password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL);
   AddElementsToJavaCredentialArray(
       env, java_credentials_array, GetDelegate()->federated_credentials_forms(),
       password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED,
       GetDelegate()->local_credentials_forms().size());
   base::android::ScopedJavaGlobalRef<jobject> java_infobar_global;
   java_infobar_global.Reset(Java_AccountChooserInfoBar_show(
-      env, reinterpret_cast<intptr_t>(this), GetEnumeratedIconId(),
-      java_credentials_array.obj()));
+      env, GetEnumeratedIconId(), java_credentials_array.obj()));
   base::android::ScopedJavaLocalRef<jobject> java_infobar(java_infobar_global);
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(this);
   net::URLRequestContextGetter* request_context =
       Profile::FromBrowserContext(web_contents->GetBrowserContext())
           ->GetRequestContext();
   FetchAvatars(java_infobar_global, GetDelegate()->local_credentials_forms(), 0,
                request_context);
   FetchAvatars(
       java_infobar_global, GetDelegate()->federated_credentials_forms(),
@@ skipping 17 matching lines @@
     return;  // We're closing; don't call anything, it might access the owner.
   GetDelegate()->ChooseCredential(
       -1, password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY);
   RemoveSelf();
 }
 
 AccountChooserInfoBarDelegateAndroid* AccountChooserInfoBar::GetDelegate() {
   return static_cast<AccountChooserInfoBarDelegateAndroid*>(delegate());
 }
 
+void AccountChooserInfoBar::SetJavaInfoBar(
+    const base::android::JavaRef<jobject>& java_info_bar) {
+  InfoBarAndroid::SetJavaInfoBar(java_info_bar);
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_AccountChooserInfoBar_setNativePtr(env, java_info_bar.obj(),
+                                          reinterpret_cast<intptr_t>(this));
+}
+
 bool RegisterAccountChooserInfoBar(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }