Remove net::HttpResponseInfo::metadata

In the network service, no one sets the property. In content/browser,
some code read bytes into the property but no one uses the read content.

Bug: None
Change-Id: I16f347a1d70ca98aabf56fefc20c7423e6b52f30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526825Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Yutaka Hirano <yhirano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826150}

content/browser/appcache/appcache_disk_cache_ops.cc

@@ -231,7 +231,6 @@ void AppCacheResponseReader::OnIOComplete(int result) {
   if (result >= 0) {
     if (reading_metadata_size_) {
       DCHECK(reading_metadata_size_ == result);
-      DCHECK(info_buffer_->http_info->metadata);
       reading_metadata_size_ = 0;
     } else if (info_buffer_.get()) {
       // Deserialize the http info structure, ensuring we got headers.
@@ -253,11 +252,9 @@ void AppCacheResponseReader::OnIOComplete(int result) {
       int64_t metadata_size = entry_->GetSize(kResponseMetadataIndex);
       if (metadata_size > 0) {
         reading_metadata_size_ = metadata_size;
-        info_buffer_->http_info->metadata =
-            base::MakeRefCounted<net::IOBufferWithSize>(
-                base::checked_cast<size_t>(metadata_size));
-        ReadRaw(kResponseMetadataIndex, 0,
-                info_buffer_->http_info->metadata.get(), metadata_size);
+        metadata_ = base::MakeRefCounted<net::IOBufferWithSize>(
+            base::checked_cast<size_t>(metadata_size));
+        ReadRaw(kResponseMetadataIndex, 0, metadata_.get(), metadata_size);
         return;
       }
     } else {

content/browser/appcache/appcache_disk_cache_ops.h

@@ -15,6 +15,7 @@
 
 namespace net {
 class IOBuffer;
+class IOBufferWithSize;
 }  // namespace net
 
 namespace content {
@@ -69,6 +70,7 @@ class CONTENT_EXPORT AppCacheResponseIO {
   AppCacheDiskCacheEntry* entry_;
   scoped_refptr<HttpResponseInfoIOBuffer> info_buffer_;
   scoped_refptr<net::IOBuffer> buffer_;
+  scoped_refptr<net::IOBufferWithSize> metadata_;
   int buffer_len_;
   net::CompletionOnceCallback callback_;
   net::CompletionOnceCallback open_callback_;

content/browser/appcache/appcache_response_unittest.cc

@@ -481,16 +481,6 @@ class AppCacheResponseTest : public testing::Test {
                                MockStorageDelegate& storage_delegate) {
     EXPECT_EQ(written_response_id_, storage_delegate.loaded_info_id_);
     EXPECT_TRUE(storage_delegate.loaded_info_.get());
-    const net::HttpResponseInfo& read_head =
-        storage_delegate.loaded_info_->http_response_info();
-    const int metadata_size = strlen(metadata);
-    if (metadata_size) {
-      EXPECT_TRUE(read_head.metadata.get());
-      EXPECT_EQ(metadata_size, read_head.metadata->size());
-      EXPECT_EQ(0, memcmp(metadata, read_head.metadata->data(), metadata_size));
-    } else {
-      EXPECT_FALSE(read_head.metadata.get());
-    }
     EXPECT_TRUE(CompareHttpResponseInfos(
         *write_info_buffer_->http_info,
         storage_delegate.loaded_info_->http_response_info()));

net/http/http_response_info.cc

@@ -8,7 +8,6 @@
 #include "base/numerics/safe_conversions.h"
 #include "base/pickle.h"
 #include "base/time/time.h"
-#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/cert/sct_status_flags.h"
 #include "net/cert/signed_certificate_timestamp.h"

net/http/http_response_info.h

@@ -24,7 +24,6 @@ class Pickle;
 namespace net {
 
 class HttpResponseHeaders;
-class IOBufferWithSize;
 class SSLCertRequestInfo;
 
 class NET_EXPORT HttpResponseInfo {
@@ -242,9 +241,6 @@ class NET_EXPORT HttpResponseInfo {
   // The "Vary" header data for this response.
   HttpVaryData vary_data;
 
-  // Any metadata associated with this resource's cached data.
-  scoped_refptr<IOBufferWithSize> metadata;
-
   static std::string ConnectionInfoToString(ConnectionInfo connection_info);
 };
 

services/network/url_loader.cc

@@ -1811,16 +1811,6 @@ void URLLoader::SendResponseToClient() {
   TRACE_EVENT1("loading", "network::URLLoader::SendResponseToClient", "url",
                url_request_->url().possibly_invalid_spec());
   url_loader_client_->OnReceiveResponse(std::move(response_));
-
-  net::IOBufferWithSize* metadata =
-      url_request_->response_info().metadata.get();
-  if (metadata) {
-    const uint8_t* data = reinterpret_cast<const uint8_t*>(metadata->data());
-
-    url_loader_client_->OnReceiveCachedMetadata(
-        std::vector<uint8_t>(data, data + metadata->size()));
-  }
-
   url_loader_client_->OnStartLoadingResponseBody(std::move(consumer_handle_));
 }