Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

content/common/resource_request_body.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_COMMON_RESOURCE_REQUEST_BODY_H_
 #define CONTENT_COMMON_RESOURCE_REQUEST_BODY_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/supports_user_data.h"
 #include "content/common/content_export.h"
 #include "url/gurl.h"
 #include "webkit/common/data_element.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace content {
 
 // A struct used to represent upload data. The data field is populated by
 // WebURLLoader from the data given as WebHTTPBody.
 class CONTENT_EXPORT ResourceRequestBody
     : public base::RefCountedThreadSafe<ResourceRequestBody>,
       public base::SupportsUserData {
  public:
-  typedef webkit_common::DataElement Element;
+  typedef storage::DataElement Element;
 
   ResourceRequestBody();
 
   void AppendBytes(const char* bytes, int bytes_len);
   void AppendFileRange(const base::FilePath& file_path,
                        uint64 offset, uint64 length,
                        const base::Time& expected_modification_time);
   void AppendBlob(const std::string& uuid);
   void AppendFileSystemFileRange(const GURL& url, uint64 offset, uint64 length,
                                  const base::Time& expected_modification_time);
@@ skipping 16 matching lines @@
 
   std::vector<Element> elements_;
   int64 identifier_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceRequestBody);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_RESOURCE_REQUEST_BODY_H_