Refactor TransportSecurityState.

chrome/browser/resources/net_internals/hsts_view.js

 // 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.
 
 /**
  * HSTS is HTTPS Strict Transport Security: a way for sites to elect to always
  * use HTTPS. See http://dev.chromium.org/sts
  *
  * This UI allows a user to query and update the browser's list of HSTS domains.
  * It also allows users to query and update the browser's list of public key
@@ skipping 116 matching lines @@
       t.textContent = result.domain;
 
       addTextNode(this.queryOutputDiv_, ' is_preloaded:');
 
       t = addNode(this.queryOutputDiv_, 'tt');
       t.textContent = result.preloaded;
 
       addTextNode(this.queryOutputDiv_, ' pubkey_hashes:');
 
       t = addNode(this.queryOutputDiv_, 'tt');
+
       // |public_key_hashes| is an old synonym for what is now
-      // |preloaded_spki_hashes|. Look for both, and also for
+      // |preloaded_spki_hashes|, which in turn is a legacy synonym for
+      // |static_spki_hashes|. Look for all three, and also for
       // |dynamic_spki_hashes|.
       if (typeof result.public_key_hashes === 'undefined')
         result.public_key_hashes = '';
       if (typeof result.preloaded_spki_hashes === 'undefined')
         result.preloaded_spki_hashes = '';
+      if (typeof result.static_spki_hashes === 'undefined')
+        result.static_spki_hashes = '';
       if (typeof result.dynamic_spki_hashes === 'undefined')
         result.dynamic_spki_hashes = '';
 
       var hashes = [];
       if (result.public_key_hashes)
         hashes.push(result.public_key_hashes);
       if (result.preloaded_spki_hashes)
         hashes.push(result.preloaded_spki_hashes);
+      if (result.static_spki_hashes)
+        hashes.push(result.static_spki_hashes);
       if (result.dynamic_spki_hashes)
         hashes.push(result.dynamic_spki_hashes);
 
       t.textContent = hashes.join(',');
       yellowFade(this.queryOutputDiv_);
     }
   };
 
   function modeToString(m) {
+    // These numbers must match those in
+    // TransportSecurityState::DomainState::UpgradeMode.
     if (m == 0) {
       return 'STRICT';
     } else if (m == 1) {
       return 'OPPORTUNISTIC';
-    } else if (m == 2) {
-      return 'SPDY';
-    } else if (m == 3) {
-      return 'NONE';
     } else {
       return 'UNKNOWN';
     }
   }
 
   function yellowFade(element) {
     element.style.webkitTransitionProperty = 'background-color';
     element.style.webkitTransitionDuration = '0';
     element.style.backgroundColor = '#fffccf';
     setTimeout(function() {
       element.style.webkitTransitionDuration = '1000ms';
       element.style.backgroundColor = '#fff';
     }, 0);
   }
 
   return HSTSView;
 })();