Straighten up life cycle of native InfoBar pointers

chrome/browser/ui/android/infobars/translate_infobar.cc

 // Copyright 2013 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/translate_infobar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_weak_ref.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "components/translate/core/browser/translate_infobar_delegate.h"
-#include "jni/TranslateInfoBarDelegate_jni.h"
+#include "jni/TranslateInfoBar_jni.h"
 
 // ChromeTranslateClient
 // ----------------------------------------------------------
 
 scoped_ptr<infobars::InfoBar> ChromeTranslateClient::CreateInfoBar(
     scoped_ptr<translate::TranslateInfoBarDelegate> delegate) const {
   return make_scoped_ptr(new TranslateInfoBar(delegate.Pass()));
 }
 
 
 // TranslateInfoBar -----------------------------------------------------------
 
 TranslateInfoBar::TranslateInfoBar(
     scoped_ptr<translate::TranslateInfoBarDelegate> delegate)
-    : InfoBarAndroid(delegate.Pass()), java_translate_delegate_() {
+    : InfoBarAndroid(delegate.Pass()) {
 }
 
 TranslateInfoBar::~TranslateInfoBar() {
+  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_TranslateInfoBar_onNativeDestroyed(env, java_info_bar());
+  }
 }
 
 ScopedJavaLocalRef<jobject> TranslateInfoBar::CreateRenderInfoBar(JNIEnv* env) {
-  java_translate_delegate_.Reset(Java_TranslateInfoBarDelegate_create(env));
   translate::TranslateInfoBarDelegate* delegate = GetDelegate();
   std::vector<base::string16> languages;
   languages.reserve(delegate->num_languages());
   for (size_t i = 0; i < delegate->num_languages(); ++i)
     languages.push_back(delegate->language_name_at(i));
 
   base::android::ScopedJavaLocalRef<jobjectArray> java_languages =
       base::android::ToJavaArrayOfStrings(env, languages);
-  return Java_TranslateInfoBarDelegate_showTranslateInfoBar(
-      env, java_translate_delegate_.obj(), reinterpret_cast<intptr_t>(this),
-      delegate->translate_step(), delegate->original_language_index(),
-      delegate->target_language_index(), delegate->ShouldAlwaysTranslate(),
+  return Java_TranslateInfoBar_show(
+      env, delegate->translate_step(),
+      delegate->original_language_index(), delegate->target_language_index(),
+      delegate->ShouldAlwaysTranslate(),
       ShouldDisplayNeverTranslateInfoBarOnCancel(),
       delegate->triggered_from_menu(), java_languages.obj());
 }
 
 void TranslateInfoBar::ProcessButton(int action,
                                      const std::string& action_value) {
   if (!owner())
     return;  // We're closing; don't call anything, it might access the owner.
 
   translate::TranslateInfoBarDelegate* delegate = GetDelegate();
@@ skipping 16 matching lines @@
   translate::TranslateInfoBarDelegate* delegate = GetDelegate();
   DCHECK_NE(translate::TRANSLATE_STEP_BEFORE_TRANSLATE,
             delegate->translate_step());
 
   // Ask the former bar to transfer ownership to us.
   DCHECK(source != NULL);
   static_cast<TranslateInfoBar*>(source)->TransferOwnership(
       this, delegate->translate_step());
 }
 
+void TranslateInfoBar::SetJavaInfoBar(
+    const base::android::JavaRef<jobject>& java_info_bar) {
+  InfoBarAndroid::SetJavaInfoBar(java_info_bar);
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_TranslateInfoBar_setNativePtr(env, java_info_bar.obj(),
+                                     reinterpret_cast<intptr_t>(this));
+}
+
 void TranslateInfoBar::ApplyTranslateOptions(JNIEnv* env,
                                              jobject obj,
                                              int source_language_index,
                                              int target_language_index,
                                              bool always_translate,
                                              bool never_translate_language,
                                              bool never_translate_site) {
   translate::TranslateInfoBarDelegate* delegate = GetDelegate();
   delegate->UpdateOriginalLanguageIndex(source_language_index);
   delegate->UpdateTargetLanguageIndex(target_language_index);
 
   if (delegate->ShouldAlwaysTranslate() != always_translate)
     delegate->ToggleAlwaysTranslate();
 
   if (never_translate_language && delegate->IsTranslatableLanguageByPrefs())
     delegate->ToggleTranslatableLanguageByPrefs();
 
   if (never_translate_site && !delegate->IsSiteBlacklisted())
     delegate->ToggleSiteBlacklist();
 }
 
 void TranslateInfoBar::TransferOwnership(TranslateInfoBar* destination,
                                          translate::TranslateStep new_type) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  if (Java_TranslateInfoBarDelegate_changeTranslateInfoBarTypeAndPointer(
-      env, java_translate_delegate_.obj(),
-      reinterpret_cast<intptr_t>(destination), new_type)) {
-    ReassignJavaInfoBar(destination);
-    destination->SetJavaDelegate(java_translate_delegate_.Release());
-  }
-}
-
-void TranslateInfoBar::SetJavaDelegate(jobject delegate) {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  java_translate_delegate_.Reset(env, delegate);
+  Java_TranslateInfoBar_changeTranslateInfoBarType(env, java_info_bar(),
+                                                   new_type);
+  ReassignJavaInfoBar(destination);
 }
 
 bool TranslateInfoBar::ShouldDisplayNeverTranslateInfoBarOnCancel() {
   translate::TranslateInfoBarDelegate* delegate = GetDelegate();
   return (delegate->translate_step() ==
           translate::TRANSLATE_STEP_BEFORE_TRANSLATE) &&
          delegate->ShouldShowNeverTranslateShortcut();
 }
 
 translate::TranslateInfoBarDelegate* TranslateInfoBar::GetDelegate() {
   return delegate()->AsTranslateInfoBarDelegate();
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 bool RegisterTranslateInfoBarDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }