Move browser-to-renderer opener plumbing to frame routing IDs

content/browser/web_contents/web_contents_impl_unittest.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 "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
@@ skipping 894 matching lines @@
   orig_rfh->PrepareForCommit();
   contents()->TestDidNavigate(orig_rfh, 1, entry_id, true, url,
                               ui::PAGE_TRANSITION_TYPED);
 
   // Start to navigate first tab to a new site, so that it has a pending RVH.
   const GURL url2("http://www.yahoo.com");
   controller().LoadURL(
       url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
   orig_rfh->PrepareForCommit();
   TestRenderFrameHost* pending_rfh = contents()->GetPendingMainFrame();
+  SiteInstance* instance = pending_rfh->GetSiteInstance();
 
   // While it is still pending, simulate opening a new tab with the first tab
   // as its opener.  This will call CreateOpenerProxies on the opener to ensure
   // that an RVH exists.
-  int opener_routing_id = contents()->GetRenderManager()->CreateOpenerProxies(
-      pending_rfh->GetSiteInstance());
+  scoped_ptr<TestWebContents> popup(
+      TestWebContents::Create(browser_context(), instance));
+  popup->SetOpener(contents());
+  contents()->GetRenderManager()->CreateOpenerProxies(instance);
 
-  // We should find the pending RVH and not create a new one.
-  EXPECT_EQ(pending_rfh->GetRenderViewHost()->GetRoutingID(),
-            opener_routing_id);
+  // We should find the pending RFH and not create a new one.

[nasko, 2015/07/07 16:26:21]

This is only valid in regular chrome, not with --site-per-process. This tests
passes most likely in --site-per-process, because you explicitly made it so :).
I wonder if this should be restricted to cases of IsSwappedOutForbidden being
false.

[alexmos, 2015/07/08 04:42:18]

Done - see my earlier discussion.

[nasko, 2015/07/08 09:35:19]

Acknowledged.

+  int opener_frame_routing_id =
+      popup->GetRenderManager()->GetOpenerRoutingID(instance);
+  EXPECT_EQ(pending_rfh->GetRoutingID(), opener_frame_routing_id);
 }
 
 // Tests that WebContentsImpl uses the current URL, not the SiteInstance's site,
 // to determine whether a navigation is cross-site.
 TEST_F(WebContentsImplTest, CrossSiteComparesAgainstCurrentPage) {
   TestRenderFrameHost* orig_rfh = contents()->GetMainFrame();
   SiteInstance* instance1 = contents()->GetSiteInstance();
 
   // Navigate to URL.
   const GURL url("http://www.google.com");
@@ skipping 2248 matching lines @@
   // Additional changes made by the web contents should propagate as well.
   RenderViewHostTester::TestOnMessageReceived(
       test_rvh(),
       FrameHostMsg_DidChangeThemeColor(rfh->GetRoutingID(), SK_ColorGREEN));
 
   EXPECT_EQ(SK_ColorGREEN, contents()->GetThemeColor());
   EXPECT_EQ(SK_ColorGREEN, observer.last_theme_color());
 }
 
 }  // namespace content