Revert "Strict transport security: add checkbox to clear state."

This reverts commit r25955.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26528 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 24 deletions

diff --git a/net/base/strict_transport_security_state.cc b/net/base/strict_transport_security_state.cc
index cc812d9..fc267c5 100644
--- a/net/base/strict_transport_security_state.cc
+++ b/net/base/strict_transport_security_state.cc
@@ -187,13 +187,6 @@ bool StrictTransportSecurityState::ParseHeader(const std::string& value,
   }
 }
 
-void StrictTransportSecurityState::Clear() {
-  AutoLock lock(lock_);
-
-  enabled_hosts_.clear();
-  DirtyNotify();
-}
-
 void StrictTransportSecurityState::SetDelegate(
     StrictTransportSecurityState::Delegate* delegate) {
   AutoLock lock(lock_);
diff --git a/net/base/strict_transport_security_state.h b/net/base/strict_transport_security_state.h
index 5739001..463382c 100644
--- a/net/base/strict_transport_security_state.h
+++ b/net/base/strict_transport_security_state.h
@@ -48,9 +48,6 @@ class StrictTransportSecurityState :
                           int* max_age,
                           bool* include_subdomains);
 
-  // Deletes all the state and notifies the delegate that the state is dirty.
-  void Clear();
-
   struct State {
     base::Time expiry;  // the absolute time (UTC) when this record expires
     bool include_subdomains;  // subdomains included?
diff --git a/net/base/strict_transport_security_state_unittest.cc b/net/base/strict_transport_security_state_unittest.cc
index 2b769d7..5ebd358 100644
--- a/net/base/strict_transport_security_state_unittest.cc
+++ b/net/base/strict_transport_security_state_unittest.cc
@@ -204,17 +204,3 @@ TEST_F(StrictTransportSecurityStateTest, Serialise2) {
   EXPECT_TRUE(state->IsEnabledForHost("foo.bar.baz.google.com"));
   EXPECT_FALSE(state->IsEnabledForHost("com"));
 }
-
-TEST_F(StrictTransportSecurityStateTest, Clear) {
-  scoped_refptr<net::StrictTransportSecurityState> state(
-      new net::StrictTransportSecurityState);
-
-  const base::Time current_time(base::Time::Now());
-  const base::Time expiry = current_time + base::TimeDelta::FromSeconds(1000);
-
-  EXPECT_FALSE(state->IsEnabledForHost("google.com"));
-  state->EnableHost("google.com", expiry, true);
-  EXPECT_TRUE(state->IsEnabledForHost("google.com"));
-  state->Clear();
-  EXPECT_FALSE(state->IsEnabledForHost("google.com"));
-}