Add HttpProtocolHandler and convert everything to use it

net/url_request/url_request_http_job_unittest.cc

Index: net/url_request/url_request_http_job_unittest.cc
diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc
index 4d93df71ae28b7364c5fe8dbd72621a88a05ad69..2df44da6d73408774e4959acef65ca9e8989ee20 100644
--- a/net/url_request/url_request_http_job_unittest.cc
+++ b/net/url_request/url_request_http_job_unittest.cc
@@ -29,6 +29,7 @@
 #include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.h"
 #include "net/url_request/url_request.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,14 +65,15 @@ class TestURLRequestHttpJob : public URLRequestHttpJob {
 
 class URLRequestHttpJobTest : public ::testing::Test {
  protected:
-  URLRequestHttpJobTest() : context_(true) {
+  URLRequestHttpJobTest() : test_job_factory_(nullptr), context_(true) {
     context_.set_http_transaction_factory(&network_layer_);
 
     // The |test_job_factory_| takes ownership of the interceptor.
     test_job_interceptor_ = new TestJobInterceptor();
-    EXPECT_TRUE(test_job_factory_.SetProtocolHandler(
-        url::kHttpScheme, base::WrapUnique(test_job_interceptor_)));
-    context_.set_job_factory(&test_job_factory_);
+    test_job_factory_.reset(new URLRequestInterceptingJobFactory(
+        URLRequestJobFactoryImpl::CreateWithHttpProtocolHandlers(),
+        base::WrapUnique(test_job_interceptor_)));
+    context_.set_job_factory(test_job_factory_.get());
     context_.set_net_log(&net_log_);
     context_.Init();
 
@@ -114,7 +116,7 @@ class URLRequestHttpJobTest : public ::testing::Test {
 
   // |test_job_interceptor_| is owned by |test_job_factory_|.
   TestJobInterceptor* test_job_interceptor_;
-  URLRequestJobFactoryImpl test_job_factory_;
+  std::unique_ptr<URLRequestJobFactory> test_job_factory_;
 
   TestURLRequestContext context_;
   TestDelegate delegate_;