Remove the "snionly" concept from the HSTS preload.

net/http/transport_security_state.h

 // Copyright (c) 2012 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_HTTP_TRANSPORT_SECURITY_STATE_H_
 #define NET_HTTP_TRANSPORT_SECURITY_STATE_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 141 matching lines @@
     const DomainState& domain_state() const { return iterator_->second; }
 
    private:
     std::map<std::string, DomainState>::const_iterator iterator_;
     std::map<std::string, DomainState>::const_iterator end_;
   };
 
   // These functions search for static and dynamic DomainStates, and invoke the
   // functions of the same name on them. These functions are the primary public
   // interface; direct access to DomainStates is best left to tests.
-  bool ShouldSSLErrorsBeFatal(const std::string& host, bool sni_enabled);
-  bool ShouldUpgradeToSSL(const std::string& host, bool sni_enabled);
+  bool ShouldSSLErrorsBeFatal(const std::string& host);
+  bool ShouldUpgradeToSSL(const std::string& host);
   bool CheckPublicKeyPins(const std::string& host,
-                          bool sni_enabled,
                           bool is_issued_by_known_root,
                           const HashValueVector& hashes,
                           std::string* failure_log);
-  bool HasPublicKeyPins(const std::string& host, bool sni_enabled);
+  bool HasPublicKeyPins(const std::string& host);
 
   // Assign a |Delegate| for persisting the transport security state. If
   // |NULL|, state will not be persisted. The caller retains
   // ownership of |delegate|.
   // Note: This is only used for serializing/deserializing the
   // TransportSecurityState.
   void SetDelegate(Delegate* delegate);
 
   // Clears all dynamic data (e.g. HSTS and HPKP data).
   //
@@ skipping 23 matching lines @@
   // not delete static (i.e. preloaded) data.  Returns true iff an entry
   // was deleted.
   //
   // If an entry is deleted, the new state will be persisted through
   // the Delegate (if any).
   bool DeleteDynamicDataForHost(const std::string& host);
 
   // Returns true and updates |*result| iff there is a static (built-in)
   // DomainState for |host|.
   //
-  // If |sni_enabled| is true, searches the static pins defined for SNI-using
-  // hosts as well as the rest of the pins.
-  //
   // If |host| matches both an exact entry and is a subdomain of another entry,
   // the exact match determines the return value.
   //
   // Note that this method is not const because it opportunistically removes
   // entries that have expired.
-  bool GetStaticDomainState(const std::string& host,
-                            bool sni_enabled,
-                            DomainState* result) const;
+  bool GetStaticDomainState(const std::string& host, DomainState* result) const;
 
   // Returns true and updates |*result| iff there is a dynamic DomainState
   // (learned from HSTS or HPKP headers, or set by the user, or other means) for
   // |host|.
   //
   // If |host| matches both an exact entry and is a subdomain of another entry,
   // the exact match determines the return value.
   //
   // Note that this method is not const because it opportunistically removes
   // entries that have expired.
@@ skipping 16 matching lines @@
 
   // Adds explicitly-specified data as if it was processed from an
   // HPKP header (used for net-internals and unit tests).
   bool AddHPKP(const std::string& host, const base::Time& expiry,
                bool include_subdomains, const HashValueVector& hashes);
 
   // Returns true iff we have any static public key pins for the |host| and
   // iff its set of required pins is the set we expect for Google
   // properties.
   //
-  // If |sni_enabled| is true, searches the static pins defined for
-  // SNI-using hosts as well as the rest of the pins.
-  //
   // If |host| matches both an exact entry and is a subdomain of another
   // entry, the exact match determines the return value.
-  static bool IsGooglePinnedProperty(const std::string& host,
-                                     bool sni_enabled);
+  static bool IsGooglePinnedProperty(const std::string& host);
 
   // The maximum number of seconds for which we'll cache an HSTS request.
   static const long int kMaxHSTSAgeSecs;
 
  private:
   friend class TransportSecurityStateTest;
   FRIEND_TEST_ALL_PREFIXES(HttpSecurityHeadersTest, UpdateDynamicPKPOnly);
   FRIEND_TEST_ALL_PREFIXES(HttpSecurityHeadersTest, UpdateDynamicPKPMaxAge0);
   FRIEND_TEST_ALL_PREFIXES(HttpSecurityHeadersTest, NoClobberPins);
 
   typedef std::map<std::string, DomainState> DomainStateMap;
 
   // Send an UMA report on pin validation failure, if the host is in a
   // statically-defined list of domains.
   //
   // TODO(palmer): This doesn't really belong here, and should be moved into
   // the exactly one call site. This requires unifying |struct HSTSPreload|
   // (an implementation detail of this class) with a more generic
   // representation of first-class DomainStates, and exposing the preloads
   // to the caller with |GetStaticDomainState|.
   static void ReportUMAOnPinFailure(const std::string& host);
 
   // IsBuildTimely returns true if the current build is new enough ensure that
   // built in security information (i.e. HSTS preloading and pinning
   // information) is timely.
   static bool IsBuildTimely();
 
   // Helper method for actually checking pins.
   bool CheckPublicKeyPinsImpl(const std::string& host,
-                              bool sni_enabled,
                               const HashValueVector& hashes,
                               std::string* failure_log);
 
   // If a Delegate is present, notify it that the internal state has
   // changed.
   void DirtyNotify();
 
   // Enable TransportSecurity for |host|. |state| supercedes any previous
   // state for the |host|, including static entries.
   //
@@ skipping 12 matching lines @@
 
   // True if static pins should be used.
   bool enable_static_pins_;
 
   DISALLOW_COPY_AND_ASSIGN(TransportSecurityState);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_TRANSPORT_SECURITY_STATE_H_