summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_http_stream.cc2
-rw-r--r--net/spdy/spdy_network_transaction_spdy2_unittest.cc4
-rw-r--r--net/spdy/spdy_network_transaction_spdy3_unittest.cc4
-rw-r--r--net/spdy/spdy_proxy_client_socket.cc2
-rw-r--r--net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc7
-rw-r--r--net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc7
-rw-r--r--net/spdy/spdy_session.cc2
-rw-r--r--net/spdy/spdy_stream.cc2
-rw-r--r--net/spdy/spdy_test_util_spdy2.cc2
-rw-r--r--net/spdy/spdy_test_util_spdy3.cc2
-rw-r--r--net/spdy/spdy_websocket_stream.cc2
11 files changed, 17 insertions, 19 deletions
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index c9f3ab9..33fe47d 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -28,7 +28,7 @@ namespace net {
SpdyHttpStream::SpdyHttpStream(SpdySession* spdy_session,
bool direct)
- : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+ : weak_factory_(this),
spdy_session_(spdy_session),
stream_closed_(false),
closed_stream_pushed_(false),
diff --git a/net/spdy/spdy_network_transaction_spdy2_unittest.cc b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
index a5ac96b..f76252c 100644
--- a/net/spdy/spdy_network_transaction_spdy2_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
@@ -1371,8 +1371,8 @@ class KillerCallback : public TestCompletionCallbackBase {
public:
explicit KillerCallback(HttpNetworkTransaction* transaction)
: transaction_(transaction),
- ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
- base::Bind(&KillerCallback::OnComplete, base::Unretained(this)))) {
+ callback_(base::Bind(&KillerCallback::OnComplete,
+ base::Unretained(this))) {
}
virtual ~KillerCallback() {}
diff --git a/net/spdy/spdy_network_transaction_spdy3_unittest.cc b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
index f1d3e70..805c6aa 100644
--- a/net/spdy/spdy_network_transaction_spdy3_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
@@ -1375,8 +1375,8 @@ class KillerCallback : public TestCompletionCallbackBase {
public:
explicit KillerCallback(HttpNetworkTransaction* transaction)
: transaction_(transaction),
- ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
- base::Bind(&KillerCallback::OnComplete, base::Unretained(this)))) {
+ callback_(base::Bind(&KillerCallback::OnComplete,
+ base::Unretained(this))) {
}
virtual ~KillerCallback() {}
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
index 245a58b..84552d2 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -42,7 +42,7 @@ SpdyProxyClientSocket::SpdyProxyClientSocket(
user_buffer_len_(0),
write_buffer_len_(0),
write_bytes_outstanding_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+ weak_factory_(this),
net_log_(BoundNetLog::Make(spdy_stream->net_log().net_log(),
NetLog::SOURCE_PROXY_CLIENT_SOCKET)) {
request_.method = "CONNECT";
diff --git a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
index eb19444..0074bc5 100644
--- a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
@@ -1352,10 +1352,9 @@ TEST_F(SpdyProxyClientSocketSpdy2Test, NetLog) {
class DeleteSockCallback : public TestCompletionCallbackBase {
public:
explicit DeleteSockCallback(scoped_ptr<SpdyProxyClientSocket>* sock)
- : sock_(sock),
- ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
- base::Bind(&DeleteSockCallback::OnComplete,
- base::Unretained(this)))) {
+ : sock_(sock),
+ callback_(base::Bind(&DeleteSockCallback::OnComplete,
+ base::Unretained(this))) {
}
virtual ~DeleteSockCallback() {
diff --git a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
index 84a4581..0a21d34 100644
--- a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
@@ -1353,10 +1353,9 @@ TEST_F(SpdyProxyClientSocketSpdy3Test, NetLog) {
class DeleteSockCallback : public TestCompletionCallbackBase {
public:
explicit DeleteSockCallback(scoped_ptr<SpdyProxyClientSocket>* sock)
- : sock_(sock),
- ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
- base::Bind(&DeleteSockCallback::OnComplete,
- base::Unretained(this)))) {
+ : sock_(sock),
+ callback_(base::Bind(&DeleteSockCallback::OnComplete,
+ base::Unretained(this))) {
}
virtual ~DeleteSockCallback() {
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 04c186e..d06c141 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -303,7 +303,7 @@ SpdySession::SpdySession(const HostPortProxyPair& host_port_proxy_pair,
TimeFunc time_func,
const HostPortPair& trusted_spdy_proxy,
NetLog* net_log)
- : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+ : weak_factory_(this),
host_port_proxy_pair_(host_port_proxy_pair),
spdy_session_pool_(spdy_session_pool),
http_server_properties_(http_server_properties),
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 06d506f..b2929c8 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -114,7 +114,7 @@ SpdyStream::SpdyStream(SpdySession* session,
int32 initial_recv_window_size,
bool pushed,
const BoundNetLog& net_log)
- : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+ : weak_ptr_factory_(this),
continue_buffering_data_(true),
stream_id_(0),
path_(path),
diff --git a/net/spdy/spdy_test_util_spdy2.cc b/net/spdy/spdy_test_util_spdy2.cc
index 543e353..5d88f63 100644
--- a/net/spdy/spdy_test_util_spdy2.cc
+++ b/net/spdy/spdy_test_util_spdy2.cc
@@ -719,7 +719,7 @@ net::HttpNetworkSession::Params SpdySessionDependencies::CreateSessionParams(
}
SpdyURLRequestContext::SpdyURLRequestContext()
- : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
+ : storage_(this) {
storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver));
storage_.set_cert_verifier(new MockCertVerifier);
storage_.set_proxy_service(ProxyService::CreateDirect());
diff --git a/net/spdy/spdy_test_util_spdy3.cc b/net/spdy/spdy_test_util_spdy3.cc
index 32e5b54..9be52af 100644
--- a/net/spdy/spdy_test_util_spdy3.cc
+++ b/net/spdy/spdy_test_util_spdy3.cc
@@ -829,7 +829,7 @@ net::HttpNetworkSession::Params SpdySessionDependencies::CreateSessionParams(
}
SpdyURLRequestContext::SpdyURLRequestContext()
- : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
+ : storage_(this) {
storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver));
storage_.set_cert_verifier(new MockCertVerifier);
storage_.set_proxy_service(ProxyService::CreateDirect());
diff --git a/net/spdy/spdy_websocket_stream.cc b/net/spdy/spdy_websocket_stream.cc
index a17ff73..3440af7 100644
--- a/net/spdy/spdy_websocket_stream.cc
+++ b/net/spdy/spdy_websocket_stream.cc
@@ -19,7 +19,7 @@ namespace net {
SpdyWebSocketStream::SpdyWebSocketStream(
SpdySession* spdy_session, Delegate* delegate)
- : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+ : weak_ptr_factory_(this),
stream_(NULL),
spdy_session_(spdy_session),
delegate_(delegate) {
generated by cgit v1.1 at 2025-02-09 18:41:09 +0000