Revert "First steps towards webRequest extension API."

Seems to have broken the sync_integration_tests.

This reverts commit d6f8d16cd6a5ebdf019c4755e7d42aee8136abf1.

TBR=aa

BUG=60101
TEST=no

Review URL: http://codereview.chromium.org/6287029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73219 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 6 insertions, 39 deletions

diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index 0c92721..a657b26 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -5,32 +5,11 @@
 #include "chrome/browser/net/chrome_network_delegate.h"
 
 #include "base/logging.h"
-#include "chrome/browser/extensions/extension_webrequest_api.h"
-#include "chrome/browser/net/chrome_url_request_context.h"
 #include "net/http/http_request_headers.h"
-#include "net/url_request/url_request.h"
-
-namespace {
-
-// Get the event router from the request context. Currently only
-// ChromeURLRequestContexts use a network delegate, so the cast is guaranteed to
-// work.
-const ExtensionIOEventRouter* GetIOEventRouter(
-    net::URLRequestContext* context) {
-  return static_cast<ChromeURLRequestContext*>(context)->
-      extension_io_event_router();
-}
-
-}  // namespace
 
 ChromeNetworkDelegate::ChromeNetworkDelegate() {}
 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
 
-void ChromeNetworkDelegate::OnBeforeURLRequest(net::URLRequest* request) {
-  ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
-      GetIOEventRouter(request->context()), request->url(), request->method());
-}
-
 void ChromeNetworkDelegate::OnSendHttpRequest(
     net::HttpRequestHeaders* headers) {
   DCHECK(headers);
diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h
index 8bff160..55336d6 100644
--- a/chrome/browser/net/chrome_network_delegate.h
+++ b/chrome/browser/net/chrome_network_delegate.h
@@ -10,14 +10,15 @@
 #include "net/http/http_network_delegate.h"
 
 // ChromeNetworkDelegate is the central point from within the chrome code to
-// add hooks into the network stack.
+// add hooks into the network stack.  In the future, we can use this for
+// extensions to register hooks for the network stack.
 class ChromeNetworkDelegate : public net::HttpNetworkDelegate {
  public:
   ChromeNetworkDelegate();
   ~ChromeNetworkDelegate();
 
   // net::HttpNetworkDelegate methods:
-  virtual void OnBeforeURLRequest(net::URLRequest* request);
+
   virtual void OnSendHttpRequest(net::HttpRequestHeaders* headers);
 
   // TODO(willchan): Add functions for consumers to register ways to
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 81e0474..dc6853a 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -263,7 +263,6 @@ ChromeURLRequestContext* FactoryForOriginal::Create() {
   context->set_host_resolver(io_thread_globals->host_resolver.get());
   context->set_cert_verifier(io_thread_globals->cert_verifier.get());
   context->set_dnsrr_resolver(io_thread_globals->dnsrr_resolver.get());
-  context->set_network_delegate(&io_thread_globals->network_delegate);
   context->set_http_auth_handler_factory(
       io_thread_globals->http_auth_handler_factory.get());
 
@@ -369,7 +368,6 @@ ChromeURLRequestContext* FactoryForExtensions::Create() {
                            chrome::kExtensionScheme};
   cookie_monster->SetCookieableSchemes(schemes, 2);
   context->set_cookie_store(cookie_monster);
-  context->set_network_delegate(&io_thread_globals->network_delegate);
   // TODO(cbentzel): How should extensions handle HTTP Authentication?
   context->set_http_auth_handler_factory(
       io_thread_globals->http_auth_handler_factory.get());
@@ -404,7 +402,6 @@ ChromeURLRequestContext* FactoryForOffTheRecord::Create() {
   context->set_cert_verifier(io_thread_globals->cert_verifier.get());
   context->set_http_auth_handler_factory(
       io_thread_globals->http_auth_handler_factory.get());
-  context->set_network_delegate(&io_thread_globals->network_delegate);
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   context->set_proxy_service(
@@ -480,7 +477,6 @@ ChromeURLRequestContext* FactoryForMedia::Create() {
 
   // TODO(willchan): Make a global ProxyService available in IOThread::Globals.
   context->set_proxy_service(main_context->proxy_service());
-  context->set_network_delegate(main_context->network_delegate());
 
   // Also share the cookie store of the common profile.
   context->set_cookie_store(main_context->cookie_store());
@@ -859,7 +855,6 @@ ChromeURLRequestContextFactory::ChromeURLRequestContextFactory(Profile* profile)
   blob_storage_context_ = profile->GetBlobStorageContext();
   file_system_context_ = profile->GetFileSystemContext();
   extension_info_map_ = profile->GetExtensionInfoMap();
-  extension_io_event_router_ = profile->GetExtensionIOEventRouter();
   prerender_manager_ = profile->GetPrerenderManager();
 }
 
@@ -886,6 +881,5 @@ void ChromeURLRequestContextFactory::ApplyProfileParametersToContext(
   context->set_blob_storage_context(blob_storage_context_);
   context->set_file_system_context(file_system_context_);
   context->set_extension_info_map(extension_info_map_);
-  context->set_extension_io_event_router(extension_io_event_router_);
   context->set_prerender_manager(prerender_manager_);
 }
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index 50f2d66..f65f63c 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -14,8 +14,6 @@
 #include "chrome/browser/chrome_blob_storage_context.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_info_map.h"
-#include "chrome/browser/extensions/extension_io_event_router.h"
-#include "chrome/browser/extensions/extension_webrequest_api.h"
 #include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_cookie_policy.h"
@@ -93,10 +91,6 @@ class ChromeURLRequestContext : public net::URLRequestContext {
     return extension_info_map_;
   }
 
-  const ExtensionIOEventRouter* extension_io_event_router() const {
-    return extension_io_event_router_;
-  }
-
   PrerenderManager* prerender_manager() {
     return prerender_manager_.get();
   }
@@ -161,8 +155,9 @@ class ChromeURLRequestContext : public net::URLRequestContext {
   void set_extension_info_map(ExtensionInfoMap* map) {
     extension_info_map_ = map;
   }
-  void set_extension_io_event_router(ExtensionIOEventRouter* router) {
-    extension_io_event_router_ = router;
+  void set_network_delegate(
+      net::HttpNetworkDelegate* network_delegate) {
+    network_delegate_ = network_delegate;
   }
   void set_prerender_manager(PrerenderManager* prerender_manager) {
     prerender_manager_ = prerender_manager;
@@ -188,7 +183,6 @@ class ChromeURLRequestContext : public net::URLRequestContext {
   scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
   // TODO(aa): This should use chrome/common/extensions/extension_set.h.
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
-  scoped_refptr<ExtensionIOEventRouter> extension_io_event_router_;
   scoped_refptr<PrerenderManager> prerender_manager_;
 
   bool is_off_the_record_;
@@ -359,7 +353,6 @@ class ChromeURLRequestContextFactory {
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
   scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
-  scoped_refptr<ExtensionIOEventRouter> extension_io_event_router_;
   scoped_refptr<PrerenderManager> prerender_manager_;
 
   FilePath profile_dir_path_;