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 b903a386a0db2f3b9cc061f2a4e37dc1d8ad7a71..7476ba840a1001f3373a53085de474fb5518c2d9 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,8 @@ 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_(nullptr) {} |
~ServiceWorkerReadFromCacheJobTest() override {} |
void SetUp() override { |
@@ -75,9 +77,10 @@ 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( |
+ net::URLRequestJobFactoryImpl::CreateWithHttpProtocolHandlers(), |
+ base::WrapUnique(test_job_interceptor_))); |
+ url_request_context_->set_job_factory(test_job_factory_.get()); |
url_request_context_->Init(); |
} |
@@ -182,7 +185,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_; |