Index: webkit/tools/test_shell/simple_resource_loader_bridge.cc |
=================================================================== |
--- webkit/tools/test_shell/simple_resource_loader_bridge.cc (revision 186525) |
+++ webkit/tools/test_shell/simple_resource_loader_bridge.cc (working copy) |
@@ -62,8 +62,8 @@ |
#include "net/url_request/url_request_context.h" |
#include "net/url_request/url_request_job.h" |
#include "webkit/appcache/appcache_interfaces.h" |
-#include "webkit/blob/blob_storage_controller.h" |
-#include "webkit/blob/blob_url_request_job.h" |
+#include "webkit/blob/blob_storage_context.h" |
+#include "webkit/blob/blob_url_request_job_factory.h" |
#include "webkit/blob/shareable_file_reference.h" |
#include "webkit/fileapi/file_system_context.h" |
#include "webkit/fileapi/file_system_dir_url_request_job.h" |
@@ -273,17 +273,15 @@ |
SimpleAppCacheSystem::InitializeOnIOThread(g_request_context); |
SimpleSocketStreamBridge::InitializeOnIOThread(g_request_context); |
- SimpleFileWriter::InitializeOnIOThread(g_request_context); |
- SimpleFileSystem::InitializeOnIOThread( |
- g_request_context->blob_storage_controller()); |
+ SimpleFileWriter::InitializeOnIOThread( |
+ g_request_context, g_request_context->blob_storage_context()); |
TestShellWebBlobRegistryImpl::InitializeOnIOThread( |
- g_request_context->blob_storage_controller()); |
+ g_request_context->blob_storage_context()); |
} |
virtual void CleanUp() OVERRIDE { |
// In reverse order of initialization. |
TestShellWebBlobRegistryImpl::Cleanup(); |
- SimpleFileSystem::CleanupOnIOThread(); |
SimpleFileWriter::CleanupOnIOThread(); |
SimpleSocketStreamBridge::Cleanup(); |
SimpleAppCacheSystem::CleanupOnIOThread(); |
@@ -465,11 +463,20 @@ |
request_->set_upload(make_scoped_ptr( |
params->request_body->ResolveElementsAndCreateUploadDataStream( |
static_cast<TestShellRequestContext*>(g_request_context)-> |
- blob_storage_controller(), |
+ blob_storage_context(), |
static_cast<TestShellRequestContext*>(g_request_context)-> |
file_system_context(), |
base::MessageLoopProxy::current()))); |
} |
+ |
+ if (request_->url().SchemeIs("blob")) { |
+ webkit_blob::BlobProtocolHandler::SetRequestedBlobDataHandle( |
+ request_.get(), |
+ static_cast<TestShellRequestContext*>(g_request_context)-> |
+ blob_storage_context()-> |
+ GetBlobDataFromPublicUrl(request_->url())); |
+ } |
+ |
SimpleAppCacheSystem::SetExtraRequestInfo( |
request_.get(), params->appcache_host_id, params->request_type); |