Combine SSLCertErrorHandler and SSLErrorHandler

content/browser/ssl/ssl_cert_error_handler.cc

Index: content/browser/ssl/ssl_cert_error_handler.cc
diff --git a/content/browser/ssl/ssl_cert_error_handler.cc b/content/browser/ssl/ssl_cert_error_handler.cc
deleted file mode 100644
index 54b165d9d49f0cf1f2ec0e009e25c5267911b0a8..0000000000000000000000000000000000000000
--- a/content/browser/ssl/ssl_cert_error_handler.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/ssl/ssl_cert_error_handler.h"
-
-#include "content/browser/ssl/ssl_manager.h"
-#include "content/browser/ssl/ssl_policy.h"
-#include "net/cert/cert_status_flags.h"
-#include "net/cert/x509_certificate.h"
-
-namespace content {
-
-SSLCertErrorHandler::SSLCertErrorHandler(
-    const base::WeakPtr<Delegate>& delegate,
-    ResourceType resource_type,
-    const GURL& url,
-    const net::SSLInfo& ssl_info,
-    bool fatal)
-    : SSLErrorHandler(delegate, resource_type, url),
-      ssl_info_(ssl_info),
-      cert_error_(net::MapCertStatusToNetError(ssl_info.cert_status)),
-      fatal_(fatal) {}
-
-SSLCertErrorHandler* SSLCertErrorHandler::AsSSLCertErrorHandler() {
-  return this;
-}
-
-void SSLCertErrorHandler::OnDispatchFailed() {
-  // Requests can fail to dispatch because they don't have a WebContents. See
-  // <http://crbug.com/86537>. In this case we have to make a decision in this
-  // function, so we ignore revocation check failures.
-  if (net::IsCertStatusMinorError(ssl_info().cert_status)) {
-    ContinueRequest();
-  } else {
-    CancelRequest();
-  }
-}
-
-void SSLCertErrorHandler::OnDispatched() {
-  manager_->policy()->OnCertError(this);
-}
-
-SSLCertErrorHandler::~SSLCertErrorHandler() {}
-
-}  // namespace content