Make WebURLRequest hold ResourceRequest ptr directly.

ResourceRequestContainer is a wrapper class of ResourceRequest to
keep the instance on heap since historycally ResourceRequest had
been stated DISALLOW_NEW.
However crrev.com/c/776407 has changed ResourceRequest to be newed.
This CL refactors the structure simplify.

Bug: 787704
Change-Id: I8cf85085d939e9053b84513bc0e23824991a98c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2024392
Commit-Queue: Yoichi Osato <yoichio@chromium.org>
Reviewed-by: Takashi Toyoshima <toyoshim@chromium.org>
Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Reviewed-by: Keishi Hattori <keishi@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736252}

third_party/blink/public/platform/web_url_request.h

@@ -400,12 +400,10 @@ class WebURLRequest {
 #endif
 
  private:
-  struct ResourceRequestContainer;
-
   // If this instance owns a ResourceRequest then |owned_resource_request_|
   // is non-null and |resource_request_| points to the ResourceRequest
   // instance it contains.
-  std::unique_ptr<ResourceRequestContainer> owned_resource_request_;
+  std::unique_ptr<ResourceRequest> owned_resource_request_;
 
   // Should never be null.
   ResourceRequest* resource_request_;

third_party/blink/renderer/platform/exported/web_url_request.cc

@@ -52,29 +52,17 @@ namespace blink {
 
 WebURLRequest::ExtraData::ExtraData() : render_frame_id_(MSG_ROUTING_NONE) {}
 
-// The purpose of this struct is to permit allocating a ResourceRequest on the
-// heap, which is otherwise disallowed by DISALLOW_NEW annotation on
-// ResourceRequest.
-// TODO(keishi): Replace with GCWrapper<ResourceRequest>
-struct WebURLRequest::ResourceRequestContainer {
-  ResourceRequestContainer() = default;
-  explicit ResourceRequestContainer(const ResourceRequest& r) {
-    resource_request.CopyFrom(r);
-  }
-
-  ResourceRequest resource_request;
-};
-
 WebURLRequest::~WebURLRequest() = default;
 
 WebURLRequest::WebURLRequest()
-    : owned_resource_request_(new ResourceRequestContainer()),
-      resource_request_(&owned_resource_request_->resource_request) {}
+    : owned_resource_request_(std::make_unique<ResourceRequest>()),
+      resource_request_(owned_resource_request_.get()) {}
 
 WebURLRequest::WebURLRequest(const WebURLRequest& r)
-    : owned_resource_request_(
-          new ResourceRequestContainer(*r.resource_request_)),
-      resource_request_(&owned_resource_request_->resource_request) {}
+    : owned_resource_request_(std::make_unique<ResourceRequest>()),
+      resource_request_(owned_resource_request_.get()) {
+  resource_request_->CopyFrom(*r.resource_request_);
+}
 
 WebURLRequest::WebURLRequest(const WebURL& url) : WebURLRequest() {
   SetUrl(url);