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"
@@ skipping 86 matching lines @@
   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)) {
+  if (destination != nullptr &&

[David Trainor- moved to gerrit, 2015/06/02 17:51:55]

If destination is null, should we just drop ownership anyway (not sure if this
class expects to still own it if this fails).  Should we add a DCHECK and leave
this check in here anyway?

[Changwan Ryu, 2015/06/03 04:55:41]

Removed the check as it cannot be null.

+      Java_TranslateInfoBarDelegate_changeTranslateInfoBarTypeAndPointer(
+          env, java_translate_delegate_.obj(),
+          reinterpret_cast<intptr_t>(destination->infobar_android()),
+          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);
 }
 
 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);
 }