Fix chrome upload with content uri

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 webkit_common::DataElement::TYPE_FILE_FILESYSTEM: {
       WriteParam(m, p.filesystem_url());
       WriteParam(m, p.offset());
       WriteParam(m, p.length());
       WriteParam(m, p.expected_modification_time());
       break;
     }
+#if defined(OS_ANDROID)
+    case webkit_common::DataElement::TYPE_CONTENT_URL: {
+      WriteParam(m, p.content_url());
+      WriteParam(m, p.offset());
+      WriteParam(m, p.length());
+      WriteParam(m, p.expected_modification_time());
+      break;
+    }
+#endif
     default: {
       DCHECK(p.type() == webkit_common::DataElement::TYPE_BLOB);
       WriteParam(m, p.blob_uuid());
       WriteParam(m, p.offset());
       WriteParam(m, p.length());
       break;
     }
   }
 }
 
@@ skipping 36 matching lines @@
       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;
     }
+#if defined(OS_ANDROID)
+    case webkit_common::DataElement::TYPE_CONTENT_URL: {
+      GURL content_url;
+      uint64 offset, length;
+      base::Time expected_modification_time;
+      if (!ReadParam(m, iter, &content_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->SetToContentUrlRange(content_url, offset, length,
+                                 expected_modification_time);

[kinuko, 2013/10/29 02:52:31]

nit: indent is off

[qinmin, 2013/10/29 19:14:21]

Done.

+      break;
+    }
+#endif
     default: {
       DCHECK(type == webkit_common::DataElement::TYPE_BLOB);
       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;
@@ skipping 164 matching lines @@
   (*r)->set_identifier(identifier);
   return true;
 }
 
 void ParamTraits<scoped_refptr<webkit_glue::ResourceRequestBody> >::Log(
     const param_type& p, std::string* l) {
   l->append("<webkit_glue::ResourceRequestBody>");
 }
 
 }  // namespace IPC