Add command-line control of the HSTS preload list.

net/base/transport_security_state.h

 // Copyright (c) 2011 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.
 
 #ifndef NET_BASE_TRANSPORT_SECURITY_STATE_H_
 #define NET_BASE_TRANSPORT_SECURITY_STATE_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 26 matching lines @@
       MODE_STRICT = 0,
       // Opportunistic mode implies:
       //   * We'll request HTTP URLs over HTTPS
       //   * Certificate issues are ignored.
       MODE_OPPORTUNISTIC = 1,
       // SPDY_ONLY (aka X-Bodge-Transport-Security) is a hopefully temporary
       // measure. It implies:
       //   * We'll request HTTP URLs over HTTPS iff we have SPDY support.
       //   * Certificate issues are fatal.
       MODE_SPDY_ONLY = 2,
+      // None means there is no HSTS for this domain.
+      MODE_NONE = 3,
     };
 
     DomainState();
     ~DomainState();
 
     // IsChainOfPublicKeysPermitted takes a set of public key hashes and
     // returns true if:
     //   1) |public_key_hashes| is empty, i.e. no public keys have been pinned.
     //   2) |hashes| and |public_key_hashes| are not disjoint.
     bool IsChainOfPublicKeysPermitted(
@@ skipping 40 matching lines @@
     // Thus it must not reenter the TransportSecurityState object.
     virtual void StateIsDirty(TransportSecurityState* state) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
   void SetDelegate(Delegate*);
 
   bool Serialise(std::string* output);
-  bool Deserialise(const std::string& state, bool* dirty);
+  // Existing non-preloaded entries are cleared and repopulated from the
+  // passed JSON string.
+  bool LoadEntries(const std::string& state, bool* dirty);
 
   // The maximum number of seconds for which we'll cache an HSTS request.
   static const long int kMaxHSTSAgeSecs;
 
  private:
   friend class base::RefCountedThreadSafe<TransportSecurityState>;
   FRIEND_TEST_ALL_PREFIXES(TransportSecurityStateTest, IsPreloaded);
 
   ~TransportSecurityState();
 
   // If we have a callback configured, call it to let our serialiser know that
   // our state is dirty.
   void DirtyNotify();
 
   static std::string CanonicalizeHost(const std::string& host);
   static bool IsPreloadedSTS(const std::string& canonicalized_host,
                              bool sni_available,
-                             bool* out_include_subdomains);
+                             DomainState* out);
+  static bool Deserialise(const std::string& state,
+                          bool* dirty,
+                          std::map<std::string, DomainState>* out);
 
   // The set of hosts that have enabled TransportSecurity. The keys here
   // are SHA256(DNSForm(domain)) where DNSForm converts from dotted form
   // ('www.google.com') to the form used in DNS: "\x03www\x06google\x03com"
   std::map<std::string, DomainState> enabled_hosts_;
 
   // Our delegate who gets notified when we are dirtied, or NULL.
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TransportSecurityState);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_TRANSPORT_SECURITY_STATE_H_