PlzNavigate: Fix the http/tests/security/cross-frame-access-parent-isolated-world.html and http/tes…

third_party/WebKit/Source/core/loader/FrameLoader.cpp

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 1668aa80c56fac17ba9a3b6a9fe03e8523409b54..8315235fc9018fdbbbf8f9edd89df768ee27884c 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -1355,7 +1355,12 @@ void FrameLoader::commitProvisionalLoad() {
   }
 
   client()->transitionToCommittedForNewPage();
-  m_frame->navigationScheduler().cancel();
+
+  // PlzNavigate: We need to ensure that script initiated navigations are
+  // honored.
+  if (!m_isNavigationHandledByClient)
+    m_frame->navigationScheduler().cancel();
+
   m_frame->editor().clearLastEditCommand();
 
   // If we are still in the process of initializing an empty document then its
@@ -1684,6 +1689,11 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest,
   // request.
   recordLatestRequiredCSP();
   modifyRequestForCSP(resourceRequest, nullptr);
+
+  // We remember this flag here because shouldContinueForNavigationPolicy()
+  // resets it.
+  bool navigationWasHandledByClient = m_isNavigationHandledByClient;
+
   if (!shouldContinueForNavigationPolicy(
           resourceRequest, frameLoadRequest.substituteData(), nullptr,
           frameLoadRequest.shouldCheckMainWorldContentSecurityPolicy(),
@@ -1711,8 +1721,13 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest,
   m_provisionalDocumentLoader->setNavigationType(navigationType);
   m_provisionalDocumentLoader->setReplacesCurrentHistoryItem(
       type == FrameLoadTypeReplaceCurrentItem);
-  m_frame->navigationScheduler().cancel();
-  m_checkTimer.stop();
+
+  // PlzNavigate: We need to ensure that script initiated navigations are
+  // honored.
+  if (!navigationWasHandledByClient) {
+    m_frame->navigationScheduler().cancel();
+    m_checkTimer.stop();
+  }
 
   m_loadType = type;