Cleanup blink-side PlzNavigate logic

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 184 matching lines @@
                                        PassRefPtr<SerializedScriptValue>,
                                        HistoryScrollRestorationType,
                                        FrameLoadType,
                                        Document*);
 
   HistoryItem* currentItem() const { return m_currentItem.get(); }
   void saveScrollState();
 
   void restoreScrollPositionAndViewState();
 
-  bool shouldContinueForNavigationPolicy(const ResourceRequest&,
-                                         const SubstituteData&,
-                                         DocumentLoader*,
-                                         ContentSecurityPolicyDisposition,
-                                         NavigationType,
-                                         NavigationPolicy,
-                                         FrameLoadType,
-                                         bool isClientRedirect,
-                                         HTMLFormElement*);
+  NavigationPolicy shouldContinueForNavigationPolicy(

[clamy, 2017/03/02 14:37:18]

Maybe add a comment about which NavigationPolicy should prompt us to continue?

[Nate Chapin, 2017/03/02 19:39:18]

Done.

+      const ResourceRequest&,
+      const SubstituteData&,
+      DocumentLoader*,
+      ContentSecurityPolicyDisposition,
+      NavigationType,
+      NavigationPolicy,
+      FrameLoadType,
+      bool isClientRedirect,
+      HTMLFormElement*);
 
   // PlzNavigate: Navigations handled by the client are treated as
   // provisional navigations.

[clamy, 2017/03/02 14:37:18]

nit: I think the comment should be updated. Maybe something like:
// PlzNavigate
// Note: navigations handled by the client have created a dummy provisional
DocumentLoader, so this will return true while the client handles the
navigation.

[Nate Chapin, 2017/03/02 19:39:18]

Done.

-  bool hasProvisionalNavigation() const {
-    return provisionalDocumentLoader() || m_isNavigationHandledByClient;
-  }
-
-  void clearNavigationHandledByClient();
+  bool hasProvisionalNavigation() const { return provisionalDocumentLoader(); }
 
   DECLARE_TRACE();
 
   static void setReferrerForFrameRequest(FrameLoadRequest&);
 
  private:
   void checkTimerFired(TimerBase*);
 
   bool prepareRequestForThisFrame(FrameLoadRequest&);
   FrameLoadType determineFrameLoadType(const FrameLoadRequest&);
 
   SubstituteData defaultSubstituteDataForURL(const KURL&);
 
   bool shouldPerformFragmentNavigation(bool isFormSubmission,
                                        const String& httpMethod,
                                        FrameLoadType,
                                        const KURL&);
   void processFragment(const KURL&, FrameLoadType, LoadStartType);
 
-  bool checkLoadCanStart(FrameLoadRequest&,
-                         FrameLoadType,
-                         NavigationPolicy,
-                         NavigationType);
+  NavigationPolicy checkLoadCanStart(FrameLoadRequest&,
+                                     FrameLoadType,
+                                     NavigationPolicy,
+                                     NavigationType);
   void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy);
 
   enum class HistoryNavigationType { DifferentDocument, Fragment, HistoryApi };
   void setHistoryItemStateForCommit(FrameLoadType,
                                     HistoryCommitType,
                                     HistoryNavigationType);
 
   void loadInSameDocument(const KURL&,
                           PassRefPtr<SerializedScriptValue> stateObject,
                           FrameLoadType,
                           HistoryLoadType,
                           ClientRedirectPolicy,
                           Document*);
   void restoreScrollPositionAndViewStateForLoadType(FrameLoadType);
 
   void scheduleCheckCompleted();
 
   void detachDocumentLoader(Member<DocumentLoader>&);
 
   void upgradeInsecureRequest(ResourceRequest&, Document*) const;
 
   std::unique_ptr<TracedValue> toTracedValue() const;
   void takeObjectSnapshot() const;
 
   DocumentLoader* createDocumentLoader(const ResourceRequest&,
                                        const FrameLoadRequest&,
                                        FrameLoadType,
                                        NavigationType);
 
-  void setNavigationHandledByClient();
-
   Member<LocalFrame> m_frame;
   AtomicString m_requiredCSP;
 
   // FIXME: These should be std::unique_ptr<T> to reduce build times and
   // simplify header dependencies unless performance testing proves otherwise.
   // Some of these could be lazily created for memory savings on devices.
   mutable FrameLoaderStateMachine m_stateMachine;
 
   Member<ProgressTracker> m_progressTracker;
 
@@ skipping 40 matching lines @@
   Member<DeferredHistoryLoad> m_deferredHistoryLoad;
 
   bool m_inStopAllLoaders;
 
   TaskRunnerTimer<FrameLoader> m_checkTimer;
 
   SandboxFlags m_forcedSandboxFlags;
 
   bool m_dispatchingDidClearWindowObjectInMainWorld;
   bool m_protectProvisionalLoader;
-  bool m_isNavigationHandledByClient;
 };
 
 }  // namespace blink
 
 #endif  // FrameLoader_h