Make URLRequestFilter use URLRequestInterceptors.

chrome/browser/extensions/user_script_listener_unittest.cc

Index: chrome/browser/extensions/user_script_listener_unittest.cc
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index e14cb10c38c6b90e7f179abfeb48c1f532265103..65cb7e6ff7cd5abc7dc6dff66bc319011f4b12af 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -19,6 +19,7 @@
 #include "net/base/request_priority.h"
 #include "net/url_request/url_request.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"
@@ -101,21 +102,21 @@ scoped_refptr<Extension> LoadExtension(const std::string& filename,
                            Extension::NO_FLAGS, error);
 }
 
-class SimpleTestJobProtocolHandler
-    : public net::URLRequestJobFactory::ProtocolHandler {
+class SimpleTestJobURLRequestInterceptor
+    : public net::URLRequestInterceptor {
  public:
-  SimpleTestJobProtocolHandler() {}
-  virtual ~SimpleTestJobProtocolHandler() {}
+  SimpleTestJobURLRequestInterceptor() {}
+  virtual ~SimpleTestJobURLRequestInterceptor() {}
 
   // net::URLRequestJobFactory::ProtocolHandler
-  virtual net::URLRequestJob* MaybeCreateJob(
+  virtual net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const OVERRIDE {
     return new SimpleTestJob(request, network_delegate);
   }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(SimpleTestJobProtocolHandler);
+  DISALLOW_COPY_AND_ASSIGN(SimpleTestJobURLRequestInterceptor);
 };
 
 }  // namespace
@@ -123,14 +124,14 @@ class SimpleTestJobProtocolHandler
 class UserScriptListenerTest : public ExtensionServiceTestBase {
  public:
   UserScriptListenerTest() {
-    net::URLRequestFilter::GetInstance()->AddHostnameProtocolHandler(
+    net::URLRequestFilter::GetInstance()->AddHostnameInterceptor(
         "http", "google.com",
-        scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
-            new SimpleTestJobProtocolHandler()));
-    net::URLRequestFilter::GetInstance()->AddHostnameProtocolHandler(
+        scoped_ptr<net::URLRequestInterceptor>(
+            new SimpleTestJobURLRequestInterceptor()));
+    net::URLRequestFilter::GetInstance()->AddHostnameInterceptor(
         "http", "example.com",
-        scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
-            new SimpleTestJobProtocolHandler()));
+        scoped_ptr<net::URLRequestInterceptor>(
+            new SimpleTestJobURLRequestInterceptor()));
   }
 
   virtual ~UserScriptListenerTest() {