Implement Expect-Staple

net/test/spawned_test_server/base_test_server.cc

Index: net/test/spawned_test_server/base_test_server.cc
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index bb4427ac451ff332763ce17821c0ebcd4c6596d9..4dfb525f146b4b8b7ee56987882f91782d90c2f5 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -208,6 +208,25 @@ std::string BaseTestServer::SSLOptions::GetOCSPArgument() const {
   }
 }
 
+std::string BaseTestServer::SSLOptions::GetOCSPDateArgument() const {
+  if (server_certificate != CERT_AUTO)
+    return std::string();
+
+  switch (ocsp_date) {
+    case OCSP_VALID:
+      return "valid";
+    case OCSP_OLD:
+      return "old";
+    case OCSP_YOUNG:
+      return "young";
+    case OCSP_LONG:
+      return "long";
+    default:
+      NOTREACHED();
+      return std::string();
+  }
+}
+
 const char BaseTestServer::kLocalhost[] = "127.0.0.1";
 
 BaseTestServer::BaseTestServer(Type type, const std::string& host)
@@ -524,6 +543,10 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
     if (!ocsp_arg.empty())
       arguments->SetString("ocsp", ocsp_arg);
 
+    std::string ocsp_date_arg = ssl_options_.GetOCSPDateArgument();
+    if (!ocsp_date_arg.empty())
+      arguments->SetString("ocsp-date", ocsp_date_arg);
+
     if (ssl_options_.cert_serial != 0) {
       arguments->SetInteger("cert-serial", ssl_options_.cert_serial);
     }