Revert change 11197 because it created 138 new layout tests

failures.

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

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

1 files changed, 4 insertions, 13 deletions

diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 4309689..f4aee3a 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -354,15 +354,10 @@ class URLRequest {
   // no effect once the response has completed.
   void Cancel();
 
-  // Cancels the request and sets the error to |os_error| (see net_error_list.h
-  // for values).
-  void SimulateError(int os_error);
-
-  // Cancels the request and sets the error to |os_error| (see net_error_list.h
-  // for values) and attaches |ssl_info| as the SSLInfo for that request.  This
-  // is useful to attach a certificate and certificate error to a canceled
-  // request.
-  void SimulateSSLError(int os_error, const net::SSLInfo& ssl_info);
+  // Similar to Cancel but sets the error to |os_error| (see net_error_list.h
+  // for values) instead of net::ERR_ABORTED.
+  // Used to attach a reason for canceling a request.
+  void CancelWithError(int os_error);
 
   // Read initiates an asynchronous read from the response, and must only
   // be called after the OnResponseStarted callback is received with a
@@ -440,10 +435,6 @@ class URLRequest {
   // been orphaned.
   void OrphanJob();
 
-  // Cancels the request and set the error and ssl info for this request to the
-  // passed values.
-  void DoCancel(int os_error, const net::SSLInfo& ssl_info);
-
   // Discard headers which have meaning in POST (Content-Length, Content-Type,
   // Origin).
   static std::string StripPostSpecificHeaders(const std::string& headers);