| 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 86d5e5fb1fff831c54dc35f149a56a55cb0979df..53976dae66e5a25f4ea5a3d3dad9868ee4711cfe 100644
|
| --- a/content/browser/loader/resource_dispatcher_host_impl.cc
|
| +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
|
| @@ -608,18 +608,18 @@ ResourceDispatcherHostImpl::CreateResourceHandlerForDownload(
|
|
|
| scoped_ptr<ResourceHandler>
|
| ResourceDispatcherHostImpl::MaybeInterceptAsStream(net::URLRequest* request,
|
| - ResourceResponse* response) {
|
| + ResourceResponse* response,
|
| + std::string* payload) {
|
| ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request);
|
| const std::string& mime_type = response->head.mime_type;
|
|
|
| GURL origin;
|
| - std::string target_id;
|
| if (!delegate_ ||
|
| - !delegate_->ShouldInterceptResourceAsStream(info->GetContext(),
|
| - request->url(),
|
| + !delegate_->ShouldInterceptResourceAsStream(request,
|
| + info->GetContext(),
|
| mime_type,
|
| &origin,
|
| - &target_id)) {
|
| + payload)) {
|
| return scoped_ptr<ResourceHandler>();
|
| }
|
|
|
| @@ -633,15 +633,14 @@ ResourceDispatcherHostImpl::MaybeInterceptAsStream(net::URLRequest* request,
|
|
|
| info->set_is_stream(true);
|
| delegate_->OnStreamCreated(
|
| + request,
|
| info->GetContext(),
|
| info->GetChildID(),
|
| info->GetRouteID(),
|
| - target_id,
|
| handler->stream()->CreateHandle(
|
| request->url(),
|
| mime_type,
|
| - response->head.headers),
|
| - request->GetExpectedContentSize());
|
| + response->head.headers));
|
| return handler.PassAs<ResourceHandler>();
|
| }
|
|
|
|
|