Make HSTS headers not clobber preloaded pins.

chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index ea9f625ef533d0379b85f51baa1c427bcc9a9680..5772f6b4bc39d142e5c28d115ddb84405bdaae7f 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -1234,20 +1234,46 @@ void NetInternalsMessageHandler::IOThreadImpl::OnHSTSQuery(
 
       result->SetBoolean("result", found);
       if (found) {
-        result->SetInteger("mode", static_cast<int>(state.upgrade_mode));
-        result->SetBoolean("sts_subdomains", state.sts_include_subdomains);
-        result->SetBoolean("pkp_subdomains", state.pkp_include_subdomains);
-        result->SetDouble("sts_observed", state.sts_observed.ToDoubleT());
-        result->SetDouble("pkp_observed", state.pkp_observed.ToDoubleT());
-        result->SetString("domain", state.domain);
-        result->SetDouble("expiry", state.upgrade_expiry.ToDoubleT());
-        result->SetDouble("dynamic_spki_hashes_expiry",
-                          state.dynamic_spki_hashes_expiry.ToDoubleT());
-
-        result->SetString("static_spki_hashes",
-                          HashesToBase64String(state.static_spki_hashes));
+        result->SetBoolean("has_static_sts", state.has_static_sts);
+        if (state.has_static_sts) {
+          result->SetInteger("static_upgrade_mode",
+                             static_cast<int>(state.static_sts.upgrade_mode));
+          result->SetBoolean("static_sts_include_subdomains",
+                             state.static_sts.include_subdomains);
+          result->SetDouble("static_sts_observed",
+                            state.static_sts.last_observed.ToDoubleT());
+          result->SetDouble("static_sts_expiry",
+                            state.static_sts.expiry.ToDoubleT());
+        }
+        result->SetBoolean("has_static_pkp", state.has_static_pkp);
+        if (state.has_static_pkp) {
+          result->SetBoolean("static_pkp_include_subdomains",
+                             state.static_pkp.include_subdomains);
+          result->SetDouble("static_pkp_observed",
+                            state.static_pkp.last_observed.ToDoubleT());
+          result->SetDouble("static_pkp_expiry",
+                            state.static_pkp.expiry.ToDoubleT());
+          result->SetString("static_spki_hashes",
+                            HashesToBase64String(state.static_pkp.spki_hashes));
+        }
+        result->SetInteger("dynamic_upgrade_mode",
+                           static_cast<int>(state.dynamic_sts.upgrade_mode));
+        result->SetBoolean("dynamic_sts_include_subdomains",
+                           state.dynamic_sts.include_subdomains);
+        result->SetBoolean("dynamic_pkp_include_subdomains",
+                           state.dynamic_pkp.include_subdomains);
+        result->SetDouble("dynamic_sts_observed",
+                          state.dynamic_sts.last_observed.ToDoubleT());
+        result->SetDouble("dynamic_pkp_observed",
+                          state.dynamic_pkp.last_observed.ToDoubleT());
+        result->SetDouble("dynamic_sts_expiry",
+                          state.dynamic_sts.expiry.ToDoubleT());
+        result->SetDouble("dynamic_pkp_expiry",
+                          state.dynamic_pkp.expiry.ToDoubleT());
         result->SetString("dynamic_spki_hashes",
-                          HashesToBase64String(state.dynamic_spki_hashes));
+                          HashesToBase64String(state.dynamic_pkp.spki_hashes));
+
+        result->SetString("domain", state.domain);
       }
     }
   }