Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/android/infobars/infobar_container_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_container_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/infobars/infobar.h"
@@ skipping 61 matching lines @@
 void InfoBarContainerAndroid::PlatformSpecificReplaceInfoBar(
     InfoBar* old_infobar,
     InfoBar* new_infobar) {
   static_cast<InfoBarAndroid*>(new_infobar)->PassJavaInfoBar(
       static_cast<InfoBarAndroid*>(old_infobar));
 }
 
 void InfoBarContainerAndroid::PlatformSpecificRemoveInfoBar(InfoBar* infobar) {
   InfoBarAndroid* android_infobar = static_cast<InfoBarAndroid*>(infobar);
   android_infobar->CloseJavaInfoBar();
+  base::MessageLoop::current()->DeleteSoon(FROM_HERE, infobar);
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 static jlong Init(JNIEnv* env,
                   jobject obj,
                   jlong native_web_contents,
                   jobject auto_login_delegate) {
   InfoBarContainerAndroid* infobar_container =
       new InfoBarContainerAndroid(env, obj, auto_login_delegate);
   infobar_container->ChangeInfoBarService(InfoBarService::FromWebContents(
       reinterpret_cast<content::WebContents*>(native_web_contents)));
   return reinterpret_cast<intptr_t>(infobar_container);
 }
 
 bool RegisterInfoBarContainer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }