Change Interceptors into URLRequestJobFactory::ProtocolHandlers.

net/url_request/url_request_filter.h

Index: net/url_request/url_request_filter.h
diff --git a/net/url_request/url_request_filter.h b/net/url_request/url_request_filter.h
index c039300cef41cc025831283d89a850d9dda858b0..060820e8b2f61477882dd75eb52953385a3ab955 100644
--- a/net/url_request/url_request_filter.h
+++ b/net/url_request/url_request_filter.h
@@ -22,9 +22,11 @@
 #include <map>
 #include <string>
 
+#include "base/callback.h"
 #include "base/hash_tables.h"
 #include "net/base/net_export.h"
 #include "net/url_request/url_request.h"
+#include "net/url_request/url_request_job_factory.h"
 
 class GURL;
 
@@ -35,7 +37,7 @@ class NET_EXPORT URLRequestFilter {
  public:
   // scheme,hostname -> ProtocolFactory
   typedef std::map<std::pair<std::string, std::string>,
-      URLRequest::ProtocolFactory*> HostnameHandlerMap;
+      base::Callback<URLRequest::ProtocolFactory> > HostnameHandlerMap;
   typedef base::hash_map<std::string, URLRequest::ProtocolFactory*>
       UrlHandlerMap;
 
@@ -49,6 +51,10 @@ class NET_EXPORT URLRequestFilter {
   void AddHostnameHandler(const std::string& scheme,
                           const std::string& hostname,
                           URLRequest::ProtocolFactory* factory);
+  void AddHostnameProtocolHandler(
+      const std::string& scheme,
+      const std::string& hostname,
+      URLRequestJobFactory::ProtocolHandler* protocol_handler);
   void RemoveHostnameHandler(const std::string& scheme,
                              const std::string& hostname);
 
@@ -83,6 +89,11 @@ class NET_EXPORT URLRequestFilter {
   int hit_count_;
 
  private:
+  void AddHostnameCallback(
+      const std::string& scheme,
+      const std::string& hostname,
+      base::Callback<URLRequest::ProtocolFactory> callback);
+
   // Singleton instance.
   static URLRequestFilter* shared_instance_;