Don't report blocked web contents from already navigated render views.

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 497 matching lines @@
   return effective_url;
 }
 #endif
 
 void SetApplicationLocaleOnIOThread(const std::string& locale) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   g_io_thread_application_locale.Get() = locale;
 }
 
 void HandleBlockedPopupOnUIThread(const BlockedWindowParams& params) {
-  WebContents* tab = tab_util::GetWebContentsByID(params.render_process_id(),
-                                                  params.opener_id());
-  if (!tab)
+  RenderViewHost* render_view_host =

[Charlie Reis, 2014/11/10 17:41:26]

RenderViewHost is going away, and there can be more than one of them per tab in
--site-per-process when some frames are out-of-process.

Can you add a TODO to make this use RenderFrameHosts (which appears to require
changes to BlockedWindowParams and ViewHostMsg_CreateWindow_Params)?  You can
cite bug 431769.

[jochen (gone - plz use gerrit), 2014/11/10 19:39:13]

done

+      RenderViewHost::FromID(params.render_process_id(), params.opener_id());
+  if (!render_view_host)
+    return;
+  WebContents* tab = WebContents::FromRenderViewHost(render_view_host);
+  // The tab might already have navigated away.
+  if (!tab || tab->GetRenderViewHost() != render_view_host)
     return;
 
   prerender::PrerenderContents* prerender_contents =
       prerender::PrerenderContents::FromWebContents(tab);
   if (prerender_contents) {
     prerender_contents->Destroy(prerender::FINAL_STATUS_CREATE_NEW_WINDOW);
     return;
   }
 
   PopupBlockerTabHelper* popup_helper =
@@ skipping 2146 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome