Refactor the assignment of CertVerifyResult::has_md2, etc.

net/cert/cert_verify_proc.h

Index: net/cert/cert_verify_proc.h
diff --git a/net/cert/cert_verify_proc.h b/net/cert/cert_verify_proc.h
index 81cebd6b5e1fa133c1abc37b7c3a3882d28d4a1d..33f87ee3f62e030439a98a7919ae49f4960a116d 100644
--- a/net/cert/cert_verify_proc.h
+++ b/net/cert/cert_verify_proc.h
@@ -14,7 +14,6 @@
 #include "base/memory/ref_counted.h"
 #include "net/base/net_export.h"
 #include "net/cert/x509_cert_types.h"
-#include "net/cert/x509_certificate.h"
 
 namespace net {
 
@@ -93,9 +92,17 @@ class NET_EXPORT CertVerifyProc
   // On entry, |verify_result| will be default-initialized as a successful
   // validation, with |verify_result->verified_cert| set to |cert|.
   //
-  // Implementations are expected to fill in all applicable fields, excluding
-  // |ocsp_result|, which will be filled in by |Verify()|. If an error code is
-  // returned, |verify_result->cert_status| should be non-zero, indicating an
+  // Implementations are expected to fill in all applicable fields, excluding:
+  //
+  // * ocsp_result
+  // * has_md2
+  // * has_md4
+  // * has_md5
+  // * has_sha1
+  // * has_sha1_leaf
+  //
+  // which will be filled in by |Verify()|. If an error code is returned,
+  // |verify_result->cert_status| should be non-zero, indicating an
   // error occurred.
   //
   // On success, net::OK should be returned, with |verify_result| updated to
@@ -143,21 +150,6 @@ class NET_EXPORT CertVerifyProc
   DISALLOW_COPY_AND_ASSIGN(CertVerifyProc);
 };
 
-// Sets the weak signature hash fields of |verify_result| to true if
-// applicable for |cert|, otherwise does not modify them.
-//
-// The fields in question are: |has_md2|, |has_md4|, |has_md5|,|has_sha1| and
-// |has_sha1_leaf|.
-//
-// Returns the hash algorithm that was determined for |cert|.
-//
-// This function is intended to be used as a helper by platform-specific
-// CertVerifyProc implementations.
-X509Certificate::SignatureHashAlgorithm FillCertVerifyResultWeakSignature(
-    X509Certificate::OSCertHandle cert,
-    bool is_leaf,
-    CertVerifyResult* verify_result);
-
 }  // namespace net
 
 #endif  // NET_CERT_CERT_VERIFY_PROC_H_