Infobar system refactor.

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 21 matching lines @@
 
 void InfoBarContainerAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 void InfoBarContainerAndroid::OnWebContentsReplaced(
     content::WebContents* old_web_contents,
     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,
                                                          size_t position) {
   DCHECK(infobar);
   InfoBarAndroid* android_bar = static_cast<InfoBarAndroid*>(infobar);
   if (!android_bar) {
     // TODO(bulach): CLANK: implement other types of InfoBars.
     // TODO(jrg): this will always print out WARNING_TYPE as an int.
     // Try and be more helpful.
@@ skipping 20 matching lines @@
   base::android::ScopedJavaLocalRef<jobject> java_infobar =
       android_bar->CreateRenderInfoBar(env);
   Java_InfoBarContainer_addInfoBar(
       env, weak_java_infobar_container_.get(env).obj(), java_infobar.obj());
   android_bar->set_java_infobar(java_infobar);
 }
 
 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);
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 static int Init(JNIEnv* env,
                 jobject obj,
                 jint 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<int>(infobar_container);
 }
 
 bool RegisterInfoBarContainer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }