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

2 files changed, 5 insertions, 17 deletions

diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index 58d7acb..bc95a53 100644
--- a/chrome/browser/ssl/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_manager.cc
@@ -338,11 +338,7 @@ void SSLManager::ErrorHandler::CompleteCancelRequest(int error) {
       // The request can be NULL if it was cancelled by the renderer (as the
       // result of the user navigating to a new page from the location bar).
       DLOG(INFO) << "CompleteCancelRequest() url: " << request->url().spec();
-      SSLManager::CertError* cert_error = AsCertError();
-      if (cert_error)
-        request->SimulateSSLError(error, cert_error->ssl_info());
-      else
-        request->SimulateError(error);
+      request->CancelWithError(error);
     }
     request_has_been_notified_ = true;
 
@@ -595,8 +591,7 @@ void SSLManager::DidCommitProvisionalLoad(
   // An HTTPS response may not have a certificate for some reason.  When that
   // happens, use the unauthenticated (HTTP) rather than the authentication
   // broken security style so that we can detect this error condition.
-  if (net::IsCertStatusError(ssl_cert_status) &&
-      !details->is_content_filtered) {
+  if (net::IsCertStatusError(ssl_cert_status)) {
     changed |= SetMaxSecurityStyle(SECURITY_STYLE_AUTHENTICATION_BROKEN);
     if (!details->is_main_frame &&
         !details->entry->ssl().has_unsafe_content()) {
diff --git a/chrome/browser/ssl/ssl_manager.h b/chrome/browser/ssl/ssl_manager.h
index 63cfce4..0b1842e 100644
--- a/chrome/browser/ssl/ssl_manager.h
+++ b/chrome/browser/ssl/ssl_manager.h
@@ -49,8 +49,6 @@ class WebContents;
 
 class SSLManager : public NotificationObserver {
  public:
-  class CertError;
-
   // An ErrorHandler carries information from the IO thread to the UI thread
   // and is dispatched to the appropriate SSLManager when it arrives on the
   // UI thread.  Subclasses should override the OnDispatched/OnDispatchFailed
@@ -65,8 +63,6 @@ class SSLManager : public NotificationObserver {
    public:
     virtual ~ErrorHandler() { }
 
-    virtual CertError* AsCertError() { return NULL; }
-
     // Find the appropriate SSLManager for the URLRequest and begin handling
     // this error.
     //
@@ -171,7 +167,7 @@ class SSLManager : public NotificationObserver {
     bool request_has_been_notified_;  // A flag to make sure we notify the
                                       // URLRequest exactly once.
 
-    DISALLOW_COPY_AND_ASSIGN(ErrorHandler);
+    DISALLOW_EVIL_CONSTRUCTORS(ErrorHandler);
   };
 
   // A CertError represents an error that occurred with the certificate in an
@@ -179,9 +175,6 @@ class SSLManager : public NotificationObserver {
   // thread and allows us to cancel/continue a request it is associated with.
   class CertError : public ErrorHandler {
    public:
-
-    virtual CertError* AsCertError() { return this; }
-
     // These accessors are available on either thread
     const net::SSLInfo& ssl_info() const { return ssl_info_; }
     int cert_error() const { return cert_error_; }
@@ -213,7 +206,7 @@ class SSLManager : public NotificationObserver {
     // that error.
     ResourceType::Type resource_type_;
 
-    DISALLOW_COPY_AND_ASSIGN(CertError);
+    DISALLOW_EVIL_CONSTRUCTORS(CertError);
   };
 
   // The MixedContentHandler class is used to query what to do with
@@ -231,7 +224,7 @@ class SSLManager : public NotificationObserver {
     virtual void OnDispatched() { manager()->OnMixedContent(this); }
 
    private:
-    DISALLOW_COPY_AND_ASSIGN(MixedContentHandler);
+    DISALLOW_EVIL_CONSTRUCTORS(MixedContentHandler);
   };
 
   // The SSLManager will ask its delegate to decide how to handle events