Remove DenyCertForHost from SSLHostStateDelegate API.

chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc

 // Copyright 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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/simple_test_clock.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
@@ skipping 108 matching lines @@
             state->QueryPolicy(kGoogleHost,
                                google_cert.get(),
                                net::CERT_STATUS_DATE_INVALID,
                                &unused_value));
   EXPECT_EQ(net::CertPolicy::ALLOWED,
             state->QueryPolicy(kExampleHost,
                                google_cert.get(),
                                net::CERT_STATUS_DATE_INVALID,
                                &unused_value));
 
-  // Simulate a user decision to deny an invalid certificate for kExampleHost.
-  state->DenyCert(
-      kExampleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID);
-
-  // Verify that kWWWGoogleHost is allowed and kExampleHost is denied while
-  // kGoogleHost still has no associated decision.
+  // Verify that kWWWGoogleHost is allowed and kGoogleHost still has no
+  // associated decision.
   EXPECT_EQ(net::CertPolicy::ALLOWED,
             state->QueryPolicy(kWWWGoogleHost,
                                google_cert.get(),
                                net::CERT_STATUS_DATE_INVALID,
                                &unused_value));
   EXPECT_EQ(net::CertPolicy::UNKNOWN,
             state->QueryPolicy(kGoogleHost,
                                google_cert.get(),
                                net::CERT_STATUS_DATE_INVALID,
                                &unused_value));
-  EXPECT_EQ(net::CertPolicy::DENIED,
-            state->QueryPolicy(kExampleHost,
-                               google_cert.get(),
-                               net::CERT_STATUS_DATE_INVALID,
-                               &unused_value));
 }
 
 // HasPolicyAndRevoke unit tests the expected behavior of calling
-// HasUserDecision before and after calling RevokeUserDecisions on the
+// HasAllowed before and after calling RevokeUserDecisions on the
 // SSLHostStateDelegate class.
 IN_PROC_BROWSER_TEST_F(ChromeSSLHostStateDelegateTest, HasPolicyAndRevoke) {
   scoped_refptr<net::X509Certificate> google_cert = GetGoogleCert();
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext());
   ChromeSSLHostStateDelegate* state =
       ChromeSSLHostStateDelegateFactory::GetForProfile(profile);
   bool unused_value;
 
   // Simulate a user decision to allow an invalid certificate exception for
   // kWWWGoogleHost and for kExampleHost.
   state->AllowCert(
       kWWWGoogleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID);
   state->AllowCert(
       kExampleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID);
 
-  // Verify that HasUserDecision correctly acknowledges that a user decision has
-  // been made about kWWWGoogleHost. Then verify that HasUserDecision correctly
+  // Verify that HasAllowed correctly acknowledges that a user decision has
+  // been made about kWWWGoogleHost. Then verify that HasAllowed correctly
   // identifies that the decision has been revoked.
-  EXPECT_TRUE(state->HasUserDecision(kWWWGoogleHost));
+  EXPECT_TRUE(state->HasAllowed(kWWWGoogleHost));
   state->RevokeUserDecisions(kWWWGoogleHost);
-  EXPECT_FALSE(state->HasUserDecision(kWWWGoogleHost));
+  EXPECT_FALSE(state->HasAllowed(kWWWGoogleHost));
   EXPECT_EQ(net::CertPolicy::UNKNOWN,
             state->QueryPolicy(kWWWGoogleHost,
                                google_cert.get(),
                                net::CERT_STATUS_DATE_INVALID,
                                &unused_value));
 
   // Verify that the revocation of the kWWWGoogleHost decision does not affect
   // the Allow for kExampleHost.
-  EXPECT_TRUE(state->HasUserDecision(kExampleHost));
+  EXPECT_TRUE(state->HasAllowed(kExampleHost));
 
   // Verify the revocation of the kWWWGoogleHost decision does not affect the
   // non-decision for kGoogleHost. Then verify that a revocation of a URL with
   // no decision has no effect.
-  EXPECT_FALSE(state->HasUserDecision(kGoogleHost));
+  EXPECT_FALSE(state->HasAllowed(kGoogleHost));
   state->RevokeUserDecisions(kGoogleHost);
-  EXPECT_FALSE(state->HasUserDecision(kGoogleHost));
+  EXPECT_FALSE(state->HasAllowed(kGoogleHost));
 }
 
 // Clear unit tests the expected behavior of calling Clear to forget all cert
 // decision state on the SSLHostStateDelegate class.
 IN_PROC_BROWSER_TEST_F(ChromeSSLHostStateDelegateTest, Clear) {
   scoped_refptr<net::X509Certificate> google_cert = GetGoogleCert();
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext());
   ChromeSSLHostStateDelegate* state =
       ChromeSSLHostStateDelegateFactory::GetForProfile(profile);
   bool unused_value;
 
   // Simulate a user decision to allow an invalid certificate exception for
   // kWWWGoogleHost and for kExampleHost.
   state->AllowCert(
       kWWWGoogleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID);
 
   // Do a full clear, then make sure that both kWWWGoogleHost, which had a
   // decision made, and kExampleHost, which was untouched, are now in a
   // non-decision state.
   state->Clear();
-  EXPECT_FALSE(state->HasUserDecision(kWWWGoogleHost));
+  EXPECT_FALSE(state->HasAllowed(kWWWGoogleHost));
   EXPECT_EQ(net::CertPolicy::UNKNOWN,
             state->QueryPolicy(kWWWGoogleHost,
                                google_cert.get(),
                                net::CERT_STATUS_DATE_INVALID,
                                &unused_value));
-  EXPECT_FALSE(state->HasUserDecision(kExampleHost));
+  EXPECT_FALSE(state->HasAllowed(kExampleHost));
   EXPECT_EQ(net::CertPolicy::UNKNOWN,
             state->QueryPolicy(kExampleHost,
                                google_cert.get(),
                                net::CERT_STATUS_DATE_INVALID,
                                &unused_value));
 }
 
 // DidHostRunInsecureContent unit tests the expected behavior of calling
 // DidHostRunInsecureContent as well as HostRanInsecureContent to check if
 // insecure content has been run and to mark it as such.
@@ skipping 343 matching lines @@
   // worth of browsing history and verify that the exception has been deleted.
   state->AllowCert(
       kGoogleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID);
   RemoveAndWait(profile);
   EXPECT_EQ(net::CertPolicy::UNKNOWN,
             state->QueryPolicy(kGoogleHost,
                                google_cert.get(),
                                net::CERT_STATUS_DATE_INVALID,
                                &unused_value));
 }