Distinguish STS observation times from PKP observation times.

chrome/test/data/webui/net_internals/hsts_view.js

Index: chrome/test/data/webui/net_internals/hsts_view.js
diff --git a/chrome/test/data/webui/net_internals/hsts_view.js b/chrome/test/data/webui/net_internals/hsts_view.js
index 56e4bf88787b680e02efec63abdb2b686f095558..29e5ebfea513ba2a9c48f0b2081519bf8e0b8492 100644
--- a/chrome/test/data/webui/net_internals/hsts_view.js
+++ b/chrome/test/data/webui/net_internals/hsts_view.js
@@ -40,6 +40,8 @@ var QueryResultType = {
  * @param {bool} pkpSubdomains Whether or not the pkpSubdomains flag is expected
  *     to be set in the returned results.  Ignored on error and not found
  *     results.
+ * @param {number} stsObserved The time the STS policy was observed.
+ * @param {number} pkpObserved The time the PKP policy was observed.
  * @param {string} publicKeyHashes Expected public key hashes.  Ignored on error
  *     error and not found results.
  * @param {QueryResultType} queryResultType The expected result type of the
@@ -47,10 +49,13 @@ var QueryResultType = {
  * @extends {NetInternalsTest.Task}
  */
 function CheckQueryResultTask(domain, stsSubdomains, pkpSubdomains,
-                              publicKeyHashes, queryResultType) {
+                              stsObserved, pkpObserved, publicKeyHashes,
+                              queryResultType) {
   this.domain_ = domain;
   this.stsSubdomains_ = stsSubdomains;
   this.pkpSubdomains_ = pkpSubdomains;
+  this.stsObserved_ = stsObserved;
+  this.pkpObserved_ = pkpObserved;
   this.publicKeyHashes_ = publicKeyHashes;
   this.queryResultType_ = queryResultType;
   NetInternalsTest.Task.call(this);
@@ -119,6 +124,8 @@ CheckQueryResultTask.prototype = {
     expectEquals(QueryResultType.SUCCESS, this.queryResultType_);
     expectEquals(this.stsSubdomains_, result.sts_subdomains);
     expectEquals(this.pkpSubdomains_, result.pkp_subdomains);
+    expectEquals(this.stsObserved_, result.sts_observed);
+    expectEquals(this.pkpObserved_, result.pkp_observed);
 
     // |public_key_hashes| is an old synonym for what is now
     // |preloaded_spki_hashes|, which in turn is a legacy synonym for
@@ -162,6 +169,8 @@ CheckQueryResultTask.prototype = {
  * @param {bool} pkpSubdomains Whether the pinning subdomain checkbox should be
  *     selected. Also the corresponding expected return value, in the success
  *     case.
+ * @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.
@@ -169,12 +178,13 @@ CheckQueryResultTask.prototype = {
  * @extends {CheckQueryResultTask}
  */
 function AddTask(domain, stsSubdomains, pkpSubdomains, publicKeyHashes,
-                 queryResultType) {
+                 stsObserved, pkpObserved, queryResultType) {
   this.requestedPublicKeyHashes_ = publicKeyHashes;
   if (publicKeyHashes == INVALID_HASH)
     publicKeyHashes = '';
   CheckQueryResultTask.call(this, domain, stsSubdomains, pkpSubdomains,
-                            publicKeyHashes, queryResultType);
+                            stsObserved, pkpObserved, publicKeyHashes,
+                            queryResultType);
 }
 
 AddTask.prototype = {
@@ -200,10 +210,11 @@ AddTask.prototype = {
  * query.
  * @extends {CheckQueryResultTask}
  */
-function QueryTask(domain, stsSubdomains, pkpSubdomains, publicKeyHashes,
-                   queryResultType) {
+function QueryTask(domain, stsSubdomains, pkpSubdomains, stsObserved,
+                   pkpObserved, publicKeyHashes, queryResultType) {
   CheckQueryResultTask.call(this, domain, stsSubdomains, pkpSubdomains,
-                            publicKeyHashes, queryResultType);
+                            stsObserved, pkpObserved, publicKeyHashes,
+                            queryResultType);
 }
 
 QueryTask.prototype = {