Revert of Extract Certificate Transparency SCTs from stapled OCSP responses

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 ac37c70d21cb21c348451b7675ac748578f4cda0..3b06a0ae2e8e045f392f74a6a00a8324d6ba0467 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -61,8 +61,7 @@
       bulk_ciphers(SSLOptions::BULK_CIPHER_ANY),
       record_resume(false),
       tls_intolerant(TLS_INTOLERANT_NONE),
-      fallback_scsv_enabled(false),
-      staple_ocsp_response(false) {}
+      fallback_scsv_enabled(false) {}
 
 BaseTestServer::SSLOptions::SSLOptions(
     BaseTestServer::SSLOptions::ServerCertificate cert)
@@ -73,8 +72,7 @@
       bulk_ciphers(SSLOptions::BULK_CIPHER_ANY),
       record_resume(false),
       tls_intolerant(TLS_INTOLERANT_NONE),
-      fallback_scsv_enabled(false),
-      staple_ocsp_response(false) {}
+      fallback_scsv_enabled(false) {}
 
 BaseTestServer::SSLOptions::~SSLOptions() {}
 
@@ -402,14 +400,11 @@
     }
     if (ssl_options_.fallback_scsv_enabled)
       arguments->Set("fallback-scsv", base::Value::CreateNullValue());
-    if (!ssl_options_.signed_cert_timestamps_tls_ext.empty()) {
-      std::string b64_scts_tls_ext;
-      base::Base64Encode(ssl_options_.signed_cert_timestamps_tls_ext,
-                         &b64_scts_tls_ext);
-      arguments->SetString("signed-cert-timestamps-tls-ext", b64_scts_tls_ext);
-    }
-    if (ssl_options_.staple_ocsp_response)
-      arguments->Set("staple-ocsp-response", base::Value::CreateNullValue());
+    if (!ssl_options_.signed_cert_timestamps.empty()) {
+      std::string b64_scts;
+      base::Base64Encode(ssl_options_.signed_cert_timestamps, &b64_scts);
+      arguments->SetString("signed-cert-timestamps", b64_scts);
+    }
   }
 
   return GenerateAdditionalArguments(arguments);