content/browser/service_worker/foreign_fetch_request_handler.cc - Issue 2954343005: Merge ResourceRequestBodyImpl and ResourceRequestBody.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/service_worker/foreign_fetch_request_handler.cc

Issue 2954343005: Merge ResourceRequestBodyImpl and ResourceRequestBody. (Closed)

Patch Set: Remove comment Created 3 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/service_worker/foreign_fetch_request_handler.h ('k') | content/browser/service_worker/service_worker_controllee_request_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/foreign_fetch_request_handler.cc

diff --git a/content/browser/service_worker/foreign_fetch_request_handler.cc b/content/browser/service_worker/foreign_fetch_request_handler.cc

index 5005b3e93352fc0a9d3fe886e1696960df5d3a6a..a3dea63fd885456c97d255f3001c38918e70e34f 100644

--- a/content/browser/service_worker/foreign_fetch_request_handler.cc

+++ b/content/browser/service_worker/foreign_fetch_request_handler.cc

@@ -14,7 +14,6 @@

#include "content/browser/service_worker/service_worker_context_wrapper.h"

#include "content/browser/service_worker/service_worker_response_info.h"

#include "content/browser/service_worker/service_worker_url_request_job.h"

-#include "content/common/resource_request_body_impl.h"

#include "content/common/service_worker/service_worker_types.h"

#include "content/common/service_worker/service_worker_utils.h"

#include "content/public/browser/content_browser_client.h"

@@ -22,6 +21,7 @@

#include "content/public/common/content_client.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/origin_trial_policy.h"

+#include "content/public/common/resource_request_body.h"

#include "net/url_request/url_request.h"

#include "net/url_request/url_request_interceptor.h"

#include "storage/browser/blob/blob_storage_context.h"

@@ -79,7 +79,7 @@ void ForeignFetchRequestHandler::InitializeHandler(

ResourceType resource_type,

RequestContextType request_context_type,

RequestContextFrameType frame_type,

- scoped_refptr<ResourceRequestBodyImpl> body,

+ scoped_refptr<ResourceRequestBody> body,

bool initiated_in_secure_context) {

if (!IsForeignFetchEnabled())

return;

@@ -204,7 +204,7 @@ ForeignFetchRequestHandler::ForeignFetchRequestHandler(

ResourceType resource_type,

RequestContextType request_context_type,

RequestContextFrameType frame_type,

- scoped_refptr<ResourceRequestBodyImpl> body,

+ scoped_refptr<ResourceRequestBody> body,

const base::Optional<base::TimeDelta>& timeout)

: context_(context),

blob_storage_context_(blob_storage_context),