Properly attach InfoBarContainer when it is swapped to a new WebContents

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_service.h"
 #include "chrome/browser/ui/android/infobars/infobar_android.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/InfoBarContainer_jni.h"
 
 
 // InfoBarContainerAndroid ----------------------------------------------------
 
 InfoBarContainerAndroid::InfoBarContainerAndroid(JNIEnv* env,
                                                  jobject obj)
     : infobars::InfoBarContainer(NULL),
       weak_java_infobar_container_(env, obj) {}
 
 InfoBarContainerAndroid::~InfoBarContainerAndroid() {
   RemoveAllInfoBarsForDestruction();
 }
 
+void InfoBarContainerAndroid::SetWebContents(JNIEnv* env,
+                                             jobject obj,
+                                             jobject web_contents) {
+  InfoBarService* infobar_service = InfoBarService::FromWebContents(
+      content::WebContents::FromJavaWebContents(web_contents));
+  ChangeInfoBarManager(infobar_service);
+}
+
 void InfoBarContainerAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 void InfoBarContainerAndroid::PlatformSpecificAddInfoBar(
     infobars::InfoBar* infobar,
     size_t position) {
   DCHECK(infobar);
   InfoBarAndroid* android_bar = static_cast<InfoBarAndroid*>(infobar);
   if (!android_bar) {
@@ skipping 28 matching lines @@
 
 void InfoBarContainerAndroid::PlatformSpecificRemoveInfoBar(
     infobars::InfoBar* infobar) {
   InfoBarAndroid* android_infobar = static_cast<InfoBarAndroid*>(infobar);
   android_infobar->CloseJavaInfoBar();
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
-static jlong Init(JNIEnv* env,
-                  jobject obj,
-                  jobject web_contents) {
+static jlong Init(JNIEnv* env, jobject obj) {
   InfoBarContainerAndroid* infobar_container =
       new InfoBarContainerAndroid(env, obj);
-  InfoBarService* infobar_service = InfoBarService::FromWebContents(
-      content::WebContents::FromJavaWebContents(web_contents));
-  infobar_container->ChangeInfoBarManager(infobar_service);
   return reinterpret_cast<intptr_t>(infobar_container);
 }
 
 bool RegisterInfoBarContainer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }