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

3 files changed, 0 insertions, 15 deletions

diff --git a/net/http/http_network_delegate.h b/net/http/http_network_delegate.h
index 1533bc3..6b60aba 100644
--- a/net/http/http_network_delegate.h
+++ b/net/http/http_network_delegate.h
@@ -9,13 +9,9 @@
 namespace net {
 
 class HttpRequestHeaders;
-class URLRequest;
 
 class HttpNetworkDelegate {
  public:
-  // Called before a request is sent.
-  virtual void OnBeforeURLRequest(net::URLRequest* request) = 0;
-
   // Called right before the HTTP headers are sent.  Allows the delegate to
   // read/write |headers| before they get sent out.
   virtual void OnSendHttpRequest(HttpRequestHeaders* headers) = 0;
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index c2d0f4f..300c9c6 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -13,7 +13,6 @@
 #include "net/base/net_log.h"
 #include "net/base/ssl_cert_request_info.h"
 #include "net/base/upload_data.h"
-#include "net/http/http_network_delegate.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request_context.h"
@@ -347,11 +346,6 @@ void URLRequest::StartJob(URLRequestJob* job) {
   DCHECK(!is_pending_);
   DCHECK(!job_);
 
-  // TODO(mpcomplete): pass in request ID?
-  // TODO(mpcomplete): allow delegate to potentially delay/cancel request.
-  if (context_ && context_->network_delegate())
-    context_->network_delegate()->OnBeforeURLRequest(this);
-
   net_log_.BeginEvent(
       net::NetLog::TYPE_URL_REQUEST_START_JOB,
       make_scoped_refptr(new URLRequestStartEventParameters(
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 18315dc..2c737ca 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -115,11 +115,6 @@ class URLRequestContext
     return ftp_transaction_factory_;
   }
 
-  void set_network_delegate(HttpNetworkDelegate* network_delegate) {
-    network_delegate_ = network_delegate;
-  }
-  HttpNetworkDelegate* network_delegate() { return network_delegate_; }
-
   // Gets the cookie store for this context (may be null, in which case
   // cookies are not stored).
   CookieStore* cookie_store() { return cookie_store_.get(); }