Chromium Code Reviews| 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 b0fc268697ea572497a6b8cafeb0e1a9c545130e..cfaae98c937ccb68e09f40822570e648b93992f1 100644 |
| --- a/chrome/browser/extensions/user_script_listener_unittest.cc |
| +++ b/chrome/browser/extensions/user_script_listener_unittest.cc |
| @@ -17,6 +17,7 @@ |
| #include "content/public/browser/resource_controller.h" |
| #include "content/public/browser/resource_throttle.h" |
| #include "net/url_request/url_request.h" |
| +#include "net/url_request/url_request_filter.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,14 +102,20 @@ scoped_refptr<Extension> LoadExtension(const std::string& filename, |
| class UserScriptListenerTest |
| : public ExtensionServiceTestBase, |
| - public net::URLRequest::Interceptor { |
| + public net::URLRequestJobFactory::ProtocolHandler { |
| public: |
| UserScriptListenerTest() { |
| - net::URLRequest::Deprecated::RegisterRequestInterceptor(this); |
| + net::URLRequestFilter::GetInstance()->AddHostnameProtocolHandler( |
| + "http", "google.com", this); |
| + net::URLRequestFilter::GetInstance()->AddHostnameProtocolHandler( |
| + "http", "example.com", this); |
| } |
| ~UserScriptListenerTest() { |
| - net::URLRequest::Deprecated::UnregisterRequestInterceptor(this); |
| + net::URLRequestFilter::GetInstance()->RemoveHostnameHandler("http", |
| + "google.com"); |
| + net::URLRequestFilter::GetInstance()->RemoveHostnameHandler("http", |
| + "example.com"); |
| } |
| virtual void SetUp() { |
| @@ -126,9 +133,9 @@ class UserScriptListenerTest |
| MessageLoop::current()->RunUntilIdle(); |
| } |
| - // net::URLRequest::Interceptor |
| - virtual net::URLRequestJob* MaybeIntercept( |
| - net::URLRequest* request, net::NetworkDelegate* network_delegate) { |
| + // net::URLRequestJobFactory::ProtocolHandler |
| + virtual net::URLRequestJob* MaybeCreateJob( |
| + net::URLRequest* request, net::NetworkDelegate* network_delegate) const { |
|
mmenke
2012/12/13 16:12:04
nit: OVERRIDE
|
| return new SimpleTestJob(request, network_delegate); |
| } |