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

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 17653005: Merge StreamContext into ChromeBlobStorageContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « content/browser/fileapi/chrome_blob_storage_context.cc ('k') | content/browser/resource_context_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 531b382c42151b47fa08afbb80d811ef7065ad4f..3121e787abebb43d88ecd5a1ae9b728a9c0320c2 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -46,7 +46,6 @@
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/resource_context_impl.h"
#include "content/browser/streams/stream.h"
-#include "content/browser/streams/stream_context.h"
#include "content/browser/streams/stream_registry.h"
#include "content/browser/worker_host/worker_service_impl.h"
#include "content/common/resource_messages.h"
@@ -588,13 +587,12 @@ ResourceDispatcherHostImpl::MaybeInterceptAsStream(net::URLRequest* request,
return scoped_ptr<ResourceHandler>();
}
- StreamContext* stream_context =
- GetStreamContextForResourceContext(info->GetContext());
-
+ ChromeBlobStorageContext* blob_storage_context =
+ GetChromeBlobStorageContextForResourceContext(info->GetContext());
scoped_ptr<StreamResourceHandler> handler(
new StreamResourceHandler(request,
- stream_context->registry(),
+ blob_storage_context->stream_registry(),
security_origin));
info->set_is_stream(true);
« no previous file with comments | « content/browser/fileapi/chrome_blob_storage_context.cc ('k') | content/browser/resource_context_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698