Move DataElement into webkit/common

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"
 #include "webkit/glue/resource_loader_bridge.h"
 
@@ skipping 17 matching lines @@
     *r = new net::HttpResponseHeaders(*m, iter);
   return true;
 }
 
 void ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Log(
     const param_type& p, std::string* l) {
   l->append("<HttpResponseHeaders>");
 }
 
 
-void ParamTraits<webkit_base::DataElement>::Write(
+void ParamTraits<webkit_common::DataElement>::Write(
     Message* m, const param_type& p) {
   WriteParam(m, static_cast<int>(p.type()));
   switch (p.type()) {
-    case webkit_base::DataElement::TYPE_BYTES: {
+    case webkit_common::DataElement::TYPE_BYTES: {
       m->WriteData(p.bytes(), static_cast<int>(p.length()));
       break;
     }
-    case webkit_base::DataElement::TYPE_FILE: {
+    case webkit_common::DataElement::TYPE_FILE: {
       WriteParam(m, p.path());
       WriteParam(m, p.offset());
       WriteParam(m, p.length());
       WriteParam(m, p.expected_modification_time());
       break;
     }
-    case webkit_base::DataElement::TYPE_FILE_FILESYSTEM: {
+    case webkit_common::DataElement::TYPE_FILE_FILESYSTEM: {
       WriteParam(m, p.url());
       WriteParam(m, p.offset());
       WriteParam(m, p.length());
       WriteParam(m, p.expected_modification_time());
       break;
     }
     default: {
-      DCHECK(p.type() == webkit_base::DataElement::TYPE_BLOB);
+      DCHECK(p.type() == webkit_common::DataElement::TYPE_BLOB);
       WriteParam(m, p.url());
       WriteParam(m, p.offset());
       WriteParam(m, p.length());
       break;
     }
   }
 }
 
-bool ParamTraits<webkit_base::DataElement>::Read(
+bool ParamTraits<webkit_common::DataElement>::Read(
     const Message* m, PickleIterator* iter, param_type* r) {
   int type;
   if (!ReadParam(m, iter, &type))
     return false;
   switch (type) {
-    case webkit_base::DataElement::TYPE_BYTES: {
+    case webkit_common::DataElement::TYPE_BYTES: {
       const char* data;
       int len;
       if (!m->ReadData(iter, &data, &len))
         return false;
       r->SetToBytes(data, len);
       break;
     }
-    case webkit_base::DataElement::TYPE_FILE: {
+    case webkit_common::DataElement::TYPE_FILE: {
       base::FilePath file_path;
       uint64 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;
     }
-    case webkit_base::DataElement::TYPE_FILE_FILESYSTEM: {
+    case webkit_common::DataElement::TYPE_FILE_FILESYSTEM: {
       GURL file_system_url;
       uint64 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;
     }
     default: {
-      DCHECK(type == webkit_base::DataElement::TYPE_BLOB);
+      DCHECK(type == webkit_common::DataElement::TYPE_BLOB);
       GURL blob_url;
       uint64 offset, length;
       if (!ReadParam(m, iter, &blob_url))
         return false;
       if (!ReadParam(m, iter, &offset))
         return false;
       if (!ReadParam(m, iter, &length))
         return false;
       r->SetToBlobUrlRange(blob_url, offset, length);
       break;
     }
   }
   return true;
 }
 
-void ParamTraits<webkit_base::DataElement>::Log(
+void ParamTraits<webkit_common::DataElement>::Log(
     const param_type& p, std::string* l) {
-  l->append("<webkit_base::DataElement>");
+  l->append("<webkit_common::DataElement>");
 }
 
 void ParamTraits<scoped_refptr<webkit_glue::ResourceDevToolsInfo> >::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.get() != NULL);
   if (p.get()) {
     WriteParam(m, p->http_status_code);
     WriteParam(m, p->http_status_text);
     WriteParam(m, p->request_headers);
     WriteParam(m, p->response_headers);
@@ skipping 126 matching lines @@
 
 bool ParamTraits<scoped_refptr<webkit_glue::ResourceRequestBody> >::Read(
     const Message* m,
     PickleIterator* iter,
     param_type* r) {
   bool has_object;
   if (!ReadParam(m, iter, &has_object))
     return false;
   if (!has_object)
     return true;
-  std::vector<webkit_base::DataElement> elements;
+  std::vector<webkit_common::DataElement> elements;
   if (!ReadParam(m, iter, &elements))
     return false;
   int64 identifier;
   if (!ReadParam(m, iter, &identifier))
     return false;
   *r = new webkit_glue::ResourceRequestBody;
   (*r)->swap_elements(&elements);
   (*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