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

Unified Diff: content/browser/service_worker/service_worker_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
Index: content/browser/service_worker/service_worker_request_handler.cc
diff --git a/content/browser/service_worker/service_worker_request_handler.cc b/content/browser/service_worker/service_worker_request_handler.cc
index f27f24201937655c5d215253b390b93a0a6607ad..876144ec87de69dcaf8164c448f87965b2c439e5 100644
--- a/content/browser/service_worker/service_worker_request_handler.cc
+++ b/content/browser/service_worker/service_worker_request_handler.cc
@@ -16,7 +16,6 @@
#include "content/browser/service_worker/service_worker_provider_host.h"
#include "content/browser/service_worker/service_worker_registration.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/resource_context.h"
@@ -24,6 +23,7 @@
#include "content/public/common/child_process_host.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/origin_util.h"
+#include "content/public/common/resource_request_body.h"
#include "ipc/ipc_message.h"
#include "net/base/url_util.h"
#include "net/url_request/url_request.h"
@@ -70,7 +70,7 @@ void ServiceWorkerRequestHandler::InitializeForNavigation(
RequestContextType request_context_type,
RequestContextFrameType frame_type,
bool is_parent_frame_secure,
- scoped_refptr<ResourceRequestBodyImpl> body,
+ scoped_refptr<ResourceRequestBody> body,
const base::Callback<WebContents*(void)>& web_contents_getter) {
CHECK(IsBrowserSideNavigationEnabled());
@@ -127,7 +127,7 @@ ServiceWorkerRequestHandler::InitializeForNavigationNetworkService(
RequestContextType request_context_type,
RequestContextFrameType frame_type,
bool is_parent_frame_secure,
- scoped_refptr<ResourceRequestBodyImpl> body,
+ scoped_refptr<ResourceRequestBody> body,
const base::Callback<WebContents*(void)>& web_contents_getter) {
DCHECK(IsBrowserSideNavigationEnabled() &&
base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -182,7 +182,7 @@ void ServiceWorkerRequestHandler::InitializeHandler(
ResourceType resource_type,
RequestContextType request_context_type,
RequestContextFrameType frame_type,
- scoped_refptr<ResourceRequestBodyImpl> body) {
+ scoped_refptr<ResourceRequestBody> body) {
// Create the handler even for insecure HTTP since it's used in the
// case of redirect to HTTPS.
if (!request->url().SchemeIsHTTPOrHTTPS() &&

Powered by Google App Engine
This is Rietveld 408576698