Revert 47357 - Revert 47347 (Original patch reviewed at http://codereview.ch...

chrome/browser/ssl/ssl_host_state_unittest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "chrome/browser/ssl/ssl_host_state.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Certificates for test data. They're obtained with:
 //
@@ skipping 72 matching lines @@
   0x04, 0xfe, 0xd5, 0xe9, 0xb9, 0xb0, 0x9e, 0xfe, 0xa5, 0x11, 0x69, 0xc9,
   0x63, 0xd6, 0x46, 0x81, 0x6f, 0x00, 0xd8, 0x72, 0x2f, 0x82, 0x37, 0x44,
   0xc1
 };
 
 }  // namespace
 
 class SSLHostStateTest : public testing::Test {
 };
 
-TEST_F(SSLHostStateTest, MarkHostAsBroken) {
+TEST_F(SSLHostStateTest, DidHostRunInsecureContent) {
   SSLHostState state;
 
-  EXPECT_FALSE(state.DidMarkHostAsBroken("www.google.com", 42));
-  EXPECT_FALSE(state.DidMarkHostAsBroken("www.google.com", 191));
-  EXPECT_FALSE(state.DidMarkHostAsBroken("example.com", 42));
+  EXPECT_FALSE(state.DidHostRunInsecureContent("www.google.com", 42));
+  EXPECT_FALSE(state.DidHostRunInsecureContent("www.google.com", 191));
+  EXPECT_FALSE(state.DidHostRunInsecureContent("example.com", 42));
 
-  state.MarkHostAsBroken("www.google.com", 42);
+  state.HostRanInsecureContent("www.google.com", 42);
 
-  EXPECT_TRUE(state.DidMarkHostAsBroken("www.google.com", 42));
-  EXPECT_FALSE(state.DidMarkHostAsBroken("www.google.com", 191));
-  EXPECT_FALSE(state.DidMarkHostAsBroken("example.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.MarkHostAsBroken("example.com", 42);
+  state.HostRanInsecureContent("example.com", 42);
 
-  EXPECT_TRUE(state.DidMarkHostAsBroken("www.google.com", 42));
-  EXPECT_FALSE(state.DidMarkHostAsBroken("www.google.com", 191));
-  EXPECT_TRUE(state.DidMarkHostAsBroken("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));
 }
 
 TEST_F(SSLHostStateTest, QueryPolicy) {
   scoped_refptr<net::X509Certificate> google_cert =
       net::X509Certificate::CreateFromBytes(
           reinterpret_cast<const char*>(google_der), sizeof(google_der));
 
   SSLHostState state;
 
   EXPECT_EQ(state.QueryPolicy(google_cert.get(), "www.google.com"),
@@ skipping 23 matching lines @@
 
   state.DenyCertForHost(google_cert.get(), "example.com");
 
   EXPECT_EQ(state.QueryPolicy(google_cert.get(), "www.google.com"),
             net::X509Certificate::Policy::ALLOWED);
   EXPECT_EQ(state.QueryPolicy(google_cert.get(), "google.com"),
             net::X509Certificate::Policy::UNKNOWN);
   EXPECT_EQ(state.QueryPolicy(google_cert.get(), "example.com"),
             net::X509Certificate::Policy::DENIED);
 }