Cleanup of SSLHostStateDelegate and related code

chrome/browser/ssl/chrome_ssl_host_state_delegate.h

Index: chrome/browser/ssl/chrome_ssl_host_state_delegate.h
diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate.h b/chrome/browser/ssl/chrome_ssl_host_state_delegate.h
index 1353c20020a5b958d91d33779bd037cc6e25f1bc..577a25b237bdfe48e81f96d4fd93f5fd4297ef41 100644
--- a/chrome/browser/ssl/chrome_ssl_host_state_delegate.h
+++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate.h
@@ -29,21 +29,21 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate {
 
   // SSLHostStateDelegate:
   virtual void DenyCert(const std::string& host,
-                        net::X509Certificate* cert,
-                        net::CertStatus error) OVERRIDE;
+                        const net::X509Certificate* cert,

[willchan no longer on Chromium, 2014/09/04 00:02:38]

Can/should this be a const reference rather than a pointer to a const object?
Can it ever be NULL? In the implementation of this function, there's no NULL
check, so I assume it can't be NULL, or else there's a bug.

[jww, 2014/09/04 18:41:49]

I believe that historically this was a pointer because the origin of the cert is
from SSLInfo, which gives the cert as a pointer. But I think you are correct
that it would be a bug for it to be NULL, so I'll make this a const ref.

+                        const net::CertStatus error) OVERRIDE;
   virtual void AllowCert(const std::string& host,
-                         net::X509Certificate* cert,
-                         net::CertStatus error) OVERRIDE;
+                         const net::X509Certificate* cert,
+                         const net::CertStatus error) OVERRIDE;
   virtual void Clear() OVERRIDE;
   virtual net::CertPolicy::Judgment QueryPolicy(
       const std::string& host,
-      net::X509Certificate* cert,
-      net::CertStatus error,
+      const net::X509Certificate* cert,
+      const net::CertStatus error,
       bool* expired_previous_decision) OVERRIDE;
   virtual void HostRanInsecureContent(const std::string& host,
-                                      int pid) OVERRIDE;
+                                      const int pid) OVERRIDE;

[willchan no longer on Chromium, 2014/09/04 00:02:38]

Nit: I'd remove this const. The reason is it's copy by value anyway, so making
it const doesn't really protect anything.

I just noticed that net::CertStatus is the same. It's a POD type, so it's copy
by value too, so no need to make it const.

[jww, 2014/09/04 18:41:49]

Done.

   virtual bool DidHostRunInsecureContent(const std::string& host,
-                                         int pid) const OVERRIDE;
+                                         const int pid) const OVERRIDE;
 
   // ChromeSSLHostStateDelegate implementation:
   // Revoke all user decisions for |host| in the given Profile. The
@@ -55,10 +55,7 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate {
 
   // Returns true if any decisions has been recorded for |host| for the given
   // Profile, otherwise false.
-  virtual bool HasUserDecision(const std::string& host);
-
-  // Called on the UI thread when the profile is about to be destroyed.
-  void ShutdownOnUIThread() {}
+  virtual bool HasUserDecision(const std::string& host) const;
 
  protected:
   // SetClock takes ownership of the passed in clock.
@@ -74,8 +71,8 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate {
   // Used to specify whether new content setting entries should be created if
   // they don't already exist when querying the user's settings.
   enum CreateDictionaryEntriesDisposition {
-    CreateDictionaryEntries,
-    DoNotCreateDictionaryEntries
+    CREATE_DICTIONARY_ENTRIES,
+    DO_NOT_CREATE_DICTIONARY_ENTRIES
   };
 
   // Specifies whether user SSL error decisions should be forgetten at the end
@@ -84,8 +81,8 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate {
   // length of time, deteremined by
   // |default_ssl_cert_decision_expiration_delta_|.
   enum RememberSSLExceptionDecisionsDisposition {
-    ForgetSSLExceptionDecisionsAtSessionEnd,
-    RememberSSLExceptionDecisionsForDelta
+    FORGET_SSL_EXCEPTION_DECISIONS_AT_SESSION_END,
+    REMEMBER_SSL_EXCEPTION_DECISIONS_FOR_DELTA
   };
 
   // Modify the user's content settings to specify a judgement made for a
@@ -93,7 +90,7 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate {
   // is the certificate with an error, |error| is the error in the certificate,
   // and |judgement| is the user decision to be recorded.
   void ChangeCertPolicy(const std::string& host,
-                        net::X509Certificate* cert,
+                        const net::X509Certificate* cert,
                         net::CertStatus error,
                         net::CertPolicy::Judgment judgment);