Revert "Create a component for SSL error handling"

chrome/browser/ssl/ssl_error_info.h

-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef COMPONENTS_SSL_ERRORS_SSL_ERROR_INFO_H_
-#define COMPONENTS_SSL_ERRORS_SSL_ERROR_INFO_H_
+#ifndef CHROME_BROWSER_SSL_SSL_ERROR_INFO_H_
+#define CHROME_BROWSER_SSL_SSL_ERROR_INFO_H_
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 
 class GURL;
 
-namespace ssl_errors {
-
 // This class describes an error that happened while showing a page over SSL.
-// An ErrorInfo object only exists on the UI thread and only contains
+// An SSLErrorInfo object only exists on the UI thread and only contains
 // information about an error (type of error and text details).
 // Note no DISALLOW_COPY_AND_ASSIGN as we want the copy constructor.
-class ErrorInfo {
+class SSLErrorInfo {
  public:
   // This enum is being histogrammed; please only add new values at the end.
   enum ErrorType {
     CERT_COMMON_NAME_INVALID = 0,
     CERT_DATE_INVALID,
     CERT_AUTHORITY_INVALID,
     CERT_CONTAINS_ERRORS,
     CERT_NO_REVOCATION_MECHANISM,
     CERT_UNABLE_TO_CHECK_REVOCATION,
     CERT_REVOKED,
     CERT_INVALID,
     CERT_WEAK_SIGNATURE_ALGORITHM,
     CERT_WEAK_KEY,
     CERT_NAME_CONSTRAINT_VIOLATION,
     UNKNOWN,
     CERT_WEAK_KEY_DH,
     CERT_PINNED_KEY_MISSING,
     CERT_VALIDITY_TOO_LONG,
     END_OF_ENUM
   };
 
-  virtual ~ErrorInfo();
+  virtual ~SSLErrorInfo();
 
   // Converts a network error code to an ErrorType.
   static ErrorType NetErrorToErrorType(int net_error);
 
-  static ErrorInfo CreateError(ErrorType error_type,
-                               net::X509Certificate* cert,
-                               const GURL& request_url);
+  static SSLErrorInfo CreateError(ErrorType error_type,
+                                  net::X509Certificate* cert,
+                                  const GURL& request_url);
 
   // Populates the specified |errors| vector with the errors contained in
-  // |cert_status| for |cert|.  Returns the number of errors found.
+  // |cert_status|.  Returns the number of errors found.
   // Callers only interested in the error count can pass NULL for |errors|.
-  static void GetErrorsForCertStatus(
-      const scoped_refptr<net::X509Certificate>& cert,
-      net::CertStatus cert_status,
-      const GURL& url,
-      std::vector<ErrorInfo>* errors);
+  // TODO(wtc): Document |cert_id| and |url| arguments.
+  static void GetErrorsForCertStatus(int cert_id,
+                                     net::CertStatus cert_status,
+                                     const GURL& url,
+                                     std::vector<SSLErrorInfo>* errors);
 
   // A description of the error.
   const base::string16& details() const { return details_; }
 
   // A short message describing the error (1 line).
   const base::string16& short_description() const { return short_description_; }
 
  private:
-  ErrorInfo(const base::string16& details,
-            const base::string16& short_description);
+  SSLErrorInfo(const base::string16& details,
+               const base::string16& short_description);
 
   base::string16 details_;
   base::string16 short_description_;
 };
 
-}  // namespace ssl_errors
-
-#endif  // COMPONENTS_SSL_ERRORS_SSL_ERROR_INFO_H_
+#endif  // CHROME_BROWSER_SSL_SSL_ERROR_INFO_H_