Make CertificateHandler a proper interface of CertificateImporter.

chromeos/network/onc/onc_certificate_importer_impl.h

Index: chromeos/network/onc/onc_certificate_importer_impl.h
diff --git a/chromeos/network/onc/onc_certificate_importer.h b/chromeos/network/onc/onc_certificate_importer_impl.h
similarity index 57%
copy from chromeos/network/onc/onc_certificate_importer.h
copy to chromeos/network/onc/onc_certificate_importer_impl.h
index 48488828e302bc062f7ec4d12e7fe615cf9f9357..0ad71558db5b150d530134eca26627a88384af84 100644
--- a/chromeos/network/onc/onc_certificate_importer.h
+++ b/chromeos/network/onc/onc_certificate_importer_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_
-#define CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_
+#ifndef CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_IMPL_H_
+#define CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_IMPL_H_
 
 #include <map>
 #include <string>
@@ -13,6 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/network/onc/onc_certificate_importer.h"
 #include "chromeos/network/onc/onc_constants.h"
 
 namespace base {
@@ -34,56 +35,54 @@ namespace onc {
 // certificates are identified by their PEM and not by GUID.
 // TODO(pneubeck): Replace Nickname by PEM for Client
 // certificates. http://crbug.com/252119
-class CHROMEOS_EXPORT CertificateImporter {
+class CHROMEOS_EXPORT CertificateImporterImpl : public CertificateImporter {
  public:
   typedef std::map<std::string, scoped_refptr<net::X509Certificate> >
       CertsByGUID;
-  enum ParseResult {
-    IMPORT_OK,
-    IMPORT_INCOMPLETE,
-    IMPORT_FAILED,
-  };
-
-  // During import with ParseCertificate(), Web trust is only applied to Server
-  // and Authority certificates with the TrustBits attribute "Web" if the
-  // |allow_trust_imports| permission is granted, otherwise the attribute is
-  // ignored.
-  explicit CertificateImporter(bool allow_trust_imports);
-
-  // Parses and stores the certificates in |onc_certificates| into the
-  // certificate store. If the "Remove" field of a certificate is enabled, then
-  // removes the certificate from the store instead of importing. Returns the
-  // result of the parse operation. In case of IMPORT_INCOMPLETE, some of the
-  // certificates may be stored/removed successfully while others had errors.
-  // If no error occurred, returns IMPORT_OK. If |onc_trusted_certificates| is
-  // not NULL, it will be filled with the list of certificates that requested
-  // the Web trust flag. If |imported_server_and_ca_certs| is not null, it will
-  // be filled with the (GUID, Certificate) pairs of all successfully imported
-  // Server and CA certificates.
-  ParseResult ParseAndStoreCertificates(
-      const base::ListValue& onc_certificates,
-      net::CertificateList* onc_trusted_certificates,
-      CertsByGUID* imported_server_and_ca_certs);
+
+  CertificateImporterImpl();
+
+  // CertificateImporter overrides
+  // If the "Remove" field of a certificate is enabled, then removes the
+  // certificate from the store instead of importing.

[Mattias Nissler (ping if slow), 2013/07/24 11:25:40]

Shouldn't this comment be on the interface.

[pneubeck (no reviews), 2013/07/25 08:03:23]

Done.

+  virtual bool ImportCertificates(
+      const base::ListValue& certificates,
+      onc::ONCSource source,
+      net::CertificateList* onc_trusted_certificates) OVERRIDE;
+
+  // This implements ImportCertificates. Additionally, if
+  // |imported_server_and_ca_certs| is not NULL, it will be filled with the
+  // (GUID, Certificate) pairs of all succesfully imported Server and CA
+  // certificates.
+  bool ParseAndStoreCertificates(bool allow_trust_imports,
+                                 const base::ListValue& onc_certificates,
+                                 net::CertificateList* onc_trusted_certificates,
+                                 CertsByGUID* imported_server_and_ca_certs);
 
   // Lists the certificates that have the string |label| as their certificate
   // nickname (exact match).
   static void ListCertsWithNickname(const std::string& label,
                                     net::CertificateList* result);
 
- protected:
+ private:
   // Deletes any certificate that has the string |label| as its nickname (exact
   // match).
   static bool DeleteCertAndKeyByNickname(const std::string& label);
 
- private:
   // Parses and stores/removes |certificate| in/from the certificate
   // store. Returns true if the operation succeeded.
   bool ParseAndStoreCertificate(
+      bool allow_trust_imports,
       const base::DictionaryValue& certificate,
       net::CertificateList* onc_trusted_certificates,
       CertsByGUID* imported_server_and_ca_certs);
 
+  // Imports the Server or CA certificate |certificate|. Web trust is only
+  // applied if the certificate requests the TrustBits attribute "Web" and if
+  // the |allow_trust_imports| permission is granted, otherwise the attribute is
+  // ignored.
   bool ParseServerOrCaCertificate(
+      bool allow_trust_imports,
       const std::string& cert_type,
       const std::string& guid,
       const base::DictionaryValue& certificate,
@@ -93,14 +92,10 @@ class CHROMEOS_EXPORT CertificateImporter {
   bool ParseClientCertificate(const std::string& guid,
                               const base::DictionaryValue& certificate);
 
-  // Whether certificates with TrustBits attribute "Web" should be stored with
-  // web trust.
-  bool allow_trust_imports_;
-
-  DISALLOW_COPY_AND_ASSIGN(CertificateImporter);
+  DISALLOW_COPY_AND_ASSIGN(CertificateImporterImpl);
 };
 
 }  // namespace onc
 }  // namespace chromeos
 
-#endif  // CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_
+#endif  // CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_IMPL_H_