BlobDispatcherHost: don't rely on NOTREACHED() checks in ParamTraits::Read

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 127 matching lines @@
   int type;
   if (!ReadParam(m, iter, &type))
     return false;
   switch (type) {
     case storage::DataElement::TYPE_BYTES: {
       const char* data;
       int len;
       if (!iter->ReadData(&data, &len))
         return false;
       r->SetToBytes(data, len);
-      break;
+      return true;
     }
     case storage::DataElement::TYPE_BYTES_DESCRIPTION: {
       uint64_t length;
       if (!ReadParam(m, iter, &length))
         return false;
       r->SetToBytesDescription(length);
-      break;
+      return true;
     }
     case storage::DataElement::TYPE_FILE: {
       base::FilePath file_path;
       uint64_t offset, length;
       base::Time expected_modification_time;
       if (!ReadParam(m, iter, &file_path))
         return false;
       if (!ReadParam(m, iter, &offset))
         return false;
       if (!ReadParam(m, iter, &length))
         return false;
       if (!ReadParam(m, iter, &expected_modification_time))
         return false;
       r->SetToFilePathRange(file_path, offset, length,
                             expected_modification_time);
-      break;
+      return true;
     }
     case storage::DataElement::TYPE_FILE_FILESYSTEM: {
       GURL file_system_url;
       uint64_t offset, length;
       base::Time expected_modification_time;
       if (!ReadParam(m, iter, &file_system_url))
         return false;
       if (!ReadParam(m, iter, &offset))
         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;
+      return true;
     }
     case storage::DataElement::TYPE_BLOB: {
       std::string blob_uuid;
       uint64_t 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;
+      return true;
     }
     case storage::DataElement::TYPE_DISK_CACHE_ENTRY: {
       NOTREACHED() << "Can't be sent by IPC.";
-      break;
+      return false;
     }
     case storage::DataElement::TYPE_UNKNOWN: {
       NOTREACHED();
-      break;
+      return false;
     }
   }
-  return true;
+  return false;
 }
 
 void ParamTraits<storage::DataElement>::Log(const param_type& p,
                                             std::string* l) {
   l->append("<storage::DataElement>");
 }
 
 void ParamTraits<scoped_refptr<content::ResourceDevToolsInfo>>::GetSize(
     base::PickleSizer* s, const param_type& p) {
   GetParamSize(s, p.get() != NULL);
@@ skipping 253 matching lines @@
   return true;
 }
 
 void ParamTraits<scoped_refptr<net::ct::SignedCertificateTimestamp>>::Log(
     const param_type& p,
     std::string* l) {
   l->append("<SignedCertificateTimestamp>");
 }
 
 }  // namespace IPC