Properly attach InfoBarContainer when it is swapped to a new WebContents

chrome/browser/android/tab_android.cc

 // Copyright (c) 2012 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/android/tab_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/metrics/histogram.h"
@@ skipping 276 matching lines @@
     load_url_params->browser_initiated_post_data =
         params->browser_initiated_post_data;
   }
 }
 
 void TabAndroid::SwapTabContents(content::WebContents* old_contents,
                                  content::WebContents* new_contents,
                                  bool did_start_load,
                                  bool did_finish_load) {
   JNIEnv* env = base::android::AttachCurrentThread();
-
-  // We need to notify the native InfobarContainer so infobars can be swapped.
-  InfoBarContainerAndroid* infobar_container =
-      reinterpret_cast<InfoBarContainerAndroid*>(
-          Java_Tab_getNativeInfoBarContainer(
-              env,
-              weak_java_tab_.get(env).obj()));
-  InfoBarService* new_infobar_service =
-      new_contents ? InfoBarService::FromWebContents(new_contents) : NULL;
-  infobar_container->ChangeInfoBarManager(new_infobar_service);
-
   Java_Tab_swapWebContents(
       env,
       weak_java_tab_.get(env).obj(),
       new_contents->GetJavaWebContents().obj(),
       did_start_load,
       did_finish_load);
 }
 
 void TabAndroid::DefaultSearchProviderChanged(
     bool google_base_url_domain_changed) {
@@ skipping 563 matching lines @@
   //   s^{n+1} / s^{n} = 2100 / 2000
   //   s = 1.05
   //   s^b = 60000
   //   b = ln(60000) / ln(1.05) ~= 225
   UMA_HISTOGRAM_CUSTOM_TIMES("Startup.FirstCommitNavigationTime",
       base::Time::Now() - chrome::android::GetMainEntryPointTime(),
       base::TimeDelta::FromMilliseconds(1),
       base::TimeDelta::FromMinutes(1),
       225);
 }