| Index: webkit/blob/blob_url_request_job_factory.h
|
| ===================================================================
|
| --- webkit/blob/blob_url_request_job_factory.h (revision 171309)
|
| +++ webkit/blob/blob_url_request_job_factory.h (working copy)
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "net/url_request/url_request_job_factory.h"
|
| #include "webkit/storage/webkit_storage_export.h"
|
|
|
| @@ -25,13 +26,18 @@
|
| namespace webkit_blob {
|
|
|
| class BlobData;
|
| -class BlobStorageController;
|
| +class BlobDataHandle;
|
| +class BlobStorageContext;
|
|
|
| class WEBKIT_STORAGE_EXPORT BlobProtocolHandler
|
| : public net::URLRequestJobFactory::ProtocolHandler {
|
| public:
|
| - // |controller|'s lifetime should exceed the lifetime of the ProtocolHandler.
|
| - BlobProtocolHandler(BlobStorageController* blob_storage_controller,
|
| + static void SetRequestedBlobDataHandle(
|
| + net::URLRequest* request,
|
| + scoped_ptr<BlobDataHandle> blob_data_handle);
|
| +
|
| + // The |contexts|'s lifetime should exceed the lifetime of the ProtocolHandler.
|
| + BlobProtocolHandler(BlobStorageContext* blob_storage_context,
|
| fileapi::FileSystemContext* file_system_context,
|
| base::MessageLoopProxy* file_loop_proxy);
|
| virtual ~BlobProtocolHandler();
|
| @@ -41,12 +47,9 @@
|
| net::NetworkDelegate* network_delegate) const OVERRIDE;
|
|
|
| private:
|
| - virtual scoped_refptr<BlobData> LookupBlobData(
|
| + scoped_refptr<BlobData> LookupBlobData(
|
| net::URLRequest* request) const;
|
|
|
| - // No scoped_refptr because |blob_storage_controller_| is owned by the
|
| - // ProfileIOData, which also owns this ProtocolHandler.
|
| - BlobStorageController* const blob_storage_controller_;
|
| const scoped_refptr<fileapi::FileSystemContext> file_system_context_;
|
| const scoped_refptr<base::MessageLoopProxy> file_loop_proxy_;
|
|
|
|
|