Make URLRequestFilter use URLRequestInterceptors.

net/ocsp/nss_ocsp_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/ocsp/nss_ocsp.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert/cert_verify_proc.h"
 #include "net/cert/cert_verify_proc_nss.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/multi_threaded_cert_verifier.h"
 #include "net/cert/test_root_certs.h"
 #include "net/cert/x509_certificate.h"
 #include "net/test/cert_test_util.h"
 #include "net/url_request/url_request_filter.h"
+#include "net/url_request/url_request_interceptor.h"
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 // Matches the caIssuers hostname from the generated certificate.
 const char kAiaHost[] = "aia-test.invalid";
 // Returning a single DER-encoded cert, so the mime-type must be
 // application/pkix-cert per RFC 5280.
 const char kAiaHeaders[] = "HTTP/1.1 200 OK\0"
                            "Content-type: application/pkix-cert\0"
                            "\0";
 
-class AiaResponseHandler : public net::URLRequestJobFactory::ProtocolHandler {
+class AiaResponseHandler : public net::URLRequestInterceptor {
  public:
   AiaResponseHandler(const std::string& headers, const std::string& cert_data)
       : headers_(headers), cert_data_(cert_data), request_count_(0) {}
   virtual ~AiaResponseHandler() {}
 
-  // net::URLRequestJobFactory::ProtocolHandler implementation:
-  virtual net::URLRequestJob* MaybeCreateJob(
+  // net::URLRequestInterceptor implementation:
+  virtual net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const OVERRIDE {
     ++const_cast<AiaResponseHandler*>(this)->request_count_;
 
     return new net::URLRequestTestJob(
         request, network_delegate, headers_, cert_data_, true);
   }
 
   int request_count() const { return request_count_; }
 
@@ skipping 22 matching lines @@
         GetTestCertsDirectory().AppendASCII("aia-intermediate.der"),
         &file_contents));
     ASSERT_FALSE(file_contents.empty());
 
     // Ownership of |handler| is transferred to the URLRequestFilter, but
     // hold onto the original pointer in order to access |request_count()|.
     scoped_ptr<AiaResponseHandler> handler(
         new AiaResponseHandler(kAiaHeaders, file_contents));
     handler_ = handler.get();
 
-    URLRequestFilter::GetInstance()->AddHostnameProtocolHandler(
+    URLRequestFilter::GetInstance()->AddHostnameInterceptor(
         "http",
         kAiaHost,
-        handler.PassAs<URLRequestJobFactory::ProtocolHandler>());
+        handler.PassAs<URLRequestInterceptor>());
 
     SetURLRequestContextForNSSHttpIO(&context_);
     EnsureNSSHttpIOInit();
   }
 
   virtual void TearDown() {
     ShutdownNSSHttpIO();
 
     if (handler_)
       URLRequestFilter::GetInstance()->RemoveHostnameHandler("http", kAiaHost);
@@ skipping 48 matching lines @@
 
   error = test_callback.WaitForResult();
 
   EXPECT_EQ(OK, error);
 
   // Ensure that NSS made an AIA request for the missing intermediate.
   EXPECT_LT(0, request_count());
 }
 
 }  // namespace net