Add HttpProtocolHandler and convert everything to use it

content/browser/loader/resource_loader_unittest.cc

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 32197c7bc1ea1d2698414cc6da3915a452127d3e..3a05db5809dae81b02e2bcf418a75df61a47ee6e 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -48,6 +48,7 @@
 #include "net/ssl/ssl_private_key.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.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"
@@ -543,11 +544,13 @@ class ResourceLoaderTest : public testing::Test,
                            public ResourceLoaderDelegate {
  protected:
   ResourceLoaderTest()
-    : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
-      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_);
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
+        job_factory_(
+            net::URLRequestJobFactoryImpl::CreateWithHttpProtocolHandlers()),
+        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_.get());
   }
 
   GURL test_url() const { return net::URLRequestTestJob::test_url_1(); }
@@ -588,7 +591,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 =
@@ -629,7 +632,7 @@ class ResourceLoaderTest : public testing::Test,
   TestBrowserThreadBundle thread_bundle_;
   RenderViewHostTestEnabler rvh_test_enabler_;
 
-  net::URLRequestJobFactoryImpl job_factory_;
+  std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory_;
   net::TestURLRequestContext test_url_request_context_;
   ResourceContextStub resource_context_;
   std::unique_ptr<TestBrowserContext> browser_context_;