Add a build flag to configure bundling of HSTS preload list

net/http/http_security_headers_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 <stdint.h>
 
 #include "base/base64.h"
 #include "base/stl_util.h"
 #include "base/strings/string_piece.h"
 #include "crypto/sha2.h"
@@ skipping 634 matching lines @@
 }
 
 TEST_F(HttpSecurityHeadersTest, BogusPinsHeadersSHA256) {
   TestBogusPinsHeaders(HASH_VALUE_SHA256);
 }
 
 TEST_F(HttpSecurityHeadersTest, ValidPKPHeadersSHA256) {
   TestValidPKPHeaders(HASH_VALUE_SHA256);
 }
 
+#if !BUILDFLAG(INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST)
+TEST_F(HttpSecurityHeadersTest, DISABLED_UpdateDynamicPKPOnly) {
+#else
 TEST_F(HttpSecurityHeadersTest, UpdateDynamicPKPOnly) {
+#endif

[Ryan Sleevi, 2017/07/07 16:45:13]

Ah, apologies for not providing a clearer example.

We generally try to use a MAYBE_ preprocessor macro to handle these tests, to
avoid wrapping the TEST_F() within an #ifdef

That is

#if !BUILDFLAG(...)
#define MAYBE_UpdateDynamicPKPOnly DISABLED_...
#else
#define MAYBE_UpdateDynamicPKPOnly UpdateDynamicPKPOnly
#endif

TEST_F(HttpSecurityHeadersTest, MAYBE_UpdateDynamicPKPOnly)

(Example:
https://cs.chromium.org/chromium/src/net/nqe/network_quality_estimator_unitte...
or
https://cs.chromium.org/chromium/src/net/socket/udp_socket_unittest.cc?rcl=a2...
- in general, search for MAYBE_)


A lesser used pattern, which it applies to things like OS-wide behaviours or
build-flag behaviours, is an extra macro, such as

#if !BUILDFLAG(FOO)
#define DISABLED_IF_NOT_FOO(test) DISABLED_##test
#else
#define DISABLED_IF_NOT_FOO(test) test
#endif

(Example:
https://cs.chromium.org/chromium/src/net/websockets/websocket_end_to_end_test...
)

Finally, there's one last pattern - one which involves some process startup
overhead, but also works, which is to use a static function to hide the various
build flags, and then a helper method in tests which involve that.

(Example:
https://cs.chromium.org/chromium/src/net/url_request/url_request_unittest.cc?...
and
https://cs.chromium.org/chromium/src/net/url_request/url_request_unittest.cc?...
)

[xunjieli, 2017/07/10 22:20:39]

Done. Changed to MAYBE_ prefix. Thank you for the detailed list of examples.
This is very helpful. 

   TransportSecurityState state;
   TransportSecurityState::STSState static_sts_state;
   TransportSecurityState::PKPState static_pkp_state;
 
   // docs.google.com has preloaded pins.
   std::string domain = "docs.google.com";
   state.enable_static_pins_ = true;
   EXPECT_TRUE(
       state.GetStaticDomainState(domain, &static_sts_state, &static_pkp_state));
   EXPECT_GT(static_pkp_state.spki_hashes.size(), 1UL);
@@ skipping 48 matching lines @@
   EXPECT_EQ(2UL, new_dynamic_pkp_state.spki_hashes.size());
   EXPECT_EQ(report_uri, new_dynamic_pkp_state.report_uri);
 
   EXPECT_TRUE(
       base::ContainsValue(new_dynamic_pkp_state.spki_hashes, good_hash));
 
   EXPECT_TRUE(
       base::ContainsValue(new_dynamic_pkp_state.spki_hashes, backup_hash));
 }
 
+#if !BUILDFLAG(INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST)
+TEST_F(HttpSecurityHeadersTest, DISABLED_UpdateDynamicPKPMaxAge0) {
+#else
 TEST_F(HttpSecurityHeadersTest, UpdateDynamicPKPMaxAge0) {
+#endif
   TransportSecurityState state;
   TransportSecurityState::STSState static_sts_state;
   TransportSecurityState::PKPState static_pkp_state;
 
   // docs.google.com has preloaded pins.
   std::string domain = "docs.google.com";
   state.enable_static_pins_ = true;
   ASSERT_TRUE(
       state.GetStaticDomainState(domain, &static_sts_state, &static_pkp_state));
   EXPECT_GT(static_pkp_state.spki_hashes.size(), 1UL);
@@ skipping 57 matching lines @@
             state.CheckPublicKeyPins(
                 domain_port, is_issued_by_known_root,
                 new_static_pkp_state2.spki_hashes, nullptr, nullptr,
                 TransportSecurityState::DISABLE_PIN_REPORTS, &failure_log));
   EXPECT_NE(0UL, failure_log.length());
 }
 
 // Tests that when a static HSTS and a static HPKP entry are present, adding a
 // dynamic HSTS header does not clobber the static HPKP entry. Further, adding a
 // dynamic HPKP entry could not affect the HSTS entry for the site.
+#if !BUILDFLAG(INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST)
+TEST_F(HttpSecurityHeadersTest, DISABLED_NoClobberPins) {
+#else
 TEST_F(HttpSecurityHeadersTest, NoClobberPins) {
+#endif
   TransportSecurityState state;
   TransportSecurityState::STSState sts_state;
   TransportSecurityState::PKPState pkp_state;
 
   // accounts.google.com has preloaded pins.
   std::string domain = "accounts.google.com";
   state.enable_static_pins_ = true;
 
   // Retrieve the static STS and PKP states as it is by default, including its
   // known good pins.
@@ skipping 373 matching lines @@
   EXPECT_TRUE(ParseExpectCTHeader(
       "  max-age=999999999999999999999999999999999999999999999  ,"
       "  enforce   ",
       &max_age, &enforce, &report_uri));
   EXPECT_EQ(base::TimeDelta::FromSeconds(kMaxExpectCTAgeSecs), max_age);
   EXPECT_TRUE(enforce);
   EXPECT_TRUE(report_uri.is_empty());
 }
 
 }  // namespace net