| Index: jingle/notifier/base/chrome_async_socket_unittest.cc
|
| diff --git a/jingle/notifier/base/chrome_async_socket_unittest.cc b/jingle/notifier/base/chrome_async_socket_unittest.cc
|
| index f834d9d76a0ffce643edbeaa61df26f0c7414e12..6e62eb127fdd55b819e83054528bf4a7f0d01838 100644
|
| --- a/jingle/notifier/base/chrome_async_socket_unittest.cc
|
| +++ b/jingle/notifier/base/chrome_async_socket_unittest.cc
|
| @@ -18,10 +18,8 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop.h"
|
| #include "jingle/notifier/base/resolving_client_socket_factory.h"
|
| -#include "net/base/capturing_net_log.h"
|
| #include "net/base/cert_verifier.h"
|
| #include "net/base/net_errors.h"
|
| -#include "net/base/net_log.h"
|
| #include "net/base/ssl_config_service.h"
|
| #include "net/socket/socket_test_util.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| @@ -131,9 +129,9 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
|
|
|
| // ResolvingClientSocketFactory implementation.
|
| virtual net::StreamSocket* CreateTransportClientSocket(
|
| - const net::HostPortPair& host_and_port, net::NetLog* net_log) {
|
| + const net::HostPortPair& host_and_port) {
|
| return mock_client_socket_factory_->CreateTransportClientSocket(
|
| - address_list_, net_log, net::NetLog::Source());
|
| + address_list_, NULL, net::NetLog::Source());
|
| }
|
|
|
| virtual net::SSLClientSocket* CreateSSLClientSocket(
|
| @@ -157,7 +155,6 @@ class ChromeAsyncSocketTest
|
| protected:
|
| ChromeAsyncSocketTest()
|
| : ssl_socket_data_provider_(true, net::OK),
|
| - capturing_net_log_(net::CapturingNetLog::kUnbounded),
|
| addr_(0xaabbccdd, 35) {}
|
|
|
| virtual ~ChromeAsyncSocketTest() {}
|
| @@ -176,8 +173,7 @@ class ChromeAsyncSocketTest
|
| SocketAddressToAddressList(addr_)));
|
| chrome_async_socket_.reset(
|
| new ChromeAsyncSocket(mock_xmpp_client_socket_factory.release(),
|
| - 14, 20,
|
| - &capturing_net_log_)),
|
| + 14, 20)),
|
|
|
| chrome_async_socket_->SignalConnected.connect(
|
| this, &ChromeAsyncSocketTest::OnConnect);
|
| @@ -431,7 +427,6 @@ class ChromeAsyncSocketTest
|
| AsyncSocketDataProvider async_socket_data_provider_;
|
| net::SSLSocketDataProvider ssl_socket_data_provider_;
|
|
|
| - net::CapturingNetLog capturing_net_log_;
|
| scoped_ptr<ChromeAsyncSocket> chrome_async_socket_;
|
| std::deque<SignalSocketState> signal_socket_states_;
|
| const talk_base::SocketAddress addr_;
|
|
|