[InfoBar] Always close native infobars from C++. Part II

chrome/browser/ui/android/infobars/infobar_android.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/infobar_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/android/resource_mapper.h"
@@ skipping 49 matching lines @@
                                      jobject obj,
                                      jint action,
                                      jstring action_value) {
   DCHECK(delegate_);
   std::string value = base::android::ConvertJavaStringToUTF8(env, action_value);
   ProcessButton(action, value);
 }
 
 void InfoBarAndroid::OnCloseButtonClicked(JNIEnv* env, jobject obj) {
   delegate_->InfoBarDismissed();
-}
-
-void InfoBarAndroid::OnInfoBarClosed(JNIEnv* env, jobject obj) {
-  java_info_bar_.Reset();  // So we don't notify Java.
-  if (owner())
-    RemoveSelf();
+  RemoveSelf();
 }
 
 void InfoBarAndroid::CloseJavaInfoBar() {
   if (!java_info_bar_.is_null()) {
     JNIEnv* env = base::android::AttachCurrentThread();
     Java_InfoBar_closeInfoBar(env, java_info_bar_.obj());
   }
 }
 
 int InfoBarAndroid::GetEnumeratedIconId() {
   DCHECK(delegate_);
   return ResourceMapper::MapFromChromiumId(delegate_->GetIconID());
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 bool RegisterNativeInfoBar(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }