diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/net/socket/ssl_server_socket_unittest.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/net/socket/ssl_server_socket_unittest.cc')
| -rw-r--r-- | chromium/net/socket/ssl_server_socket_unittest.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chromium/net/socket/ssl_server_socket_unittest.cc b/chromium/net/socket/ssl_server_socket_unittest.cc index e1f7f496131..d5d04b20a90 100644 --- a/chromium/net/socket/ssl_server_socket_unittest.cc +++ b/chromium/net/socket/ssl_server_socket_unittest.cc @@ -56,9 +56,9 @@ class FakeDataChannel { public: FakeDataChannel() : read_buf_len_(0), - weak_factory_(this), closed_(false), - write_called_after_close_(false) { + write_called_after_close_(false), + weak_factory_(this) { } int Read(IOBuffer* buf, int buf_len, const CompletionCallback& callback) { @@ -140,8 +140,6 @@ class FakeDataChannel { std::queue<scoped_refptr<net::DrainableIOBuffer> > data_; - base::WeakPtrFactory<FakeDataChannel> weak_factory_; - // True if Close() has been called. bool closed_; @@ -150,6 +148,8 @@ class FakeDataChannel { // asynchronously. bool write_called_after_close_; + base::WeakPtrFactory<FakeDataChannel> weak_factory_; + DISALLOW_COPY_AND_ASSIGN(FakeDataChannel); }; @@ -334,8 +334,6 @@ class SSLServerSocketTest : public PlatformTest { ssl_config.cached_info_enabled = false; ssl_config.false_start_enabled = false; ssl_config.channel_id_enabled = false; - ssl_config.version_min = SSL_PROTOCOL_VERSION_SSL3; - ssl_config.version_max = SSL_PROTOCOL_VERSION_TLS1_1; // Certificate provided by the host doesn't need authority. net::SSLConfig::CertAndStatus cert_and_status; |