Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(968)

Unified Diff: chrome/browser/extensions/user_script_listener_unittest.cc

Issue 11293252: Change Interceptors into URLRequestJobFactory::ProtocolHandlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..f43e5c0adfc0285c540d4a58fc212780df8816c1 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,17 +102,23 @@ 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() {
+ virtual void SetUp() OVERRIDE {
ExtensionServiceTestBase::SetUp();
InitializeEmptyExtensionService();
@@ -121,14 +128,15 @@ class UserScriptListenerTest
listener_ = new UserScriptListener();
}
- virtual void TearDown() {
+ virtual void TearDown() OVERRIDE {
listener_ = NULL;
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 OVERRIDE {
return new SimpleTestJob(request, network_delegate);
}
« no previous file with comments | « chrome/browser/extensions/extension_disabled_ui_browsertest.cc ('k') | chrome/browser/net/chrome_network_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698