Revert "Add button to page info to revoke user certificate decisions."

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"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
-#include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/test_data_directory.h"
 #include "net/test/cert_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 100 matching lines @@
   EXPECT_EQ(net::CertPolicy::UNKNOWN,
             state->QueryPolicy(
                 kGoogleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID));
   EXPECT_EQ(
       net::CertPolicy::DENIED,
       state->QueryPolicy(
           kExampleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID));
 }
 
 // HasPolicyAndRevoke unit tests the expected behavior of calling
-// HasUserDecision before and after calling RevokeUserDecisions on the
-// SSLHostStateDelegate class.
+// HasAllowedOrDeniedCert before and after calling RevokeAllowAndDenyPreferences
+// 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);
+  content::SSLHostStateDelegate* state = profile->GetSSLHostStateDelegate();
 
   // 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
-  // identifies that the decision has been revoked.
-  EXPECT_TRUE(state->HasUserDecision(kWWWGoogleHost));
-  state->RevokeUserDecisions(kWWWGoogleHost);
-  EXPECT_FALSE(state->HasUserDecision(kWWWGoogleHost));
+  // Verify that HasAllowedOrDeniedCert correctly acknowledges that a user
+  // decision has been made about kWWWGoogleHost. Then verify that
+  // HasAllowedOrDeniedCert correctly identifies that the decision has been
+  // revoked.
+  EXPECT_TRUE(state->HasAllowedOrDeniedCert(kWWWGoogleHost));
+  state->RevokeAllowAndDenyPreferences(kWWWGoogleHost);
+  EXPECT_FALSE(state->HasAllowedOrDeniedCert(kWWWGoogleHost));
   EXPECT_EQ(
       net::CertPolicy::UNKNOWN,
       state->QueryPolicy(
           kWWWGoogleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID));
 
   // Verify that the revocation of the kWWWGoogleHost decision does not affect
   // the Allow for kExampleHost.
-  EXPECT_TRUE(state->HasUserDecision(kExampleHost));
+  EXPECT_TRUE(state->HasAllowedOrDeniedCert(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));
-  state->RevokeUserDecisions(kGoogleHost);
-  EXPECT_FALSE(state->HasUserDecision(kGoogleHost));
+  EXPECT_FALSE(state->HasAllowedOrDeniedCert(kGoogleHost));
+  state->RevokeAllowAndDenyPreferences(kGoogleHost);
+  EXPECT_FALSE(state->HasAllowedOrDeniedCert(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);
+  content::SSLHostStateDelegate* state = profile->GetSSLHostStateDelegate();
 
   // 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->HasAllowedOrDeniedCert(kWWWGoogleHost));
   EXPECT_EQ(
       net::CertPolicy::UNKNOWN,
       state->QueryPolicy(
           kWWWGoogleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID));
-  EXPECT_FALSE(state->HasUserDecision(kExampleHost));
+  EXPECT_FALSE(state->HasAllowedOrDeniedCert(kExampleHost));
   EXPECT_EQ(
       net::CertPolicy::UNKNOWN,
       state->QueryPolicy(
           kExampleHost, google_cert.get(), net::CERT_STATUS_DATE_INVALID));
 }
 
-// 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.
-IN_PROC_BROWSER_TEST_F(ChromeSSLHostStateDelegateTest,
-                       DidHostRunInsecureContent) {
-  content::WebContents* tab =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext());
-  content::SSLHostStateDelegate* state = profile->GetSSLHostStateDelegate();
-
-  EXPECT_FALSE(state->DidHostRunInsecureContent("www.google.com", 42));
-  EXPECT_FALSE(state->DidHostRunInsecureContent("www.google.com", 191));
-  EXPECT_FALSE(state->DidHostRunInsecureContent("example.com", 42));
-
-  state->HostRanInsecureContent("www.google.com", 42);
-
-  EXPECT_TRUE(state->DidHostRunInsecureContent("www.google.com", 42));
-  EXPECT_FALSE(state->DidHostRunInsecureContent("www.google.com", 191));
-  EXPECT_FALSE(state->DidHostRunInsecureContent("example.com", 42));
-
-  state->HostRanInsecureContent("example.com", 42);
-
-  EXPECT_TRUE(state->DidHostRunInsecureContent("www.google.com", 42));
-  EXPECT_FALSE(state->DidHostRunInsecureContent("www.google.com", 191));
-  EXPECT_TRUE(state->DidHostRunInsecureContent("example.com", 42));
-}
-
 // Tests the basic behavior of cert memory in incognito.
 class IncognitoSSLHostStateDelegateTest
     : public ChromeSSLHostStateDelegateTest {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ChromeSSLHostStateDelegateTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kRememberCertErrorDecisions,
                                     kDeltaSecondsString);
   }
 };
@@ skipping 226 matching lines @@
 
   // Add an exception for an invalid certificate. Then remove the last hour's
   // 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));
 }