| Index: storage/common/blob/blob_data.h
|
| diff --git a/webkit/common/blob/blob_data.h b/storage/common/blob/blob_data.h
|
| similarity index 83%
|
| rename from webkit/common/blob/blob_data.h
|
| rename to storage/common/blob/blob_data.h
|
| index 3ea6e9123d01dede2485b30a062273c7d8e4bc4f..1d84f349087041a7a74fedf87eaaf15281e91c32 100644
|
| --- a/webkit/common/blob/blob_data.h
|
| +++ b/storage/common/blob/blob_data.h
|
| @@ -13,14 +13,13 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/time/time.h"
|
| #include "url/gurl.h"
|
| -#include "webkit/common/blob/shareable_file_reference.h"
|
| -#include "webkit/common/data_element.h"
|
| -#include "webkit/common/webkit_storage_common_export.h"
|
| +#include "storage/common/blob/shareable_file_reference.h"
|
| +#include "storage/common/data_element.h"
|
| +#include "storage/common/storage_export.h"
|
|
|
| -namespace webkit_blob {
|
| +namespace storage {
|
|
|
| -class WEBKIT_STORAGE_COMMON_EXPORT BlobData
|
| - : public base::RefCounted<BlobData> {
|
| +class STORAGE_EXPORT BlobData : public base::RefCounted<BlobData> {
|
| public:
|
| typedef webkit_common::DataElement Item;
|
|
|
| @@ -34,10 +33,14 @@ class WEBKIT_STORAGE_COMMON_EXPORT BlobData
|
|
|
| void AppendData(const char* data, size_t length);
|
|
|
| - void AppendFile(const base::FilePath& file_path, uint64 offset, uint64 length,
|
| + void AppendFile(const base::FilePath& file_path,
|
| + uint64 offset,
|
| + uint64 length,
|
| const base::Time& expected_modification_time);
|
| void AppendBlob(const std::string& uuid, uint64 offset, uint64 length);
|
| - void AppendFileSystemFile(const GURL& url, uint64 offset, uint64 length,
|
| + void AppendFileSystemFile(const GURL& url,
|
| + uint64 offset,
|
| + uint64 length,
|
| const base::Time& expected_modification_time);
|
|
|
| void AttachShareableFileReference(ShareableFileReference* reference) {
|
| @@ -93,6 +96,6 @@ inline bool operator!=(const BlobData& a, const BlobData& b) {
|
| }
|
| #endif // defined(UNIT_TEST)
|
|
|
| -} // namespace webkit_blob
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_COMMON_BLOB_BLOB_DATA_H_
|
|
|