diff options
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/channel_socket_adapter_unittest.cc | 5 | ||||
| -rw-r--r-- | jingle/glue/chrome_async_socket.cc | 2 | ||||
| -rw-r--r-- | jingle/glue/fake_network_manager.cc | 2 | ||||
| -rw-r--r-- | jingle/glue/proxy_resolving_client_socket.cc | 10 | ||||
| -rw-r--r-- | jingle/glue/pseudotcp_adapter.cc | 2 | ||||
| -rw-r--r-- | jingle/glue/task_pump.cc | 2 | ||||
| -rw-r--r-- | jingle/notifier/base/weak_xmpp_client.cc | 2 | ||||
| -rw-r--r-- | jingle/notifier/listener/non_blocking_push_client.cc | 2 |
8 files changed, 13 insertions, 14 deletions
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc index d90cbca..e0ed566 100644 --- a/jingle/glue/channel_socket_adapter_unittest.cc +++ b/jingle/glue/channel_socket_adapter_unittest.cc @@ -43,9 +43,8 @@ class MockTransportChannel : public cricket::TransportChannel { class TransportChannelSocketAdapterTest : public testing::Test { public: TransportChannelSocketAdapterTest() - : ALLOW_THIS_IN_INITIALIZER_LIST( - callback_(base::Bind(&TransportChannelSocketAdapterTest::Callback, - base::Unretained(this)))), + : callback_(base::Bind(&TransportChannelSocketAdapterTest::Callback, + base::Unretained(this))), callback_result_(0) { } diff --git a/jingle/glue/chrome_async_socket.cc b/jingle/glue/chrome_async_socket.cc index 5dc8bb1..b92972f 100644 --- a/jingle/glue/chrome_async_socket.cc +++ b/jingle/glue/chrome_async_socket.cc @@ -30,7 +30,7 @@ ChromeAsyncSocket::ChromeAsyncSocket( ResolvingClientSocketFactory* resolving_client_socket_factory, size_t read_buf_size, size_t write_buf_size) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + : weak_ptr_factory_(this), resolving_client_socket_factory_(resolving_client_socket_factory), state_(STATE_CLOSED), error_(ERROR_NONE), diff --git a/jingle/glue/fake_network_manager.cc b/jingle/glue/fake_network_manager.cc index 7884301..3a3e0f0 100644 --- a/jingle/glue/fake_network_manager.cc +++ b/jingle/glue/fake_network_manager.cc @@ -15,7 +15,7 @@ namespace jingle_glue { FakeNetworkManager::FakeNetworkManager(const net::IPAddressNumber& address) : started_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { net::IPEndPoint endpoint(address, 0); talk_base::SocketAddress socket_address; CHECK(IPEndPointToSocketAddress(endpoint, &socket_address)); diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc index a1e987a..07c404e 100644 --- a/jingle/glue/proxy_resolving_client_socket.cc +++ b/jingle/glue/proxy_resolving_client_socket.cc @@ -24,12 +24,12 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket( const scoped_refptr<net::URLRequestContextGetter>& request_context_getter, const net::SSLConfig& ssl_config, const net::HostPortPair& dest_host_port_pair) - : ALLOW_THIS_IN_INITIALIZER_LIST(proxy_resolve_callback_( + : proxy_resolve_callback_( base::Bind(&ProxyResolvingClientSocket::ProcessProxyResolveDone, - base::Unretained(this)))), - ALLOW_THIS_IN_INITIALIZER_LIST(connect_callback_( + base::Unretained(this))), + connect_callback_( base::Bind(&ProxyResolvingClientSocket::ProcessConnectDone, - base::Unretained(this)))), + base::Unretained(this))), ssl_config_(ssl_config), pac_request_(NULL), dest_host_port_pair_(dest_host_port_pair), @@ -41,7 +41,7 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket( net::BoundNetLog::Make( request_context_getter->GetURLRequestContext()->net_log(), net::NetLog::SOURCE_SOCKET)), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(request_context_getter); net::URLRequestContext* request_context = request_context_getter->GetURLRequestContext(); diff --git a/jingle/glue/pseudotcp_adapter.cc b/jingle/glue/pseudotcp_adapter.cc index 58d3406..a2da2ae 100644 --- a/jingle/glue/pseudotcp_adapter.cc +++ b/jingle/glue/pseudotcp_adapter.cc @@ -111,7 +111,7 @@ class PseudoTcpAdapter::Core : public cricket::IPseudoTcpNotify, PseudoTcpAdapter::Core::Core(net::Socket* socket) - : ALLOW_THIS_IN_INITIALIZER_LIST(pseudo_tcp_(this, 0)), + : pseudo_tcp_(this, 0), socket_(socket), write_waits_for_send_(false), waiting_write_position_(false), diff --git a/jingle/glue/task_pump.cc b/jingle/glue/task_pump.cc index e2c305b..3b67c9f 100644 --- a/jingle/glue/task_pump.cc +++ b/jingle/glue/task_pump.cc @@ -9,7 +9,7 @@ namespace jingle_glue { TaskPump::TaskPump() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), posted_wake_(false), stopped_(false) {} diff --git a/jingle/notifier/base/weak_xmpp_client.cc b/jingle/notifier/base/weak_xmpp_client.cc index 9a6e382..fa89e46 100644 --- a/jingle/notifier/base/weak_xmpp_client.cc +++ b/jingle/notifier/base/weak_xmpp_client.cc @@ -10,7 +10,7 @@ namespace notifier { WeakXmppClient::WeakXmppClient(talk_base::TaskParent* parent) : buzz::XmppClient(parent), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {} + weak_ptr_factory_(this) {} WeakXmppClient::~WeakXmppClient() { DCHECK(CalledOnValidThread()); diff --git a/jingle/notifier/listener/non_blocking_push_client.cc b/jingle/notifier/listener/non_blocking_push_client.cc index c42561e..30b8452 100644 --- a/jingle/notifier/listener/non_blocking_push_client.cc +++ b/jingle/notifier/listener/non_blocking_push_client.cc @@ -156,7 +156,7 @@ NonBlockingPushClient::NonBlockingPushClient( const scoped_refptr<base::SingleThreadTaskRunner>& delegate_task_runner, const CreateBlockingPushClientCallback& create_blocking_push_client_callback) - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_ptr_factory_(this), delegate_task_runner_(delegate_task_runner), core_(new Core(delegate_task_runner_, weak_ptr_factory_.GetWeakPtr())) { |