Treat HSTS and HPKP state independently.

chrome/browser/ui/webui/net_internals/net_internals_ui.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 "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
 
 #include <algorithm>
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 800 matching lines @@
         result->SetBoolean("has_static_pkp",
                            found_static && static_state.HasPublicKeyPins());
         result->SetBoolean("static_pkp_include_subdomains",
                            static_state.pkp.include_subdomains);
         result->SetDouble("static_pkp_observed",
                           static_state.pkp.last_observed.ToDoubleT());
         result->SetDouble("static_pkp_expiry",
                           static_state.pkp.expiry.ToDoubleT());
         result->SetString("static_spki_hashes",
                           HashesToBase64String(static_state.pkp.spki_hashes));
+        result->SetString("static_sts_domain", static_state.sts.domain);
+        result->SetString("static_pkp_domain", static_state.pkp.domain);
       }
 
       net::TransportSecurityState::DomainState dynamic_state;
       const bool found_dynamic =
           transport_security_state->GetDynamicDomainState(domain,
                                                           &dynamic_state);
       if (found_dynamic) {
         result->SetInteger("dynamic_upgrade_mode",
                            static_cast<int>(dynamic_state.sts.upgrade_mode));
         result->SetBoolean("dynamic_sts_include_subdomains",
                            dynamic_state.sts.include_subdomains);
         result->SetBoolean("dynamic_pkp_include_subdomains",
                            dynamic_state.pkp.include_subdomains);
         result->SetDouble("dynamic_sts_observed",
                           dynamic_state.sts.last_observed.ToDoubleT());
         result->SetDouble("dynamic_pkp_observed",
                           dynamic_state.pkp.last_observed.ToDoubleT());
         result->SetDouble("dynamic_sts_expiry",
                           dynamic_state.sts.expiry.ToDoubleT());
         result->SetDouble("dynamic_pkp_expiry",
                           dynamic_state.pkp.expiry.ToDoubleT());
         result->SetString("dynamic_spki_hashes",
                           HashesToBase64String(dynamic_state.pkp.spki_hashes));
+        result->SetString("dynamic_sts_domain", dynamic_state.sts.domain);
+        result->SetString("dynamic_pkp_domain", dynamic_state.pkp.domain);
       }
 
       result->SetBoolean("result", found_static || found_dynamic);
-      if (found_static) {
-        result->SetString("domain", static_state.domain);
-      } else if (found_dynamic) {
-        result->SetString("domain", dynamic_state.domain);
-      } else {
-        result->SetString("domain", domain);
-      }
     }
   }
 
   SendJavascriptCommand("receivedHSTSResult", result);
 }
 
 void NetInternalsMessageHandler::IOThreadImpl::OnHSTSAdd(
     const base::ListValue* list) {
   // |list| should be: [<domain to query>, <STS include subdomains>, <PKP
   // include subdomains>, <key pins>].
@@ skipping 414 matching lines @@
 }
 
 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new NetInternalsMessageHandler());
 
   // Set up the chrome://net-internals/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource());
 }