Chromium Code Reviews| Index: content/browser/blob_storage/blob_dispatcher_host.h |
| diff --git a/content/browser/blob_storage/blob_dispatcher_host.h b/content/browser/blob_storage/blob_dispatcher_host.h |
| index b004aa2ab30aed8b7e9c8add3a2820337890c936..e40c624524d46eefd26088aef42440d16d60ecda 100644 |
| --- a/content/browser/blob_storage/blob_dispatcher_host.h |
| +++ b/content/browser/blob_storage/blob_dispatcher_host.h |
| @@ -17,7 +17,6 @@ |
| #include "content/common/content_export.h" |
| #include "content/public/browser/browser_message_filter.h" |
| #include "storage/browser/blob/blob_async_builder_host.h" |
| -#include "storage/browser/blob/blob_transport_result.h" |
| #include "storage/common/blob_storage/blob_storage_constants.h" |
| class GURL; |
| @@ -54,14 +53,6 @@ class CONTENT_EXPORT BlobDispatcherHost : public BrowserMessageFilter { |
| protected: |
| ~BlobDispatcherHost() override; |
| - // For testing use only. |
| - void SetMemoryConstantsForTesting(size_t max_ipc_memory_size, |
| - size_t max_shared_memory_size, |
| - uint64_t max_file_size) { |
| - async_builder_.SetMemoryConstantsForTesting( |
| - max_ipc_memory_size, max_shared_memory_size, max_file_size); |
| - } |
| - |
| private: |
| friend class base::RefCountedThreadSafe<BlobDispatcherHost>; |
| friend class BlobDispatcherHostTest; |
| @@ -96,18 +87,14 @@ class CONTENT_EXPORT BlobDispatcherHost : public BrowserMessageFilter { |
| typedef std::map<std::string, int> BlobReferenceMap; |
| - void OnRegisterBlobUUID(const std::string& uuid, |
| - const std::string& content_type, |
| - const std::string& content_disposition, |
| - const std::set<std::string>& referenced_blob_uuids); |
| - void OnStartBuildingBlob( |
| - const std::string& uuid, |
| - const std::vector<storage::DataElement>& descriptions); |
| + void OnRegisterBlob(const std::string& uuid, |
| + const std::string& content_type, |
| + const std::string& content_disposition, |
| + const std::vector<storage::DataElement>& descriptions); |
| void OnMemoryItemResponse( |
| const std::string& uuid, |
| const std::vector<storage::BlobItemBytesResponse>& response); |
| - void OnCancelBuildingBlob(const std::string& uuid, |
| - const storage::IPCBlobCreationCancelCode code); |
| + void OnBlobStatus(const std::string& uuid, const storage::BlobStatus code); |
| void OnIncrementBlobRefCount(const std::string& uuid); |
| void OnDecrementBlobRefCount(const std::string& uuid); |
| @@ -122,9 +109,8 @@ class CONTENT_EXPORT BlobDispatcherHost : public BrowserMessageFilter { |
| std::unique_ptr<std::vector<base::SharedMemoryHandle>> memory_handles, |
| std::unique_ptr<std::vector<base::File>> files); |
| - // Send the appropriate IPC response to the renderer for the given result. |
| - void SendIPCResponse(const std::string& uuid, |
| - storage::BlobTransportResult result); |
| + // We send the status unless it's BlobStatus::PENDING. |
| + void SendBlobStatus(const std::string& uuid, storage::BlobStatus status); |
|
michaeln
2016/07/15 02:12:07
maybe call this something that indicates its the f
dmurph
2016/07/15 20:18:15
Done.
|
| bool IsInUseInHost(const std::string& uuid); |
| bool IsUrlRegisteredInHost(const GURL& blob_url); |