Remove WebURLResponse::initialize() [revised]

third_party/WebKit/public/platform/WebURLResponse.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 19 matching lines @@
 
 #ifndef WebURLResponse_h
 #define WebURLResponse_h
 
 #include "public/platform/WebCString.h"
 #include "public/platform/WebCommon.h"
 #include "public/platform/WebPrivateOwnPtr.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebVector.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerResponseType.h"
+#include <memory>
 
 namespace blink {
 
 class ResourceResponse;
 class WebHTTPHeaderVisitor;
 class WebHTTPLoadInfo;
 class WebURL;
 class WebURLLoadTiming;
 class WebURLResponsePrivate;
 
@@ skipping 78 matching lines @@
         size_t numInvalidScts;
         size_t numValidScts;
         SignedCertificateTimestampList sctList;
     };
 
     class ExtraData {
     public:
         virtual ~ExtraData() { }
     };
 
-    ~WebURLResponse() { reset(); }
+    BLINK_PLATFORM_EXPORT ~WebURLResponse();
 
-    WebURLResponse() : m_private(0) { }
-    WebURLResponse(const WebURLResponse& r) : m_private(0) { assign(r); }
-    WebURLResponse& operator=(const WebURLResponse& r)
-    {
-        assign(r);
-        return *this;
-    }
-
-    explicit WebURLResponse(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 WebURLResponse&);
+    BLINK_PLATFORM_EXPORT WebURLResponse();
+    BLINK_PLATFORM_EXPORT WebURLResponse(const WebURLResponse&);
+    BLINK_PLATFORM_EXPORT explicit WebURLResponse(const WebURL&);
+    BLINK_PLATFORM_EXPORT WebURLResponse& operator=(const WebURLResponse&);
 
     BLINK_PLATFORM_EXPORT bool isNull() const;
 
     BLINK_PLATFORM_EXPORT WebURL url() const;
     BLINK_PLATFORM_EXPORT void setURL(const WebURL&);
 
     BLINK_PLATFORM_EXPORT unsigned connectionID() const;
     BLINK_PLATFORM_EXPORT void setConnectionID(unsigned);
 
     BLINK_PLATFORM_EXPORT bool connectionReused() const;
@@ skipping 131 matching lines @@
     // Extra data associated with the underlying resource response. Resource
     // responses can be copied. If non-null, each copy of a resource response
     // holds a pointer to the extra data, and the extra data pointer will be
     // deleted when the last resource response is destroyed. Setting the extra
     // data pointer will cause the underlying resource response to be
     // dissociated from any existing non-null extra data pointer.
     BLINK_PLATFORM_EXPORT ExtraData* getExtraData() const;
     BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);
 
 protected:
-    BLINK_PLATFORM_EXPORT void assign(WebURLResponsePrivate*);
+    // Permit subclasses to set arbitrary WebURLResponsePrivate pointer as
+    // |m_private|. Parameter must be non-null. |m_owningPrivate| is not set
+    // in this case.
+    BLINK_PLATFORM_EXPORT explicit WebURLResponse(WebURLResponsePrivate*);
 
 private:
+    // If this instance owns WebURLResponsePrivate |m_owningPrivate| is
+    // non-null and is pointed by |m_private|.
+    std::unique_ptr<WebURLResponsePrivate> m_owningPrivate;
+
+    // Should never be null.
     WebURLResponsePrivate* m_private;
 };
 
 } // namespace blink
 
 #endif