Infobar system refactor.

chrome/browser/ui/android/infobars/infobar_container_android.cc

Index: chrome/browser/ui/android/infobars/infobar_container_android.cc
===================================================================
--- chrome/browser/ui/android/infobars/infobar_container_android.cc	(revision 226624)
+++ chrome/browser/ui/android/infobars/infobar_container_android.cc	(working copy)
@@ -39,8 +39,7 @@
     content::WebContents* new_web_contents) {
   InfoBarService* new_infobar_service = new_web_contents ?
       InfoBarService::FromWebContents(new_web_contents) : NULL;
-  if (new_infobar_service)
-    ChangeInfoBarService(new_infobar_service);
+  ChangeInfoBarService(new_infobar_service);
 }
 
 void InfoBarContainerAndroid::PlatformSpecificAddInfoBar(InfoBar* infobar,
@@ -81,16 +80,13 @@
 void InfoBarContainerAndroid::PlatformSpecificReplaceInfoBar(
     InfoBar* old_infobar,
     InfoBar* new_infobar) {
-  InfoBarAndroid* new_android_bar = static_cast<InfoBarAndroid*>(new_infobar);
-  InfoBarAndroid* old_android_bar = (old_infobar == NULL) ?
-      NULL : static_cast<InfoBarAndroid*>(old_infobar);
-  new_android_bar->PassJavaInfoBar(old_android_bar);
+  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);
 }