Treat HSTS and HPKP state independently.

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 151 matching lines @@
 /**
  * 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
  * then checks them against the expected values.
  * @param {string} domain The domain to send and expected to be returned.
  * @param {bool} stsSubdomains Whether the HSTS subdomain checkbox should be
  *     selected. Also the corresponding expected return value, in the success
  *     case.
  * @param {bool} pkpSubdomains Whether the pinning subdomain checkbox should be
  *     selected. Also the corresponding expected return value, in the success
- *     case.
+ *     case. When publicKeyHashes is INVALID_HASH, the expected return value
+ *     is false.
  * @param {number} stsObserved The time the STS policy was observed.
  * @param {number} pkpObserved The time the PKP policy was observed.
  * @param {string} publicKeyHashes Public key hash to send.  Also the
  *     corresponding expected return value, on success.  When this is the string
  *     INVALID_HASH, an empty string is expected to be received instead.
  * @param {QueryResultType} queryResultType Expected result type.
  * @extends {CheckQueryResultTask}
  */
 function AddTask(domain, stsSubdomains, pkpSubdomains, publicKeyHashes,
                  stsObserved, pkpObserved, queryResultType) {
   this.requestedPublicKeyHashes_ = publicKeyHashes;
-  if (publicKeyHashes == INVALID_HASH)
+  this.requestedPkpSubdomains_ = pkpSubdomains;
+  if (publicKeyHashes == INVALID_HASH) {
+    pkpSubdomains = false;
     publicKeyHashes = '';
+  }
   CheckQueryResultTask.call(this, domain, stsSubdomains, pkpSubdomains,
                             stsObserved, pkpObserved, publicKeyHashes,
                             queryResultType);
 }
 
 AddTask.prototype = {
   __proto__: CheckQueryResultTask.prototype,
 
   /**
    * Fills out the add form, simulates a click to submit it, and starts
    * listening for the results of the query that is automatically submitted.
    */
   start: function() {
     $(HSTSView.ADD_INPUT_ID).value = this.domain_;
     $(HSTSView.ADD_STS_CHECK_ID).checked = this.stsSubdomains_;
-    $(HSTSView.ADD_PKP_CHECK_ID).checked = this.pkpSubdomains_;
+    $(HSTSView.ADD_PKP_CHECK_ID).checked = this.requestedPkpSubdomains_;
     $(HSTSView.ADD_PINS_ID).value = this.requestedPublicKeyHashes_;
     $(HSTSView.ADD_SUBMIT_ID).click();
     CheckQueryResultTask.prototype.start.call(this);
   }
 };
 
 /**
  * A Task to query a domain and wait for the results.  Parameters mirror those
  * of CheckQueryResultTask, except |domain| is also the name of the domain to
  * query.
@@ skipping 164 matching lines @@
  * Adds two different domains and then deletes them.
  */
 TEST_F('NetInternalsTest', 'netInternalsHSTSViewAddTwice', function() {
   NetInternalsTest.switchToView('hsts');
   taskQueue = new NetInternalsTest.TaskQueue(true);
   var now = new Date().getTime() / 1000.0;
   taskQueue.addTask(new AddTask('somewhere.com', false, false, VALID_HASH,
                                 now, now, QueryResultType.SUCCESS));
   taskQueue.addTask(new QueryTask('somewhereelse.com', false, false, now, now,
                                   '', QueryResultType.NOT_FOUND));
-  taskQueue.addTask(new AddTask('somewhereelse.com', true, true, '',
+  taskQueue.addTask(new AddTask('somewhereelse.com', true, false, '',
                                 now, now, QueryResultType.SUCCESS));
   taskQueue.addTask(new QueryTask('somewhere.com', false, false, now, now,
                                   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 QueryTask('somewhereelse.com', true, false, now, now,
+                                  '', QueryResultType.SUCCESS));
   taskQueue.addTask(new DeleteTask('somewhereelse.com',
                                    QueryResultType.NOT_FOUND));
   taskQueue.run(true);
 });
 
 })();  // Anonymous namespace