Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(796)

Unified Diff: webkit/tools/test_shell/simple_resource_loader_bridge.cc

Issue 3282003: Support handling blob URL and resolve blob references in upload data.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/tools/test_shell/simple_resource_loader_bridge.cc
===================================================================
--- webkit/tools/test_shell/simple_resource_loader_bridge.cc (revision 57912)
+++ webkit/tools/test_shell/simple_resource_loader_bridge.cc (working copy)
@@ -58,10 +58,12 @@
#endif
#include "net/url_request/url_request.h"
#include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/blob/blob_storage_controller.h"
#include "webkit/glue/resource_loader_bridge.h"
#include "webkit/tools/test_shell/simple_appcache_system.h"
#include "webkit/tools/test_shell/simple_socket_stream_bridge.h"
#include "webkit/tools/test_shell/test_shell_request_context.h"
+#include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h"
using webkit_glue::ResourceLoaderBridge;
using net::StaticCookiePolicy;
@@ -120,10 +122,14 @@
SimpleAppCacheSystem::InitializeOnIOThread(g_request_context);
SimpleSocketStreamBridge::InitializeOnIOThread(g_request_context);
+ TestShellWebBlobRegistryImpl::InitializeOnIOThread(
+ static_cast<TestShellRequestContext*>(g_request_context)->
+ blob_storage_controller());
}
virtual void CleanUp() {
SimpleSocketStreamBridge::Cleanup();
+ TestShellWebBlobRegistryImpl::Cleanup();
if (g_request_context) {
g_request_context->Release();
g_request_context = NULL;
@@ -263,6 +269,13 @@
// actions performed on the owner's thread.
void AsyncStart(RequestParams* params) {
+ // Might need to resolve the blob references in the upload data.
+ if (params->upload) {
+ static_cast<TestShellRequestContext*>(g_request_context)->
+ blob_storage_controller()->ResolveBlobReferencesInUploadData(
+ params->upload.get());
+ }
+
request_.reset(new URLRequest(params->url, this));
request_->set_method(params->method);
request_->set_first_party_for_cookies(params->first_party_for_cookies);
@@ -582,6 +595,13 @@
expected_modification_time);
}
+ virtual void AppendBlobToUpload(const GURL& blob_url) {
+ DCHECK(params_.get());
+ if (!params_->upload)
+ params_->upload = new net::UploadData();
+ params_->upload->AppendBlob(blob_url);
+ }
+
virtual void SetUploadIdentifier(int64 identifier) {
DCHECK(params_.get());
if (!params_->upload)

Powered by Google App Engine
This is Rietveld 408576698