Add HttpProtocolHandler and convert everything to use it

net/url_request/url_request_http_job_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_http_job.h"
 
 #include <stdint.h>
 
 #include <cstddef>
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "net/base/auth.h"
 #include "net/base/request_priority.h"
 #include "net/base/sdch_observer.h"
 #include "net/base/test_data_directory.h"
 #include "net/cookies/cookie_store_test_helpers.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/http/http_transaction_test_util.h"
 #include "net/socket/socket_test_util.h"
 #include "net/test/cert_test_util.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"
 #include "net/websockets/websocket_handshake_stream_base.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 namespace net {
@@ skipping 12 matching lines @@
   ~TestURLRequestHttpJob() override {}
 
   using URLRequestHttpJob::SetPriority;
   using URLRequestHttpJob::Start;
   using URLRequestHttpJob::Kill;
   using URLRequestHttpJob::priority;
 };
 
 class URLRequestHttpJobTest : public ::testing::Test {
  protected:
-  URLRequestHttpJobTest() : context_(true) {
+  URLRequestHttpJobTest()
+      : test_job_factory_(
+            URLRequestJobFactoryImpl::CreateWithHttpProtocolHandlers()),
+        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(
+        std::move(test_job_factory_), base::WrapUnique(test_job_interceptor_)));

[mmenke, 2016/04/28 16:52:41]

Suggest just inlining URLRequestJobFactoryImpl::CreateWithHttpProtocolHandlers()
here, instead of setting test_job_factory_, and then changing its value.

[mgersh, 2016/04/28 20:36:30]

Done.

+    context_.set_job_factory(test_job_factory_.get());
 
     context_.Init();
 
     req_ = context_.CreateRequest(GURL("http://www.example.com"),
                                   DEFAULT_PRIORITY, &delegate_);
   }
 
   bool TransactionAcceptsSdchEncoding() {
     base::WeakPtr<MockNetworkTransaction> transaction(
         network_layer_.last_transaction());
@@ skipping 22 matching lines @@
   }
 
   void EnableSdch() {
     context_.SetSdchManager(std::unique_ptr<SdchManager>(new SdchManager));
   }
 
   MockNetworkLayer network_layer_;
 
   // |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_;
   std::unique_ptr<URLRequest> req_;
 };
 
 class URLRequestHttpJobWithMockSocketsTest : public ::testing::Test {
  protected:
   URLRequestHttpJobWithMockSocketsTest()
       : context_(new TestURLRequestContext(true)) {
@@ skipping 820 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(URLRequestStatus::IO_PENDING, req_->status().status());
   EXPECT_TRUE(fake_handshake_stream->initialize_stream_was_called());
 }
 
 #endif  // !defined(OS_IOS)
 
 }  // namespace
 
 }  // namespace net