Make HSTS headers not clobber preloaded pins.

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 104 matching lines @@
     expectEquals(QueryResultType.NOT_FOUND, this.queryResultType_);
     expectEquals('Not found', $(HSTSView.QUERY_OUTPUT_DIV_ID).innerText);
   },
 
   /**
    * Checks successful results.
    * @param {object} result Results from the query.
    */
   checkSuccess_: function(result) {
     expectEquals(QueryResultType.SUCCESS, this.queryResultType_);
-    expectEquals(this.stsSubdomains_, result.sts_subdomains);
-    expectEquals(this.pkpSubdomains_, result.pkp_subdomains);
-    expectLE(this.stsObserved_, result.sts_observed);
-    expectLE(this.pkpObserved_, result.pkp_observed);
+    expectEquals(this.stsSubdomains_, result.dynamic_sts_include_subdomains);
+    expectEquals(this.pkpSubdomains_, result.dynamic_pkp_include_subdomains);
+    expectLE(this.stsObserved_, result.dynamic_sts_observed);
+    expectLE(this.pkpObserved_, result.dynamic_pkp_observed);
 
     // |public_key_hashes| is an old synonym for what is now
     // |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')
@@ skipping 249 matching lines @@
                                   VALID_HASH, QueryResultType.SUCCESS));
   taskQueue.addTask(new DeleteTask('somewhere.com', QueryResultType.NOT_FOUND));
   taskQueue.addTask(new QueryTask('somewhereelse.com', true, true, now, now, '',
                                   QueryResultType.SUCCESS));
   taskQueue.addTask(new DeleteTask('somewhereelse.com',
                                    QueryResultType.NOT_FOUND));
   taskQueue.run(true);
 });
 
 })();  // Anonymous namespace