Remove unnecessary methods and collapse function calls in the preloader code

- Remove PreloadRequest::defer()
- Remove ResourceFetcher::requestPreload(). The only user is preload()
  and is just calling requestPreload().
- Move setDefer() call in HTMLResourcePreloader::preload() into
  resourceRequest() call
- Make HTMLResourcePreloader::preload() private

R=japhet
BUG=none

Review URL: https://codereview.chromium.org/717453002

git-svn-id: svn://svn.chromium.org/blink/trunk@185100 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

@@ -1232,11 +1232,6 @@ void ResourceFetcher::decrementRequestCount(const Resource* res)
 }
 
 void ResourceFetcher::preload(Resource::Type type, FetchRequest& request, const String& charset)
-{
-    requestPreload(type, request, charset);
-}
-
-void ResourceFetcher::requestPreload(Resource::Type type, FetchRequest& request, const String& charset)
 {
     // Ensure main resources aren't preloaded, since the cache can't actually reuse the preload.
     if (type == Resource::MainResource)

third_party/WebKit/Source/core/fetch/ResourceFetcher.h

@@ -183,7 +183,6 @@ private:
     void preCacheDataURIImage(const FetchRequest&);
     void preCacheSubstituteDataForMainResource(const FetchRequest&, const SubstituteData&);
     void storeResourceTimingInitiatorInformation(Resource*);
-    void requestPreload(Resource::Type, FetchRequest&, const String& charset);
 
     enum RevalidationPolicy { Use, Revalidate, Reload, Load };
     RevalidationPolicy determineRevalidationPolicy(Resource::Type, const FetchRequest&, Resource* existingResource) const;

third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp

@@ -58,6 +58,9 @@ FetchRequest PreloadRequest::resourceRequest(Document* document)
 
     if (m_isCORSEnabled)
         request.setCrossOriginAccessControl(document->securityOrigin(), m_allowCredentials);
+
+    request.setDefer(m_defer);
+
     return request;
 }
 
@@ -88,7 +91,6 @@ void HTMLResourcePreloader::takeAndPreload(PreloadRequestStream& r)
 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload)
 {
     FetchRequest request = preload->resourceRequest(m_document);
-    request.setDefer(preload->defer());
     blink::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime())), 0, 2000, 20);
     m_document->fetcher()->preload(preload->resourceType(), request, preload->charset());
 }

third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.h

@@ -46,7 +46,6 @@ public:
 
     const String& charset() const { return m_charset; }
     double discoveryTime() const { return m_discoveryTime; }
-    FetchRequest::DeferOption defer() const { return m_defer; }
     void setDefer(FetchRequest::DeferOption defer) { m_defer = defer; }
     void setCharset(const String& charset) { m_charset = charset.isolatedCopy(); }
     void setCrossOriginEnabled(StoredCredentials allowCredentials)
@@ -94,11 +93,12 @@ public:
     void trace(Visitor*);
 
     void takeAndPreload(PreloadRequestStream&);
-    void preload(PassOwnPtr<PreloadRequest>);
 
 private:
     explicit HTMLResourcePreloader(Document&);
 
+    void preload(PassOwnPtr<PreloadRequest>);
+
     RawPtrWillBeMember<Document> m_document;
 };