Remove WebURLRequest::initialize() and simplify WebURLRequest

third_party/WebKit/public/platform/WebURLRequest.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebURLRequest_h
 #define WebURLRequest_h
 
 #include "WebAddressSpace.h"
 #include "WebCommon.h"
 #include "WebHTTPBody.h"
 #include "WebReferrerPolicy.h"
+#include <memory>
 
 namespace blink {
 
 class ResourceRequest;
 class WebHTTPBody;
 class WebHTTPHeaderVisitor;
 class WebSecurityOrigin;
 class WebString;
 class WebURL;
-class WebURLRequestPrivate;
 enum class WebCachePolicy;
 
 class WebURLRequest {
 public:
     enum Priority {
         PriorityUnresolved = -1,
         PriorityVeryLow,
         PriorityLow,
         PriorityMedium,
         PriorityHigh,
@@ skipping 93 matching lines @@
         Controlling,
         // Request should skip all possible service workers.
         All
     };
 
     class ExtraData {
     public:
         virtual ~ExtraData() { }
     };
 
-    ~WebURLRequest() { reset(); }
-
-    WebURLRequest() : m_private(0) { }
-    WebURLRequest(const WebURLRequest& r) : m_private(0) { assign(r); }
-    WebURLRequest& operator=(const WebURLRequest& r)
-    {
-        assign(r);
-        return *this;
-    }
-
-    explicit WebURLRequest(const WebURL& url) : m_private(0)
-    {
-        initialize();
-        setURL(url);
-    }
-
-    BLINK_PLATFORM_EXPORT void initialize();
-    BLINK_PLATFORM_EXPORT void reset();
-    BLINK_PLATFORM_EXPORT void assign(const WebURLRequest&);
+    BLINK_PLATFORM_EXPORT ~WebURLRequest();
+    BLINK_PLATFORM_EXPORT WebURLRequest();
+    BLINK_PLATFORM_EXPORT WebURLRequest(const WebURLRequest&);
+    BLINK_PLATFORM_EXPORT explicit WebURLRequest(const WebURL&);
+    BLINK_PLATFORM_EXPORT WebURLRequest& operator=(const WebURLRequest&);
 
     BLINK_PLATFORM_EXPORT bool isNull() const;
 
     BLINK_PLATFORM_EXPORT WebURL url() const;
     BLINK_PLATFORM_EXPORT void setURL(const WebURL&);
 
     // Used to implement third-party cookie blocking.
     BLINK_PLATFORM_EXPORT WebURL firstPartyForCookies() const;
     BLINK_PLATFORM_EXPORT void setFirstPartyForCookies(const WebURL&);
 
@@ skipping 126 matching lines @@
     BLINK_PLATFORM_EXPORT void setUiStartTime(double);
     BLINK_PLATFORM_EXPORT WebURLRequest::InputToLoadPerfMetricReportPolicy inputPerfMetricReportPolicy() const;
     BLINK_PLATFORM_EXPORT void setInputPerfMetricReportPolicy(WebURLRequest::InputToLoadPerfMetricReportPolicy);
 
     // https://mikewest.github.io/cors-rfc1918/#external-request
     BLINK_PLATFORM_EXPORT bool isExternalRequest() const;
 
 #if INSIDE_BLINK
     BLINK_PLATFORM_EXPORT ResourceRequest& toMutableResourceRequest();
     BLINK_PLATFORM_EXPORT const ResourceRequest& toResourceRequest() const;
+
+protected:
+    // Permit subclasses to set arbitrary ResourceRequest pointer as
+    // |m_resourceRequest|. |m_ownedResourceRequest| is not set in this case.
+    BLINK_PLATFORM_EXPORT explicit WebURLRequest(ResourceRequest&);
 #endif
 
-protected:
-    BLINK_PLATFORM_EXPORT void assign(WebURLRequestPrivate*);
+private:
+    struct ResourceRequestContainer;
 
-private:
-    WebURLRequestPrivate* m_private;
+    // If this instance owns a ResourceRequest then |m_ownedResourceRequest|
+    // is non-null and |m_resourceRequest| points to the ResourceRequest
+    // instance it contains.
+    std::unique_ptr<ResourceRequestContainer> m_ownedResourceRequest;
+
+    // Should never be null.
+    ResourceRequest* m_resourceRequest;
 };
 
 } // namespace blink
 
 #endif