Track "display" and "run" separately for mixed content, and make the latter d...

chrome/browser/ssl/ssl_host_state_unittest.cc

Index: chrome/browser/ssl/ssl_host_state_unittest.cc
===================================================================
--- chrome/browser/ssl/ssl_host_state_unittest.cc	(revision 47175)
+++ chrome/browser/ssl/ssl_host_state_unittest.cc	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -91,24 +91,24 @@
 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) {