Remove DataElementType::kBlob

It's no longer being used.

Fixed: 846167
Change-Id: I3636e12cdab07188c90199329826de4ef18432f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2444430
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813901}

content/browser/blob_storage/blob_url_unittest.cc

@@ -78,7 +78,6 @@ class BlobURLTest : public testing::Test {
   BlobURLTest()
       : task_environment_(BrowserTaskEnvironment::IO_MAINLOOP),
         blob_data_(new BlobDataBuilder("uuid")),
-        blob_uuid_(blob_data_->uuid()),
         response_error_code_(net::OK),
         expected_error_code_(net::OK),
         expected_status_code_(0) {}
@@ -309,7 +308,6 @@ class BlobURLTest : public testing::Test {
   storage::BlobUrlRegistry blob_url_registry_;
   std::unique_ptr<storage::BlobDataHandle> blob_handle_;
   std::unique_ptr<BlobDataBuilder> blob_data_;
-  std::string blob_uuid_;
   std::unique_ptr<BlobDataSnapshot> blob_data_snapshot_;
   std::string response_;
   int response_error_code_;

content/browser/child_process_security_policy_impl.cc

@@ -1289,11 +1289,6 @@ bool ChildProcessSecurityPolicyImpl::CanReadRequestBody(
         // Data is self-contained within |body| - no need to check access.
         break;
 
-      case network::mojom::DataElementType::kBlob:
-        // No need to validate - the unguessability of the uuid of the blob is a
-        // sufficient defense against access from an unrelated renderer.
-        break;
-
       case network::mojom::DataElementType::kDataPipe:
         // Data is self-contained within |body| - no need to check access.
         break;

content/common/page_state_serialization.cc

@@ -54,12 +54,6 @@ void AppendFileRangeToRequestBody(
       file_modification_time);
 }
 
-void AppendBlobToRequestBody(
-    const scoped_refptr<network::ResourceRequestBody>& request_body,
-    const std::string& uuid) {
-  request_body->AppendBlob(uuid);
-}
-
 //----------------------------------------------------------------------------
 
 void AppendReferencedFilesFromHttpBody(
@@ -290,10 +284,6 @@ GURL ReadGURL(SerializeObject* obj) {
   return GURL();
 }
 
-void WriteStdString(const std::string& s, SerializeObject* obj) {
-  obj->pickle.WriteString(s);
-}
-
 std::string ReadStdString(SerializeObject* obj) {
   std::string s;
   if (obj->iter.ReadString(&s))
@@ -416,10 +406,6 @@ void WriteResourceRequestBody(const network::ResourceRequestBody& request_body,
         WriteInteger64(static_cast<int64_t>(element.length()), obj);
         WriteReal(element.expected_modification_time().ToDoubleT(), obj);
         break;
-      case network::mojom::DataElementType::kBlob:
-        WriteInteger(blink::WebHTTPBody::Element::kTypeBlob, obj);
-        WriteStdString(element.blob_uuid(), obj);
-        break;
       default:
         NOTREACHED();
         continue;
@@ -451,11 +437,11 @@ void ReadResourceRequestBody(
           request_body, file_path, file_start, file_length,
           base::Time::FromDoubleT(file_modification_time));
     } else if (type == blink::WebHTTPBody::Element::kTypeBlob) {
+      // Skip obsolete blob values.
       if (obj->version >= 16) {
-        std::string blob_uuid = ReadStdString(obj);
-        AppendBlobToRequestBody(request_body, blob_uuid);
+        ReadStdString(obj);
       } else {
-        ReadGURL(obj);  // Skip the obsolete blob url value.
+        ReadGURL(obj);
       }
     }
   }
@@ -691,9 +677,6 @@ void WriteResourceRequestBody(const network::ResourceRequestBody& request_body,
         data_element->set_file(std::move(file));
         break;
       }
-      case network::mojom::DataElementType::kBlob:
-        data_element->set_blob_uuid(element.blob_uuid());
-        break;
       case network::mojom::DataElementType::kDataPipe:
         NOTIMPLEMENTED();
         break;
@@ -727,7 +710,7 @@ void ReadResourceRequestBody(
         break;
       }
       case blink::mojom::Element::Tag::BLOB_UUID:
-        AppendBlobToRequestBody(request_body, element->get_blob_uuid());
+        // No longer supported.
         break;
       case blink::mojom::Element::Tag::DEPRECATED_FILE_SYSTEM_FILE:
         // No longer supported.

content/common/page_state_serialization_unittest.cc

@@ -50,7 +50,6 @@ void ExpectEquality(const network::DataElement& expected,
   EXPECT_EQ(expected.length(), actual.length());
   EXPECT_EQ(expected.expected_modification_time(),
             actual.expected_modification_time());
-  EXPECT_EQ(expected.blob_uuid(), actual.blob_uuid());
 }
 
 template <>
@@ -686,8 +685,6 @@ TEST_F(PageStateSerializationTest, BackwardsCompat_HttpBody) {
   std::string test_body("foo");
   http_body.request_body->AppendBytes(test_body.data(), test_body.size());
 
-  http_body.request_body->AppendBlob("some_uuid");
-
   base::FilePath path(FILE_PATH_LITERAL("file.txt"));
   http_body.request_body->AppendFileRange(base::FilePath(path), 100, 1024,
                                           base::Time::FromDoubleT(9999.0));

content/renderer/loader/web_url_request_util.cc

@@ -137,9 +137,6 @@ WebHTTPBody GetWebHTTPBodyForRequestBody(
             modification_time);
         break;
       }
-      case network::mojom::DataElementType::kBlob:
-          http_body.AppendBlob(WebString::FromASCII(element.blob_uuid()));
-        break;
       case network::mojom::DataElementType::kDataPipe: {
         http_body.AppendDataPipe(element.CloneDataPipeGetter());
         break;