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

Unified Diff: content/browser/loader/resource_loader_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: rebase (needs fixing) Created 4 years, 2 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/loader/resource_loader_unittest.cc
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
index 6ca2ac10da28978c4b8678b8264b62465151aa4a..35b9eaac049fa906b27a2945251f642fb1b7da63 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -49,6 +49,7 @@
#include "net/test/cert_test_util.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "net/test/test_data_directory.h"
+#include "net/url_request/http_protocol_handler.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_filter.h"
#include "net/url_request/url_request_interceptor.h"
@@ -555,11 +556,13 @@ class ResourceLoaderTest : public testing::Test,
protected:
ResourceLoaderTest()
: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
+ job_factory_(
+ net::URLRequestJobFactoryImpl::CreateWithHttpProtocolHandlers()),
test_url_request_context_(true),
resource_context_(&test_url_request_context_),
raw_ptr_resource_handler_(NULL),
raw_ptr_to_request_(NULL) {
- test_url_request_context_.set_job_factory(&job_factory_);
+ test_url_request_context_.set_job_factory(job_factory_.get());
test_url_request_context_.set_network_quality_estimator(
&network_quality_estimator_);
test_url_request_context_.Init();
@@ -614,7 +617,7 @@ class ResourceLoaderTest : public testing::Test,
}
void SetUp() override {
- job_factory_.SetProtocolHandler("test", CreateProtocolHandler());
+ job_factory_->SetProtocolHandler("test", CreateProtocolHandler());
browser_context_.reset(new TestBrowserContext());
scoped_refptr<SiteInstance> site_instance =
@@ -664,7 +667,7 @@ class ResourceLoaderTest : public testing::Test,
TestBrowserThreadBundle thread_bundle_;
RenderViewHostTestEnabler rvh_test_enabler_;
- net::URLRequestJobFactoryImpl job_factory_;
+ std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory_;
TestNetworkQualityEstimator network_quality_estimator_;
net::TestURLRequestContext test_url_request_context_;
MockResourceContext resource_context_;

Powered by Google App Engine
This is Rietveld 408576698