PlzNavigate: track pending commits

content/browser/web_contents/web_contents_impl_unittest.cc

Index: content/browser/web_contents/web_contents_impl_unittest.cc
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index 32f102dfbdf6e5f0414c9aeaf0030037c9590328..db9d9fcf64a4336dfb04f327ca5ac1bdcb1fdbbe 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -2660,11 +2660,11 @@ TEST_F(WebContentsImplTest, ActiveContentsCountNavigate) {
                                     std::string());
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserSideNavigation)) {
-    contents->GetMainFrame()->SendBeforeUnloadACK(true);
+    contents->GetMainFrame()->PrepareForCommit();

[clamy, 2015/03/30 12:50:57]

Decoupling the CommitPendingNavigation in two was necessary to get to the state
where we are sure to have a cross-site navigation pending in PlzNavigate.

[carlosk, 2015/03/31 13:01:32]

To make sure I understand what you mean: you are explaining why the
if-PlzNavigate-block here is still needed, right?

   }
   EXPECT_TRUE(contents->cross_navigation_pending());
   EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount());
-  contents->CommitPendingNavigation();
+  contents->GetPendingMainFrame()->SendNavigate(0, kUrl);
   EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount());
 
   contents.reset();