HTMLPreloadScanner unit tests

Source/core/html/parser/HTMLResourcePreloader.h

Index: Source/core/html/parser/HTMLResourcePreloader.h
diff --git a/Source/core/html/parser/HTMLResourcePreloader.h b/Source/core/html/parser/HTMLResourcePreloader.h
index 316decf81c47f5b1cc0360d034dce7528fc3ba3d..120f5c273f4985abfb1673e82b4daa5949fb38ba 100644
--- a/Source/core/html/parser/HTMLResourcePreloader.h
+++ b/Source/core/html/parser/HTMLResourcePreloader.h
@@ -28,81 +28,27 @@
 
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/Resource.h"
+#include "core/html/parser/PreloadRequest.h"
+#include "core/html/parser/ResourcePreloader.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/text/TextPosition.h"
 
 namespace blink {
 
-class Document;
-
-class PreloadRequest {
-public:
-    static PassOwnPtr<PreloadRequest> create(const String& initiatorName, const TextPosition& initiatorPosition, const String& resourceURL, const KURL& baseURL, Resource::Type resourceType, const FetchRequest::ResourceWidth& resourceWidth = FetchRequest::ResourceWidth())
-    {
-        return adoptPtr(new PreloadRequest(initiatorName, initiatorPosition, resourceURL, baseURL, resourceType, resourceWidth));
-    }
-
-    bool isSafeToSendToAnotherThread() const;
-
-    FetchRequest resourceRequest(Document*);
-
-    const String& charset() const { return m_charset; }
-    double discoveryTime() const { return m_discoveryTime; }
-    void setDefer(FetchRequest::DeferOption defer) { m_defer = defer; }
-    void setCharset(const String& charset) { m_charset = charset.isolatedCopy(); }
-    void setCrossOriginEnabled(StoredCredentials allowCredentials)
-    {
-        m_isCORSEnabled = true;
-        m_allowCredentials = allowCredentials;
-    }
-
-    Resource::Type resourceType() const { return m_resourceType; }
-
-private:
-    PreloadRequest(const String& initiatorName, const TextPosition& initiatorPosition, const String& resourceURL, const KURL& baseURL, Resource::Type resourceType, const FetchRequest::ResourceWidth& resourceWidth)
-        : m_initiatorName(initiatorName)
-        , m_initiatorPosition(initiatorPosition)
-        , m_resourceURL(resourceURL.isolatedCopy())
-        , m_baseURL(baseURL.copy())
-        , m_resourceType(resourceType)
-        , m_isCORSEnabled(false)
-        , m_allowCredentials(DoNotAllowStoredCredentials)
-        , m_discoveryTime(monotonicallyIncreasingTime())
-        , m_defer(FetchRequest::NoDefer)
-        , m_resourceWidth(resourceWidth)
-    {
-    }
-
-    KURL completeURL(Document*);
-
-    String m_initiatorName;
-    TextPosition m_initiatorPosition;
-    String m_resourceURL;
-    KURL m_baseURL;
-    String m_charset;
-    Resource::Type m_resourceType;
-    bool m_isCORSEnabled;
-    StoredCredentials m_allowCredentials;
-    double m_discoveryTime;
-    FetchRequest::DeferOption m_defer;
-    FetchRequest::ResourceWidth m_resourceWidth;
-};
-
-typedef Vector<OwnPtr<PreloadRequest>> PreloadRequestStream;
-
-class HTMLResourcePreloader final : public NoBaseWillBeGarbageCollected<HTMLResourcePreloader> {
+class HTMLResourcePreloader final : public NoBaseWillBeGarbageCollected<HTMLResourcePreloader>, public ResourcePreloader {
     WTF_MAKE_NONCOPYABLE(HTMLResourcePreloader); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(HTMLResourcePreloader);
 public:
     static PassOwnPtrWillBeRawPtr<HTMLResourcePreloader> create(Document&);
     DECLARE_TRACE();
 
-    void takeAndPreload(PreloadRequestStream&);
+    virtual void takeAndPreload(PreloadRequestStream&);

[kouhei (in TOK), 2015/04/30 12:59:21]

remove this?

+
+protected:
+    virtual void preload(PassOwnPtr<PreloadRequest>);

[kouhei (in TOK), 2015/04/30 12:59:21]

override

 
 private:
     explicit HTMLResourcePreloader(Document&);
 
-    void preload(PassOwnPtr<PreloadRequest>);
-
     RawPtrWillBeMember<Document> m_document;
 };