| 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 392a72be95d9555bd6fdacf4be9c5edf2d9aed01..e4055ce7dd51a6a684f0e9712bb7d2834fa26b74 100644
|
| --- a/net/test/spawned_test_server/base_test_server.h
|
| +++ b/net/test/spawned_test_server/base_test_server.h
|
| @@ -52,7 +52,6 @@ class BaseTestServer {
|
| // CERT_AUTO causes the testserver to generate a test certificate issued
|
| // by "Testing CA" (see net/data/ssl/certificates/ocsp-test-root.pem).
|
| CERT_AUTO,
|
| -
|
| CERT_MISMATCHED_NAME,
|
| CERT_EXPIRED,
|
| // Cross-signed certificate to test PKIX path building. Contains an
|
| @@ -78,9 +77,8 @@ class BaseTestServer {
|
| // Special value used to indicate that any algorithm the server supports
|
| // is acceptable. Preferred over explicitly OR-ing all key exchange
|
| // algorithms.
|
| - KEY_EXCHANGE_ANY = 0,
|
| -
|
| - KEY_EXCHANGE_RSA = (1 << 0),
|
| + KEY_EXCHANGE_ANY = 0,
|
| + KEY_EXCHANGE_RSA = (1 << 0),
|
| KEY_EXCHANGE_DHE_RSA = (1 << 1),
|
| };
|
|
|
| @@ -89,23 +87,22 @@ class BaseTestServer {
|
| enum BulkCipher {
|
| // Special value used to indicate that any algorithm the server supports
|
| // is acceptable. Preferred over explicitly OR-ing all ciphers.
|
| - BULK_CIPHER_ANY = 0,
|
| -
|
| - BULK_CIPHER_RC4 = (1 << 0),
|
| + BULK_CIPHER_ANY = 0,
|
| + BULK_CIPHER_RC4 = (1 << 0),
|
| BULK_CIPHER_AES128 = (1 << 1),
|
| BULK_CIPHER_AES256 = (1 << 2),
|
|
|
| // NOTE: 3DES support in the Python test server has external
|
| // dependencies and not be available on all machines. Clients may not
|
| // be able to connect if only 3DES is specified.
|
| - BULK_CIPHER_3DES = (1 << 3),
|
| + BULK_CIPHER_3DES = (1 << 3),
|
| };
|
|
|
| // NOTE: the values of these enumerators are passed to the the Python test
|
| // server. Do not change them.
|
| enum TLSIntolerantLevel {
|
| TLS_INTOLERANT_NONE = 0,
|
| - TLS_INTOLERANT_ALL = 1, // Intolerant of all TLS versions.
|
| + TLS_INTOLERANT_ALL = 1, // Intolerant of all TLS versions.
|
| TLS_INTOLERANT_TLS1_1 = 2, // Intolerant of TLS 1.1 or higher.
|
| TLS_INTOLERANT_TLS1_2 = 3, // Intolerant of TLS 1.2 or higher.
|
| };
|
| @@ -191,7 +188,7 @@ class BaseTestServer {
|
| static const char kLocalhost[];
|
|
|
| // Initialize a TestServer listening on a specific host (IP or hostname).
|
| - BaseTestServer(Type type, const std::string& host);
|
| + BaseTestServer(Type type, const std::string& host);
|
|
|
| // Initialize a TestServer with a specific set of SSLOptions for HTTPS or WSS.
|
| BaseTestServer(Type type, const SSLOptions& ssl_options);
|
| @@ -207,8 +204,7 @@ class BaseTestServer {
|
|
|
| GURL GetURL(const std::string& path) const;
|
|
|
| - GURL GetURLWithUser(const std::string& path,
|
| - const std::string& user) const;
|
| + GURL GetURLWithUser(const std::string& path, const std::string& user) const;
|
|
|
| GURL GetURLWithUserAndPassword(const std::string& path,
|
| const std::string& user,
|
| @@ -252,7 +248,7 @@ class BaseTestServer {
|
| // Generates a DictionaryValue with the arguments for launching the external
|
| // Python test server.
|
| bool GenerateArguments(base::DictionaryValue* arguments) const
|
| - WARN_UNUSED_RESULT;
|
| + WARN_UNUSED_RESULT;
|
|
|
| // Subclasses can override this to add arguments that are specific to their
|
| // own test servers.
|
|
|