Remove ResourceRequest::ExtraData

This doesn't change the behavior.

Bug: 808390
Change-Id: I54f04cd5aa7b69e25d9fa72fc82489ac9e006d28
Reviewed-on: https://chromium-review.googlesource.com/923923Reviewed-by: Takashi Toyoshima <toyoshim@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Commit-Queue: Yutaka Hirano <yhirano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537666}

third_party/WebKit/Source/platform/exported/WebURLRequest.cpp

@@ -42,30 +42,6 @@
 
 namespace blink {
 
-namespace {
-
-class URLRequestExtraDataContainer : public ResourceRequest::ExtraData {
- public:
-  static scoped_refptr<URLRequestExtraDataContainer> Create(
-      std::unique_ptr<WebURLRequest::ExtraData> extra_data) {
-    return base::AdoptRef(
-        new URLRequestExtraDataContainer(std::move(extra_data)));
-  }
-
-  ~URLRequestExtraDataContainer() override = default;
-
-  WebURLRequest::ExtraData* GetExtraData() const { return extra_data_.get(); }
-
- private:
-  explicit URLRequestExtraDataContainer(
-      std::unique_ptr<WebURLRequest::ExtraData> extra_data)
-      : extra_data_(std::move(extra_data)) {}
-
-  std::unique_ptr<WebURLRequest::ExtraData> extra_data_;
-};
-
-}  // namespace
-
 // The purpose of this struct is to permit allocating a ResourceRequest on the
 // heap, which is otherwise disallowed by DISALLOW_NEW_EXCEPT_PLACEMENT_NEW
 // annotation on ResourceRequest.
@@ -358,16 +334,11 @@ void WebURLRequest::SetPreviewsState(
 }
 
 WebURLRequest::ExtraData* WebURLRequest::GetExtraData() const {
-  scoped_refptr<ResourceRequest::ExtraData> data =
-      resource_request_->GetExtraData();
-  if (!data)
-    return nullptr;
-  return static_cast<URLRequestExtraDataContainer*>(data.get())->GetExtraData();
+  return resource_request_->GetExtraData();
 }
 
 void WebURLRequest::SetExtraData(std::unique_ptr<ExtraData> extra_data) {
-  resource_request_->SetExtraData(
-      URLRequestExtraDataContainer::Create(std::move(extra_data)));
+  resource_request_->SetExtraData(std::move(extra_data));
 }
 
 ResourceRequest& WebURLRequest::ToMutableResourceRequest() {

third_party/WebKit/Source/platform/loader/fetch/ResourceRequest.h

@@ -83,11 +83,6 @@ class PLATFORM_EXPORT ResourceRequest final {
  public:
   enum class RedirectStatus : uint8_t { kFollowedRedirect, kNoRedirect };
 
-  class ExtraData : public RefCounted<ExtraData> {
-   public:
-    virtual ~ExtraData() = default;
-  };
-
   ResourceRequest();
   explicit ResourceRequest(const String& url_string);
   explicit ResourceRequest(const KURL&);
@@ -254,9 +249,16 @@ class PLATFORM_EXPORT ResourceRequest final {
   }
 
   // Extra data associated with this request.
-  ExtraData* GetExtraData() const { return extra_data_.get(); }
-  void SetExtraData(scoped_refptr<ExtraData> extra_data) {
-    extra_data_ = std::move(extra_data);
+  WebURLRequest::ExtraData* GetExtraData() const {
+    return sharable_extra_data_ ? sharable_extra_data_->data.get() : nullptr;
+  }
+  void SetExtraData(std::unique_ptr<WebURLRequest::ExtraData> extra_data) {
+    if (extra_data) {
+      sharable_extra_data_ =
+          base::MakeRefCounted<SharableExtraData>(std::move(extra_data));
+    } else {
+      sharable_extra_data_ = nullptr;
+    }
   }
 
   WebURLRequest::RequestContext GetRequestContext() const {
@@ -363,6 +365,9 @@ class PLATFORM_EXPORT ResourceRequest final {
   bool IsAdResource() const { return is_ad_resource_; }
 
  private:
+  using SharableExtraData =
+      base::RefCountedData<std::unique_ptr<WebURLRequest::ExtraData>>;
+
   const CacheControlHeader& GetCacheControlHeader() const;
 
   bool NeedsHTTPOrigin() const;
@@ -398,7 +403,7 @@ class PLATFORM_EXPORT ResourceRequest final {
   int plugin_child_id_;
   int app_cache_host_id_;
   WebURLRequest::PreviewsState previews_state_;
-  scoped_refptr<ExtraData> extra_data_;
+  scoped_refptr<SharableExtraData> sharable_extra_data_;
   WebURLRequest::RequestContext request_context_;
   network::mojom::RequestContextFrameType frame_type_;
   network::mojom::FetchRequestMode fetch_request_mode_;