Add a build flag to configure bundling of HSTS preload list

net/http/http_security_headers_unittest.cc

Index: net/http/http_security_headers_unittest.cc
diff --git a/net/http/http_security_headers_unittest.cc b/net/http/http_security_headers_unittest.cc
index 7f1148a170979031440bfff7f94126fa172754e1..fc26a3a64c7b6d9f85604e29884314a3eec8e65f 100644
--- a/net/http/http_security_headers_unittest.cc
+++ b/net/http/http_security_headers_unittest.cc
@@ -652,7 +652,11 @@ 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;
@@ -721,7 +725,11 @@ TEST_F(HttpSecurityHeadersTest, UpdateDynamicPKPOnly) {
       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;
@@ -799,7 +807,11 @@ TEST_F(HttpSecurityHeadersTest, UpdateDynamicPKPMaxAge0) {
 // 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;