Make URLRequestFilter use URLRequestInterceptors.

chrome/browser/component_updater/test/url_request_post_interceptor.cc

 // Copyright 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 "chrome/browser/component_updater/test/url_request_post_interceptor.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_filter.h"
-#include "net/url_request/url_request_job_factory.h"
+#include "net/url_request/url_request_interceptor.h"
 #include "net/url_request/url_request_simple_job.h"
 #include "net/url_request/url_request_test_util.h"
 
 using content::BrowserThread;
 
 namespace component_updater {
 
 // Returns a canned response.
 class URLRequestMockJob : public net::URLRequestSimpleJob {
  public:
@@ skipping 90 matching lines @@
   return s;
 }
 
 void URLRequestPostInterceptor::Reset() {
   base::AutoLock auto_lock(interceptor_lock_);
   hit_count_ = 0;
   requests_.clear();
   ClearExpectations();
 }
 
-class URLRequestPostInterceptor::Delegate
-    : public net::URLRequestJobFactory::ProtocolHandler {
+class URLRequestPostInterceptor::Delegate : public net::URLRequestInterceptor {
  public:
   Delegate(const std::string& scheme, const std::string& hostname)
       : scheme_(scheme), hostname_(hostname) {}
 
   void Register() {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    net::URLRequestFilter::GetInstance()->AddHostnameProtocolHandler(
-        scheme_,
-        hostname_,
-        scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(this));
+    net::URLRequestFilter::GetInstance()->AddHostnameInterceptor(
+        scheme_, hostname_, scoped_ptr<net::URLRequestInterceptor>(this));
   }
 
   void Unregister() {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     for (InterceptorMap::iterator it = interceptors_.begin();
          it != interceptors_.end();
          ++it)
       delete (*it).second;
     net::URLRequestFilter::GetInstance()->RemoveHostnameHandler(scheme_,
                                                                 hostname_);
   }
 
   void OnCreateInterceptor(URLRequestPostInterceptor* interceptor) {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     CHECK(interceptors_.find(interceptor->GetUrl()) == interceptors_.end());
 
     interceptors_.insert(std::make_pair(interceptor->GetUrl(), interceptor));
   }
 
  private:
   virtual ~Delegate() {}
 
-  virtual net::URLRequestJob* MaybeCreateJob(
+  virtual net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const OVERRIDE {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
     // Only intercepts POST.
     if (!request->has_upload())
       return NULL;
 
     GURL url = request->url();
     if (url.has_query()) {
@@ skipping 84 matching lines @@
                  base::Unretained(interceptor)));
   if (!res) {
     delete interceptor;
     return NULL;
   }
 
   return interceptor;
 }
 
 }  // namespace component_updater