Rename FormData/FormDataBuilder to EncodedFormData/FormDataEncoder respectively.

Source/core/loader/HistoryItem.h

 /*
  * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 23 matching lines @@
 #include "platform/geometry/IntPoint.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/Referrer.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class Document;
 class DocumentState;
-class FormData;
+class EncodedFormData;
 class KURL;
 class ResourceRequest;
 
 class CORE_EXPORT HistoryItem final : public RefCountedWillBeGarbageCollectedFinalized<HistoryItem> {
 public:
     static PassRefPtrWillBeRawPtr<HistoryItem> create()
     {
         return adoptRefWillBeNoop(new HistoryItem);
     }
     ~HistoryItem();
 
     const String& urlString() const;
     KURL url() const;
 
     const Referrer& referrer() const;
     const String& target() const;
 
-    FormData* formData();
+    EncodedFormData* formData();
     const AtomicString& formContentType() const;
 
     const FloatPoint& visualViewportScrollPoint() const;
     void setVisualViewportScrollPoint(const FloatPoint&);
     const IntPoint& scrollPoint() const;
     void setScrollPoint(const IntPoint&);
 
     float pageScaleFactor() const;
     void setPageScaleFactor(float);
 
@@ skipping 14 matching lines @@
     void setItemSequenceNumber(long long number) { m_itemSequenceNumber = number; }
     long long itemSequenceNumber() const { return m_itemSequenceNumber; }
 
     void setDocumentSequenceNumber(long long number) { m_documentSequenceNumber = number; }
     long long documentSequenceNumber() const { return m_documentSequenceNumber; }
 
     void setScrollRestorationType(HistoryScrollRestorationType  type) { m_scrollRestorationType = type; }
     HistoryScrollRestorationType scrollRestorationType() { return m_scrollRestorationType; }
 
     void setFormInfoFromRequest(const ResourceRequest&);
-    void setFormData(PassRefPtr<FormData>);
+    void setFormData(PassRefPtr<EncodedFormData>);
     void setFormContentType(const AtomicString&);
 
     bool isCurrentDocument(Document*) const;
 
     DECLARE_TRACE();
 
 private:
     HistoryItem();
 
     String m_urlString;
@@ skipping 18 matching lines @@
     int64_t m_documentSequenceNumber;
 
     // Type of the scroll restoration for the history item determines if scroll
     // position should be restored when it is loaded during history traversal.
     HistoryScrollRestorationType m_scrollRestorationType;
 
     // Support for HTML5 History
     RefPtr<SerializedScriptValue> m_stateObject;
 
     // info used to repost form data
-    RefPtr<FormData> m_formData;
+    RefPtr<EncodedFormData> m_formData;
     AtomicString m_formContentType;
 
 }; // class HistoryItem
 
 } // namespace blink
 
 #endif // HISTORYITEM_H