Refactor TransportSecurityState.

chrome/test/data/webui/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.
 
 // Include test fixture.
 GEN_INCLUDE(['net_internals_test.js']);
 
 // Anonymous namespace
 (function() {
 
@@ skipping 97 matching lines @@
 
   /**
    * Checks successful results.
    * @param {object} result Results from the query.
    */
   checkSuccess_: function(result) {
     expectEquals(QueryResultType.SUCCESS, this.queryResultType_);
     expectEquals(this.subdomains_, result.subdomains);
 
     // |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);
 
-    expectEquals(this.publicKeyHashes_, hashes.join(","));
+    expectEquals(this.publicKeyHashes_, hashes.join(','));
 
     // Verify that the domain appears somewhere in the displayed text.
     outputText = $(HSTSView.QUERY_OUTPUT_DIV_ID).innerText;
     expectLE(0, outputText.search(this.domain_));
   }
 };
 
 /**
  * A Task to try and add an HSTS domain via the HTML form.  The task will wait
  * until the results from the automatically sent query have been received, and
@@ skipping 200 matching lines @@
                                   QueryResultType.SUCCESS));
   taskQueue.addTask(new DeleteTask('somewhere.com', QueryResultType.NOT_FOUND));
   taskQueue.addTask(new QueryTask('somewhereelse.com', true, '',
                                   QueryResultType.SUCCESS));
   taskQueue.addTask(new DeleteTask('somewhereelse.com',
                                    QueryResultType.NOT_FOUND));
   taskQueue.run(true);
 });
 
 })();  // Anonymous namespace