Reland 'Require ECDHE for False Start.'

net/test/spawned_test_server/base_test_server.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
 #define NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 61 matching lines @@
       OCSP_UNAUTHORIZED,
       OCSP_UNKNOWN,
     };
 
     // Bitmask of key exchange algorithms that the test server supports and that
     // can be selectively enabled or disabled.
     enum KeyExchange {
       // 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_ANY = 0,
 
-      KEY_EXCHANGE_RSA     = (1 << 0),
+      KEY_EXCHANGE_RSA = (1 << 0),
       KEY_EXCHANGE_DHE_RSA = (1 << 1),
+      KEY_EXCHANGE_ECDHE_RSA = (1 << 2),
     };
 
     // Bitmask of bulk encryption algorithms that the test server supports
     // and that can be selectively enabled or disabled.
     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),
@@ skipping 231 matching lines @@
   bool ws_basic_auth_;
 
   scoped_ptr<ScopedPortException> allowed_port_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseTestServer);
 };
 
 }  // namespace net
 
 #endif  // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_