Support host-based deletion for SSLHostStateDelegate

android_webview/browser/aw_ssl_host_state_delegate.cc

 // Copyright (c) 2014 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 "android_webview/browser/aw_ssl_host_state_delegate.h"
 
+#include "base/callback.h"
 #include "net/base/hash_value.h"
 
 using content::SSLHostStateDelegate;
 
 namespace android_webview {
 
 namespace internal {
 net::SHA256HashValue getChainFingerprint256(const net::X509Certificate& cert) {
   net::SHA256HashValue fingerprint =
       net::X509Certificate::CalculateChainFingerprint256(
@@ skipping 52 matching lines @@
   // Intentional no-op for Android WebView.
   return false;
 }
 
 void AwSSLHostStateDelegate::AllowCert(const std::string& host,
                                        const net::X509Certificate& cert,
                                        net::CertStatus error) {
   cert_policy_for_host_[host].Allow(cert, error);
 }
 
-void AwSSLHostStateDelegate::Clear() {
-  cert_policy_for_host_.clear();
+void AwSSLHostStateDelegate::Clear(
+    const base::Callback<bool(const std::string&)>& host_filter) {
+  if (host_filter.IsNull()) {
+    cert_policy_for_host_.clear();
+    return;
+  }
+
+  for (auto it = cert_policy_for_host_.begin(); it != cert_policy_map_.end();) {

[estark, 2016/08/30 01:52:15]

|cert_policy_map_| doesn't appear to be a thing; guessing this is supposed to be
|cert_policy_for_host_|?

[msramek, 2016/08/30 14:39:41]

Done. Of course I didn't get a compilation error since this is Android, and I
forgot to run trybots...

+    auto next_it = std::next(it);
+
+    if (host_filter.Run(it->first))
+      cert_policy_for_host_.erase(it);
+
+    it = next_it;
+  }
 }
 
 SSLHostStateDelegate::CertJudgment AwSSLHostStateDelegate::QueryPolicy(
     const std::string& host,
     const net::X509Certificate& cert,
     net::CertStatus error,
     bool* expired_previous_decision) {
   return cert_policy_for_host_[host].Check(cert, error)
              ? SSLHostStateDelegate::ALLOWED
              : SSLHostStateDelegate::DENIED;
 }
 
 void AwSSLHostStateDelegate::RevokeUserAllowExceptions(
     const std::string& host) {
   cert_policy_for_host_.erase(host);
 }
 
 bool AwSSLHostStateDelegate::HasAllowException(const std::string& host) const {
   auto policy_iterator = cert_policy_for_host_.find(host);
   return policy_iterator != cert_policy_for_host_.end() &&
          policy_iterator->second.HasAllowException();
 }
 
 }  // namespace android_webview