Add HttpProtocolHandler and convert everything to use it

net/url_request/url_request_test_util.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
 #define NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
 
 #include <stdint.h>
 #include <stdlib.h>
 
@@ skipping 20 matching lines @@
 #include "net/cookies/cookie_monster.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_headers.h"
 #include "net/proxy/proxy_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
+#include "net/url_request/http_protocol_handler.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_context_storage.h"
+#include "net/url_request/url_request_interceptor.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "url/url_util.h"
 
 using base::TimeDelta;
 
 namespace net {
 
 //-----------------------------------------------------------------------------
 
 class TestURLRequestContext : public URLRequestContext {
@@ skipping 343 matching lines @@
   bool has_load_timing_info_before_auth_;
 
   bool can_access_files_;  // true by default
   bool experimental_cookie_features_enabled_;           // false by default
   bool cancel_request_with_policy_violating_referrer_;  // false by default
   bool will_be_intercepted_on_next_error_;
 };
 
 //-----------------------------------------------------------------------------
 
-// A simple ProtocolHandler that returns a pre-built URLRequestJob only once.
-class TestJobInterceptor : public URLRequestJobFactory::ProtocolHandler {
+// A simple ProtocolHandler that returns a pre-built URLRequestJob only once,
+// and falls back to a normal HttpProtocolHandler implementation if no pre-built
+// URLRequestJob is present.
+class TestJobInterceptor : public URLRequestInterceptor {
  public:
   TestJobInterceptor();
   ~TestJobInterceptor() override;
 
-  URLRequestJob* MaybeCreateJob(
+  URLRequestJob* MaybeInterceptRequest(
+      URLRequest* request,
+      NetworkDelegate* network_delegate) const override;
+  URLRequestJob* MaybeInterceptRedirect(URLRequest* request,
+                                        NetworkDelegate* network_delegate,
+                                        const GURL& location) const override;
+  URLRequestJob* MaybeInterceptResponse(
       URLRequest* request,
       NetworkDelegate* network_delegate) const override;
   void set_main_intercept_job(std::unique_ptr<URLRequestJob> job);
 
  private:
   mutable std::unique_ptr<URLRequestJob> main_intercept_job_;
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_