Move HistoryItem handling to DocumentLoader

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

Index: third_party/WebKit/Source/core/loader/FrameLoader.h
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.h b/third_party/WebKit/Source/core/loader/FrameLoader.h
index 20896276cce503d7e07d0233ba92921db7cf3a75..76ebabf4d5bb96637c0b22ea1a7f0b4af691ad4e 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.h
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.h
@@ -55,6 +55,7 @@
 
 namespace blink {
 
+class Document;
 class DocumentLoader;
 class HTMLFormElement;
 class Frame;
@@ -63,7 +64,6 @@ class ProgressTracker;
 class ResourceError;
 class SerializedScriptValue;
 class SubstituteData;
-enum class WebCachePolicy;
 struct FrameLoadRequest;
 
 CORE_EXPORT bool isBackForwardLoadType(FrameLoadType);
@@ -74,9 +74,6 @@ class CORE_EXPORT FrameLoader final {
   DISALLOW_NEW();
 
  public:
-  static ResourceRequest resourceRequestFromHistoryItem(HistoryItem*,
-                                                        WebCachePolicy);
-
   explicit FrameLoader(LocalFrame*);
   ~FrameLoader();
 
@@ -136,11 +133,6 @@ class CORE_EXPORT FrameLoader final {
 
   void didExplicitOpen();
 
-  // Callbacks from DocumentWriter
-  void didInstallNewDocument();
-
-  void receivedFirstData();
-
   String userAgent() const;
 
   void dispatchDidClearWindowObjectInMainWorld();
@@ -168,8 +160,6 @@ class CORE_EXPORT FrameLoader final {
   void finishedParsing();
   void checkCompleted();
 
-  void clearProvisionalHistoryItem();
-
   // This prepares the FrameLoader for the next commit. It will dispatch unload
   // events, abort XHR requests and detach the document. Returns true if the
   // frame is ready to receive the next commit, or false otherwise.
@@ -195,9 +185,7 @@ class CORE_EXPORT FrameLoader final {
                                        FrameLoadType,
                                        Document*);
 
-  HistoryItem* currentItem() const { return m_currentItem.get(); }
   void saveScrollState();
-
   void restoreScrollPositionAndViewState();
 
   // The navigation should only be continued immediately in this frame if this
@@ -218,6 +206,8 @@ class CORE_EXPORT FrameLoader final {
   // while the client handles the navigation.
   bool hasProvisionalNavigation() const { return provisionalDocumentLoader(); }
 
+  void detachProvisionalDocumentLoader(DocumentLoader*);
+
   DECLARE_TRACE();
 
   static void setReferrerForFrameRequest(FrameLoadRequest&);
@@ -240,17 +230,15 @@ class CORE_EXPORT FrameLoader final {
                                      FrameLoadType,
                                      NavigationPolicy,
                                      NavigationType);
-  void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy);
-
-  enum class HistoryNavigationType { DifferentDocument, Fragment, HistoryApi };
-  void setHistoryItemStateForCommit(FrameLoadType,
-                                    HistoryCommitType,
-                                    HistoryNavigationType);
+  void startLoad(FrameLoadRequest&,
+                 FrameLoadType,
+                 NavigationPolicy,
+                 HistoryItem*);
 
   void loadInSameDocument(const KURL&,
                           PassRefPtr<SerializedScriptValue> stateObject,
                           FrameLoadType,
-                          HistoryLoadType,
+                          HistoryItem*,
                           ClientRedirectPolicy,
                           Document*);
   void restoreScrollPositionAndViewStateForLoadType(FrameLoadType);
@@ -287,9 +275,6 @@ class CORE_EXPORT FrameLoader final {
   Member<DocumentLoader> m_documentLoader;
   Member<DocumentLoader> m_provisionalDocumentLoader;
 
-  Member<HistoryItem> m_currentItem;
-  Member<HistoryItem> m_provisionalItem;
-
   class DeferredHistoryLoad
       : public GarbageCollectedFinalized<DeferredHistoryLoad> {
     WTF_MAKE_NONCOPYABLE(DeferredHistoryLoad);