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

chrome/browser/ui/android/infobars/confirm_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/confirm_infobar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "chrome/browser/android/resource_mapper.h"
@@ skipping 52 matching lines @@
 }
 
 void ConfirmInfoBar::ProcessButton(int action,
                                    const std::string& action_value) {
   if (!owner())
     return; // We're closing; don't call anything, it might access the owner.
   DCHECK((action == InfoBarAndroid::ACTION_OK) ||
       (action == InfoBarAndroid::ACTION_CANCEL));
   if ((action == InfoBarAndroid::ACTION_OK) ?
       delegate_->Accept() : delegate_->Cancel())
-    // TODO(miguelg): Consider RemoveSelf(); instead.
-    CloseInfoBar();
+    RemoveSelf();
 }
 
 string16 ConfirmInfoBar::GetTextFor(
     ConfirmInfoBarDelegate::InfoBarButton button) {
   return (delegate_->GetButtons() & button) ?
       delegate_->GetButtonLabel(button) : string16();
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 bool RegisterConfirmInfoBarDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }