Track pending WebContents and widgets by (process_id, routing_id) pair.

content/test/test_web_contents.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 "content/test/test_web_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler_impl.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
@@ skipping 261 matching lines @@
     return delegate_view_override_;
   return WebContentsImpl::GetDelegateView();
 }
 
 void TestWebContents::SetOpener(TestWebContents* opener) {
   frame_tree_.root()->SetOpener(opener->GetFrameTree()->root());
 }
 
 void TestWebContents::AddPendingContents(TestWebContents* contents) {
   // This is normally only done in WebContentsImpl::CreateNewWindow.
-  pending_contents_[contents->GetRenderViewHost()->GetRoutingID()] = contents;
+  ProcessRoutingIdPair key(contents->GetRenderViewHost()->GetProcess()->GetID(),
+                           contents->GetRenderViewHost()->GetRoutingID());
+  pending_contents_[key] = contents;
   AddDestructionObserver(contents);
 }
 
 void TestWebContents::ExpectSetHistoryOffsetAndLength(int history_offset,
                                                       int history_length) {
   expect_set_history_offset_and_length_ = true;
   expect_set_history_offset_and_length_history_offset_ = history_offset;
   expect_set_history_offset_and_length_history_length_ = history_length;
 }
 
@@ skipping 37 matching lines @@
     const ViewHostMsg_CreateWindow_Params& params,
     SessionStorageNamespace* session_storage_namespace) {}
 
 void TestWebContents::CreateNewWidget(int32_t render_process_id,
                                       int32_t route_id,
                                       blink::WebPopupType popup_type) {}
 
 void TestWebContents::CreateNewFullscreenWidget(int32_t render_process_id,
                                                 int32_t route_id) {}
 
-void TestWebContents::ShowCreatedWindow(int route_id,
+void TestWebContents::ShowCreatedWindow(int process_id,
+                                        int route_id,
                                         WindowOpenDisposition disposition,
                                         const gfx::Rect& initial_rect,
                                         bool user_gesture) {
 }
 
-void TestWebContents::ShowCreatedWidget(int route_id,
+void TestWebContents::ShowCreatedWidget(int process_id,
+                                        int route_id,
                                         const gfx::Rect& initial_rect) {
 }
 
-void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
+void TestWebContents::ShowCreatedFullscreenWidget(int process_id,
+                                                  int route_id) {
 }
 
 void TestWebContents::SaveFrameWithHeaders(const GURL& url,
                                            const Referrer& referrer,
                                            const std::string& headers) {
   save_frame_headers_ = headers;
 }
 
 }  // namespace content