Index: content/browser/fileapi/blob_storage_host.h |
diff --git a/content/browser/fileapi/blob_storage_host.h b/content/browser/fileapi/blob_storage_host.h |
index 3544f398b7def92eba6ea41cc20c52c107bf4296..8fd8453ff928c2bcafb30044fd40e2d5393d424f 100644 |
--- a/content/browser/fileapi/blob_storage_host.h |
+++ b/content/browser/fileapi/blob_storage_host.h |
@@ -12,7 +12,7 @@ |
#include "base/compiler_specific.h" |
#include "base/memory/weak_ptr.h" |
#include "content/common/content_export.h" |
-#include "storage/common/blob/blob_data.h" |
+#include "storage/common/data_element.h" |
class GURL; |
@@ -22,9 +22,6 @@ class BlobStorageHost; |
class BlobStorageContext; |
} |
-using storage::BlobStorageContext; |
-using storage::BlobData; |
- |
namespace content { |
// This class handles the logistics of blob storage for a single child process. |
@@ -34,7 +31,7 @@ namespace content { |
// only be used on the IO thread. |
class CONTENT_EXPORT BlobStorageHost { |
public: |
- explicit BlobStorageHost(BlobStorageContext* context); |
+ explicit BlobStorageHost(storage::BlobStorageContext* context); |
~BlobStorageHost(); |
// Methods to support the IPC message protocol. |
@@ -42,7 +39,8 @@ class CONTENT_EXPORT BlobStorageHost { |
// like a non-existent or pre-existent uuid or url. |
bool StartBuildingBlob(const std::string& uuid) WARN_UNUSED_RESULT; |
bool AppendBlobDataItem(const std::string& uuid, |
- const BlobData::Item& data_item) WARN_UNUSED_RESULT; |
+ const storage::DataElement& data_item) |
+ WARN_UNUSED_RESULT; |
bool CancelBuildingBlob(const std::string& uuid) WARN_UNUSED_RESULT; |
bool FinishBuildingBlob(const std::string& uuid, |
const std::string& type) WARN_UNUSED_RESULT; |
@@ -66,7 +64,7 @@ class CONTENT_EXPORT BlobStorageHost { |
// The set of public blob urls coined by this consumer. |
std::set<GURL> public_blob_urls_; |
- base::WeakPtr<BlobStorageContext> context_; |
+ base::WeakPtr<storage::BlobStorageContext> context_; |
DISALLOW_COPY_AND_ASSIGN(BlobStorageHost); |
}; |