content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc - Issue 1888963004: Add HttpProtocolHandler and convert everything to use it

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

Issue 1888963004: Add HttpProtocolHandler and convert everything to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-supports-scheme

Patch Set: more addressing comments Created 4 years, 8 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/loader/resource_loader_unittest.cc ('k') | content/shell/browser/shell_url_request_context_getter.cc » ('j') | net/url_request/http_protocol_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc

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

index 63e28cee077cc91a38837fda85b783e953146657..95c9d8d1423b96807129f2d914082bd449df989f 100644

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

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

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

#include "net/base/test_completion_callback.h"

#include "net/http/http_response_headers.h"

#include "net/url_request/url_request_context.h"

+#include "net/url_request/url_request_intercepting_job_factory.h"

#include "net/url_request/url_request_job_factory_impl.h"

#include "net/url_request/url_request_status.h"

#include "net/url_request/url_request_test_util.h"

@@ -64,7 +65,9 @@ class ServiceWorkerReadFromCacheJobTest : public testing::Test {

imported_script_(kImportedScriptResourceId,

GURL("http://example.com/imported.js"),

kResourceSize),

- test_job_interceptor_(nullptr) {}

+ test_job_interceptor_(nullptr),

+ test_job_factory_(

+ net::URLRequestJobFactoryImpl::CreateWithHttpProtocolHandlers()) {}

~ServiceWorkerReadFromCacheJobTest() override {}

void SetUp() override {

@@ -75,9 +78,9 @@ class ServiceWorkerReadFromCacheJobTest : public testing::Test {

// The |test_job_factory_| takes ownership of the interceptor.

test_job_interceptor_ = new net::TestJobInterceptor();

- EXPECT_TRUE(test_job_factory_.SetProtocolHandler(

- url::kHttpScheme, base::WrapUnique(test_job_interceptor_)));

- url_request_context_->set_job_factory(&test_job_factory_);

+ test_job_factory_.reset(new net::URLRequestInterceptingJobFactory(

+ std::move(test_job_factory_), base::WrapUnique(test_job_interceptor_)));

mmenke 2016/04/28 16:52:41 nit: Modifying test_job_factory_ like this seems

mgersh 2016/04/28 20:36:30 Done.

+ url_request_context_->set_job_factory(test_job_factory_.get());

url_request_context_->Init();

}

@@ -180,7 +183,7 @@ class ServiceWorkerReadFromCacheJobTest : public testing::Test {

// |test_job_interceptor_| is owned by |test_job_factory_|.

net::TestJobInterceptor* test_job_interceptor_;

- net::URLRequestJobFactoryImpl test_job_factory_;

+ std::unique_ptr<net::URLRequestJobFactory> test_job_factory_;

std::unique_ptr<net::TestURLRequestContext> url_request_context_;

MockURLRequestDelegate delegate_;