Refactor TransportSecurityState.

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 981 matching lines @@
 
   if (!IsStringASCII(domain)) {
     result->SetString("error", "non-ASCII domain name");
   } else {
     net::TransportSecurityState* transport_security_state =
         context_getter_->GetURLRequestContext()->transport_security_state();
     if (!transport_security_state) {
       result->SetString("error", "no TransportSecurityState active");
     } else {
       net::TransportSecurityState::DomainState state;
-      const bool found = transport_security_state->HasMetadata(
-          &state, domain, true);
+      const bool found = transport_security_state->GetDomainState(
+          domain, true, &state);
 
       result->SetBoolean("result", found);
       if (found) {
-        result->SetInteger("mode", static_cast<int>(state.mode));
+        result->SetInteger("mode", static_cast<int>(state.upgrade_mode));
         result->SetBoolean("subdomains", state.include_subdomains);
-        result->SetBoolean("preloaded", state.preloaded);
+        // TODO(palmer): result->SetBoolean("preloaded", state.preloaded);

[eroman, 2012/03/23 21:34:29]

Please add a bug association.

[palmer, 2012/03/23 22:49:04]

Actually I got rid of the TODO, it was a previous note to myself that shouldn't
have been gcl uploaded for review.

         result->SetString("domain", state.domain);
-        result->SetDouble("expiry", state.expiry.ToDoubleT());
+        result->SetDouble("expiry", state.upgrade_expiry.ToDoubleT());
         result->SetDouble("dynamic_spki_hashes_expiry",
                           state.dynamic_spki_hashes_expiry.ToDoubleT());
 
         std::string hashes;
-        SPKIHashesToString(state.preloaded_spki_hashes, &hashes);
+        SPKIHashesToString(state.static_spki_hashes, &hashes);
         result->SetString("preloaded_spki_hashes", hashes);

[eroman, 2012/03/23 21:34:29]

Consider renaming it in the javascript too for consistency.

[palmer, 2012/03/23 22:49:04]

Done.

 
         hashes.clear();
         SPKIHashesToString(state.dynamic_spki_hashes, &hashes);
         result->SetString("dynamic_spki_hashes", hashes);
       }
     }
   }
 
   SendJavascriptCommand("receivedHSTSResult", result);
 }
@@ skipping 12 matching lines @@
   CHECK(list->GetBoolean(1, &include_subdomains));
   std::string hashes_str;
   CHECK(list->GetString(2, &hashes_str));
 
   net::TransportSecurityState* transport_security_state =
       context_getter_->GetURLRequestContext()->transport_security_state();
   if (!transport_security_state)
     return;
 
   net::TransportSecurityState::DomainState state;
-  state.expiry = state.created + base::TimeDelta::FromDays(1000);
+  state.upgrade_expiry = state.created + base::TimeDelta::FromDays(1000);
   state.include_subdomains = include_subdomains;
   if (!hashes_str.empty()) {
     std::vector<std::string> type_and_b64s;
     base::SplitString(hashes_str, ',', &type_and_b64s);
     for (std::vector<std::string>::const_iterator
          i = type_and_b64s.begin(); i != type_and_b64s.end(); i++) {
       std::string type_and_b64;
       RemoveChars(*i, " \t\r\n", &type_and_b64);
       net::SHA1Fingerprint hash;
       if (!net::TransportSecurityState::ParsePin(type_and_b64, &hash))
@@ skipping 521 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);
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateNetInternalsHTMLSource());
 }