Implement Expect-Staple

net/test/spawned_test_server/base_test_server.h

Index: net/test/spawned_test_server/base_test_server.h
diff --git a/net/test/spawned_test_server/base_test_server.h b/net/test/spawned_test_server/base_test_server.h
index 48568010f65577a07c24b369a5bfda14618e300a..442a2da5e4c454fdd0d8730f0bedba4fde6f6e75 100644
--- a/net/test/spawned_test_server/base_test_server.h
+++ b/net/test/spawned_test_server/base_test_server.h
@@ -86,6 +86,15 @@ class BaseTestServer {
       OCSP_UNKNOWN,
     };
 
+    // OCSPDate enumerates the date ranges for OCSP responses that the
+    // testserver can produce
+    enum OCSPDate {
+      OCSP_VALID,
+      OCSP_OLD,
+      OCSP_YOUNG,
+      OCSP_LONG,
+    };

[Ryan Sleevi, 2016/06/23 22:11:53]

Document

+
     // Bitmask of key exchange algorithms that the test server supports and that
     // can be selectively enabled or disabled.
     enum KeyExchange {
@@ -151,6 +160,10 @@ class BaseTestServer {
     // the empty string if there is none.
     std::string GetOCSPArgument() const;
 
+    // GetOCSPArgument returns the value of the OCSP date argument to testserver
+    // or the empty string if there is none.
+    std::string GetOCSPDateArgument() const;
+
     // The certificate to use when serving requests.
     ServerCertificate server_certificate;
 
@@ -158,6 +171,10 @@ class BaseTestServer {
     // response returned.
     OCSPStatus ocsp_status;
 
+    // If |server_certificate==CERT_AUTO| then this determines the date range
+    // set on the OCSP response returned.
+    OCSPDate ocsp_date;
+
     // If not zero, |cert_serial| will be the serial number of the
     // auto-generated leaf certificate when |server_certificate==CERT_AUTO|.
     uint64_t cert_serial;