Merge 175182

chrome/browser/ui/views/external_tab_container_win.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/ui/views/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 253 matching lines @@
       set_delegate(this);
   return true;
 }
 
 void ExternalTabContainerWin::Uninitialize() {
   registrar_.RemoveAll();
   if (tab_contents_.get()) {
     UnregisterRenderViewHost(
         tab_contents_->web_contents()->GetRenderViewHost());
 
+    // Explicitly tell the RPH to shutdown, as doing so is the only thing that
+    // cleans up certain resources like infobars (crbug.com/148398).
+    tab_contents_->web_contents()->
+        GetRenderProcessHost()->FastShutdownIfPossible();
+
     if (GetWidget()->GetRootView())
       GetWidget()->GetRootView()->RemoveAllChildViews(true);
 
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTERNAL_TAB_CLOSED,
         content::Source<NavigationController>(
             &tab_contents_->web_contents()->GetController()),
         content::Details<ExternalTabContainer>(this));
 
     tab_contents_.reset(NULL);
@@ skipping 999 matching lines @@
   if (params.disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     forward_params.disposition = NEW_FOREGROUND_TAB;
   }
   WebContents* new_contents =
       ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
   return new_contents;
 }