Enable swapping a frame back in to its parent process

content/browser/site_per_process_browsertest.cc

Index: content/browser/site_per_process_browsertest.cc
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 85c710d678c1870eef40f204d833e00ab9d582b3..ea7fb85de9708ac83ece7b3f269772bda09d1036 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -293,7 +293,9 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) {
             ->GetRenderWidgetHostViewsInTree();
     EXPECT_EQ(2U, views_set.size());
   }
-  EXPECT_EQ(proxy_to_parent, child->render_manager()->GetProxyToParent());
+  EXPECT_NE(proxy_to_parent, child->render_manager()->GetProxyToParent());
+  proxy_to_parent = child->render_manager()->GetProxyToParent();
+  EXPECT_TRUE(proxy_to_parent);
   EXPECT_TRUE(proxy_to_parent->cross_process_frame_connector());
   EXPECT_EQ(
       child->current_frame_host()->render_view_host()->GetView(),
@@ -350,13 +352,13 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, NavigateRemoteFrame) {
   EXPECT_NE(site_instance,
             child->current_frame_host()->GetSiteInstance());
 
-  // TODO(japhet): This currently causes an assertion in the renderer process.
-  // Enable when the assertion is fixed.
-  //NavigateFrameToURL(child, http_url);
-  //EXPECT_EQ(http_url, observer.navigation_url());
-  //EXPECT_TRUE(observer.navigation_succeeded());
-  //EXPECT_EQ(shell()->web_contents()->GetSiteInstance(),
-  //          child->current_frame_host()->GetSiteInstance());
+  // Navigate back to the parent's origin and ensure we return to the
+  // parent's process.
+  NavigateFrameToURL(child, http_url);
+  EXPECT_EQ(http_url, observer.navigation_url());
+  EXPECT_TRUE(observer.navigation_succeeded());
+  EXPECT_EQ(shell()->web_contents()->GetSiteInstance(),
+            child->current_frame_host()->GetSiteInstance());
 }
 
 // Crash a subframe and ensures its children are cleared from the FrameTree.