Update from https://crrev.com/304121

net/http/transport_security_state_unittest.cc

 // 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.
 
 #include "net/http/transport_security_state.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 281 matching lines @@
   // We do more extensive checks for the first domain.
   EXPECT_TRUE(
       state.GetStaticDomainState("www.paypal.com", &domain_state));
   EXPECT_EQ(domain_state.sts.upgrade_mode,
             TransportSecurityState::DomainState::MODE_FORCE_HTTPS);
   EXPECT_FALSE(domain_state.sts.include_subdomains);
   EXPECT_FALSE(domain_state.pkp.include_subdomains);
 
   EXPECT_TRUE(HasStaticState("paypal.com"));
   EXPECT_FALSE(HasStaticState("www2.paypal.com"));
-  EXPECT_FALSE(HasStaticState("www2.paypal.com"));
 
   // Google hosts:
 
   EXPECT_TRUE(StaticShouldRedirect("chrome.google.com"));
   EXPECT_TRUE(StaticShouldRedirect("checkout.google.com"));
   EXPECT_TRUE(StaticShouldRedirect("wallet.google.com"));
   EXPECT_TRUE(StaticShouldRedirect("docs.google.com"));
   EXPECT_TRUE(StaticShouldRedirect("sites.google.com"));
   EXPECT_TRUE(StaticShouldRedirect("drive.google.com"));
   EXPECT_TRUE(StaticShouldRedirect("spreadsheets.google.com"));
@@ skipping 215 matching lines @@
   EXPECT_FALSE(domain_state.pkp.spki_hashes.empty());
   EXPECT_TRUE(state.GetStaticDomainState("www.torproject.org", &domain_state));
   EXPECT_FALSE(domain_state.pkp.spki_hashes.empty());
   EXPECT_TRUE(
       state.GetStaticDomainState("check.torproject.org", &domain_state));
   EXPECT_FALSE(domain_state.pkp.spki_hashes.empty());
   EXPECT_TRUE(state.GetStaticDomainState("blog.torproject.org", &domain_state));
   EXPECT_FALSE(domain_state.pkp.spki_hashes.empty());
 
   EXPECT_TRUE(HasStaticPublicKeyPins("www.twitter.com"));
+
+  // Check that Facebook subdomains have pinning but not HSTS.
+  EXPECT_TRUE(state.GetStaticDomainState("facebook.com", &domain_state));
+  EXPECT_FALSE(domain_state.pkp.spki_hashes.empty());
+  EXPECT_TRUE(StaticShouldRedirect("facebook.com"));
+
+  EXPECT_TRUE(state.GetStaticDomainState("foo.facebook.com", &domain_state));
+  EXPECT_FALSE(domain_state.pkp.spki_hashes.empty());
+  EXPECT_FALSE(StaticShouldRedirect("foo.facebook.com"));
+
+  EXPECT_TRUE(state.GetStaticDomainState("www.facebook.com", &domain_state));
+  EXPECT_FALSE(domain_state.pkp.spki_hashes.empty());
+  EXPECT_TRUE(StaticShouldRedirect("www.facebook.com"));
+
+  EXPECT_TRUE(
+      state.GetStaticDomainState("foo.www.facebook.com", &domain_state));
+  EXPECT_FALSE(domain_state.pkp.spki_hashes.empty());
+  EXPECT_TRUE(StaticShouldRedirect("foo.www.facebook.com"));
 }
 
 TEST_F(TransportSecurityStateTest, LongNames) {
   TransportSecurityState state;
   const char kLongName[] =
       "lookupByWaveIdHashAndWaveIdIdAndWaveIdDomainAndWaveletIdIdAnd"
       "WaveletIdDomainAndBlipBlipid";
   TransportSecurityState::DomainState domain_state;
   // Just checks that we don't hit a NOTREACHED.
   EXPECT_FALSE(state.GetStaticDomainState(kLongName, &domain_state));
@@ skipping 203 matching lines @@
   // These hosts used to only be HSTS when SNI was available.
   EXPECT_TRUE(TransportSecurityState::IsGooglePinnedProperty(
       "gmail.com"));
   EXPECT_TRUE(TransportSecurityState::IsGooglePinnedProperty(
       "googlegroups.com"));
   EXPECT_TRUE(TransportSecurityState::IsGooglePinnedProperty(
       "www.googlegroups.com"));
 }
 
 }  // namespace net