| Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/net_internals/net_internals_ui.cc (revision 155029)
|
| +++ chrome/browser/ui/webui/net_internals/net_internals_ui.cc (working copy)
|
| @@ -1082,18 +1082,18 @@
|
| connection_tester_->RunAllTests(url);
|
| }
|
|
|
| -void SPKIHashesToString(const net::FingerprintVector& hashes,
|
| +void SPKIHashesToString(const net::HashValueVector& hashes,
|
| std::string* string) {
|
| - for (net::FingerprintVector::const_iterator
|
| + for (net::HashValueVector::const_iterator
|
| i = hashes.begin(); i != hashes.end(); ++i) {
|
| - base::StringPiece hash_str(reinterpret_cast<const char*>(i->data),
|
| - arraysize(i->data));
|
| + base::StringPiece hash_str(reinterpret_cast<const char*>(i->data()),
|
| + i->size());
|
| std::string encoded;
|
| base::Base64Encode(hash_str, &encoded);
|
|
|
| if (i != hashes.begin())
|
| *string += ",";
|
| - *string += "sha1/" + encoded;
|
| + *string += net::TransportSecurityState::HashValueLabel(*i) + encoded;
|
| }
|
| }
|
|
|
| @@ -1169,7 +1169,7 @@
|
| 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;
|
| + net::HashValue hash;
|
| if (!net::TransportSecurityState::ParsePin(type_and_b64, &hash))
|
| continue;
|
|
|
|
|