Move blink::Resource::overhead_size_ after resource_request_.

CalculateOverheadSize() calls resource_request_.Url(), so
resource_request_ must be set before setting overhead_size_.

Bug: 900529
Change-Id: I7b373395c018a43934f92ef2e67acd18f00211f3
Reviewed-on: https://chromium-review.googlesource.com/c/1312187Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Commit-Queue: Tsuyoshi Horo <horo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604566}

third_party/blink/renderer/platform/loader/fetch/resource.cc

@@ -194,7 +194,6 @@ Resource::Resource(const ResourceRequest& request,
       encoded_size_(0),
       encoded_size_memory_usage_(0),
       decoded_size_(0),
-      overhead_size_(CalculateOverheadSize()),
       cache_identifier_(MemoryCache::DefaultCacheIdentifier()),
       link_preload_(false),
       is_revalidating_(false),
@@ -203,7 +202,8 @@ Resource::Resource(const ResourceRequest& request,
       integrity_disposition_(ResourceIntegrityDisposition::kNotChecked),
       options_(options),
       response_timestamp_(CurrentTime()),
-      resource_request_(request) {
+      resource_request_(request),
+      overhead_size_(CalculateOverheadSize()) {
   InstanceCounters::IncrementCounter(InstanceCounters::kResourceCounter);
 
   if (IsMainThread())

third_party/blink/renderer/platform/loader/fetch/resource.h

@@ -532,12 +532,6 @@ class PLATFORM_EXPORT Resource : public GarbageCollectedFinalized<Resource>,
   size_t encoded_size_memory_usage_;
   size_t decoded_size_;
 
-  // Resource::CalculateOverheadSize() is affected by changes in
-  // |m_resourceRequest.url()|, but |m_overheadSize| is not updated after
-  // initial |m_resourceRequest| is given, to reduce MemoryCache manipulation
-  // and thus potential bugs. crbug.com/594644
-  const size_t overhead_size_;
-
   String cache_identifier_;
 
   bool link_preload_;
@@ -566,6 +560,13 @@ class PLATFORM_EXPORT Resource : public GarbageCollectedFinalized<Resource>,
   TaskHandle async_finish_pending_clients_task_;
 
   ResourceRequest resource_request_;
+
+  // Resource::CalculateOverheadSize() is affected by changes in
+  // |m_resourceRequest.url()|, but |m_overheadSize| is not updated after
+  // initial |m_resourceRequest| is given, to reduce MemoryCache manipulation
+  // and thus potential bugs. crbug.com/594644
+  const size_t overhead_size_;
+
   Member<ResourceLoader> loader_;
   ResourceResponse response_;