[InfoBar] Always close native infobars from C++ (Part I)

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_helper.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
@@ skipping 54 matching lines @@
     return;
   }
 
   if (action == InfoBarAndroid::ACTION_CANCEL)
     delegate_->TranslationDeclined();
   else if (action == InfoBarAndroid::ACTION_TRANSLATE_SHOW_ORIGINAL)
     delegate_->RevertTranslation();
   else
     DCHECK_EQ(InfoBarAndroid::ACTION_NONE, action);
 
-  CloseInfoBar();
+  RemoveSelf();
 }
 
 void TranslateInfoBar::PassJavaInfoBar(InfoBarAndroid* source) {
   DCHECK_NE(
       delegate_->infobar_type(), TranslateInfoBarDelegate::BEFORE_TRANSLATE);
 
   // Ask the former bar to transfer ownership to us.
   DCHECK(source != NULL);
   static_cast<TranslateInfoBar*>(source)->TransferOwnership(
       this, delegate_->infobar_type());
@@ skipping 42 matching lines @@
           TranslateInfoBarDelegate::BEFORE_TRANSLATE) &&
       (delegate_->ShouldShowNeverTranslateShortcut());
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 bool RegisterTranslateInfoBarDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }