Don't update subframes on parent frame commits.

content/browser/frame_host/navigation_controller_impl_browsertest.cc

Index: content/browser/frame_host/navigation_controller_impl_browsertest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
index 8fc6ec99bb8c6def3a697740ff1ec3739b2e5cd8..a92c5d229101e7e3d809541b6207cddf614c06f9 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -3562,6 +3562,14 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
 
   EXPECT_EQ(frame_url, frame->current_url());
 
+  // At this point the rest of the test is inapplicable. The bug that it tests
+  // to be gone had to be reintroduced.

[Charlie Reis, 2016/05/05 17:45:42]

Can you clarify that the code below repros a NC_IN_PAGE_NAVIGATION kill
(assuming that it does)?

[Avi (use Gerrit), 2016/05/05 19:06:21]

It does not.

This browsertest tested the basic functionality of getting the about:blank frame
reset, which, if done, would prevent the kill. It doesn't actually go as far as
testing the kill, which would be more complicated.

[Charlie Reis, 2016/05/05 19:34:22]

Oh!  I must have misunderstood when reviewing the original CL.

Presumably we'll reopen 542299 as a result of landing this, so can you mention
there what's needed to test the actual renderer kill?

[Avi (use Gerrit), 2016/05/05 19:52:15]

Yep.
The renderer kill is when the iframe does an in-page navigation; if it navigates
from about:blank we're fine, but if the iframe fails to reset to about:blank
then it in-page navigates from the old URL and dies.

I didn't look to see how they make about:blank navigate in-frame.

+  //
+  // See the discussion in NavigationControllerImpl::FindFramesToNavigate for
+  // more information.
+  return;

[Charlie Reis, 2016/05/05 17:45:42]

nit: No need for return or the blank line below, given the #if 0.

[Avi (use Gerrit), 2016/05/05 19:06:21]

Done.

+
+#if 0
   // Go back. Because the old state had an empty frame, that should be restored
   // even though it was replaced in the second navigation entry.
 
@@ -3575,6 +3583,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
 
   EXPECT_EQ(GURL(url::kAboutBlankURL), frame->current_url());
+#endif
 }
 
 // This test is similar to "BackToAboutBlankIframe" above, except that a
@@ -3645,6 +3654,14 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
 
   EXPECT_EQ(frame_url_2, frame->current_url());
 
+  // At this point the rest of the test is inapplicable. The bug that it tests
+  // to be gone had to be reintroduced.
+  //
+  // See the discussion in NavigationControllerImpl::FindFramesToNavigate for
+  // more information.
+  return;
+

[Charlie Reis, 2016/05/05 17:45:42]

Same nits.

[Avi (use Gerrit), 2016/05/05 19:06:21]

Done.

+#if 0
   // Go back two entries. The original frame URL should be back.
 
   TestFrameNavigationObserver observer(frame);
@@ -3657,6 +3674,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
 
   EXPECT_EQ(frame_url_1, frame->current_url());
+#endif
 }
 
 // Ensure that we do not corrupt a NavigationEntry's PageState if a subframe