Create blobs from Disk Cache entries.

content/common/resource_messages.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/resource_messages.h"
 
 #include "net/base/load_timing_info.h"
 #include "net/http/http_response_headers.h"
 
 namespace IPC {
@@ skipping 38 matching lines @@
       WriteParam(m, p.expected_modification_time());
       break;
     }
     case storage::DataElement::TYPE_FILE_FILESYSTEM: {
       WriteParam(m, p.filesystem_url());
       WriteParam(m, p.offset());
       WriteParam(m, p.length());
       WriteParam(m, p.expected_modification_time());
       break;
     }
-    default: {
-      DCHECK(p.type() == storage::DataElement::TYPE_BLOB);
+    case storage::DataElement::TYPE_BLOB: {
       WriteParam(m, p.blob_uuid());
       WriteParam(m, p.offset());
       WriteParam(m, p.length());
       break;
     }
+    case storage::DataElement::TYPE_DISK_CACHE_ENTRY:  // Can't be sent via IPC.
+      NOTREACHED();
+      break;
+    case storage::DataElement::TYPE_UNKNOWN:
+      NOTREACHED();
+      break;
   }
 }
 
 bool ParamTraits<storage::DataElement>::Read(const Message* m,
                                              base::PickleIterator* iter,
                                              param_type* r) {
   int type;
   if (!ReadParam(m, iter, &type))
     return false;
   switch (type) {
@@ skipping 31 matching lines @@
         return false;
       if (!ReadParam(m, iter, &length))
         return false;
       if (!ReadParam(m, iter, &expected_modification_time))
         return false;
       r->SetToFileSystemUrlRange(file_system_url, offset, length,
                                  expected_modification_time);
       break;
     }
     default: {
       DCHECK(type == storage::DataElement::TYPE_BLOB);

[Tom Sepez, 2015/06/15 15:53:06]

You should handle the other types in this switch, and return false if you see
them (same with default: case).

[gavinp, 2015/06/15 20:10:59]

See mmenke and me's comment in your review of another version of this file. I'll
update it, but remove the default. Let me know what you think.

       std::string blob_uuid;
       uint64 offset, length;
       if (!ReadParam(m, iter, &blob_uuid))
         return false;
       if (!ReadParam(m, iter, &offset))
         return false;
       if (!ReadParam(m, iter, &length))
         return false;
       r->SetToBlobRange(blob_uuid, offset, length);
       break;
@@ skipping 165 matching lines @@
   (*r)->set_identifier(identifier);
   return true;
 }
 
 void ParamTraits<scoped_refptr<content::ResourceRequestBody> >::Log(
     const param_type& p, std::string* l) {
   l->append("<ResourceRequestBody>");
 }
 
 }  // namespace IPC