From eb32ba6f51d0c21d58cd7d89785285ff8fa64624 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Thu, 21 Nov 2013 14:09:57 +0100 Subject: Update chromium to branch 1599. Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi --- chromium/jingle/glue/chrome_async_socket.cc | 10 ++++----- .../jingle/glue/chrome_async_socket_unittest.cc | 8 +++---- chromium/jingle/glue/fake_ssl_client_socket.cc | 4 ++-- chromium/jingle/glue/fake_ssl_client_socket.h | 3 ++- .../jingle/glue/fake_ssl_client_socket_unittest.cc | 7 +++--- .../jingle/glue/resolving_client_socket_factory.h | 7 +++--- chromium/jingle/glue/xmpp_client_socket_factory.cc | 26 +++++++++------------- chromium/jingle/glue/xmpp_client_socket_factory.h | 6 ++--- .../listener/push_notifications_subscribe_task.cc | 4 +++- 9 files changed, 35 insertions(+), 40 deletions(-) (limited to 'chromium/jingle') diff --git a/chromium/jingle/glue/chrome_async_socket.cc b/chromium/jingle/glue/chrome_async_socket.cc index c14fb99b11e..39085e105f6 100644 --- a/chromium/jingle/glue/chrome_async_socket.cc +++ b/chromium/jingle/glue/chrome_async_socket.cc @@ -106,9 +106,9 @@ bool ChromeAsyncSocket::Connect(const talk_base::SocketAddress& address) { net::HostPortPair dest_host_port_pair(address.hostname(), address.port()); - transport_socket_ = + transport_socket_.reset( resolving_client_socket_factory_->CreateTransportClientSocket( - dest_host_port_pair); + dest_host_port_pair)); int status = transport_socket_->Connect( base::Bind(&ChromeAsyncSocket::ProcessConnectDone, weak_ptr_factory_.GetWeakPtr())); @@ -404,10 +404,10 @@ bool ChromeAsyncSocket::StartTls(const std::string& domain_name) { DCHECK(transport_socket_.get()); scoped_ptr socket_handle( new net::ClientSocketHandle()); - socket_handle->SetSocket(transport_socket_.Pass()); - transport_socket_ = + socket_handle->set_socket(transport_socket_.release()); + transport_socket_.reset( resolving_client_socket_factory_->CreateSSLClientSocket( - socket_handle.Pass(), net::HostPortPair(domain_name, 443)); + socket_handle.release(), net::HostPortPair(domain_name, 443))); int status = transport_socket_->Connect( base::Bind(&ChromeAsyncSocket::ProcessSSLConnectDone, weak_ptr_factory_.GetWeakPtr())); diff --git a/chromium/jingle/glue/chrome_async_socket_unittest.cc b/chromium/jingle/glue/chrome_async_socket_unittest.cc index db3d2b09c9f..ebb69a21aa6 100644 --- a/chromium/jingle/glue/chrome_async_socket_unittest.cc +++ b/chromium/jingle/glue/chrome_async_socket_unittest.cc @@ -113,20 +113,20 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory { } // ResolvingClientSocketFactory implementation. - virtual scoped_ptr CreateTransportClientSocket( + virtual net::StreamSocket* CreateTransportClientSocket( const net::HostPortPair& host_and_port) OVERRIDE { return mock_client_socket_factory_->CreateTransportClientSocket( address_list_, NULL, net::NetLog::Source()); } - virtual scoped_ptr CreateSSLClientSocket( - scoped_ptr transport_socket, + virtual net::SSLClientSocket* CreateSSLClientSocket( + net::ClientSocketHandle* transport_socket, const net::HostPortPair& host_and_port) OVERRIDE { net::SSLClientSocketContext context; context.cert_verifier = cert_verifier_.get(); context.transport_security_state = transport_security_state_.get(); return mock_client_socket_factory_->CreateSSLClientSocket( - transport_socket.Pass(), host_and_port, ssl_config_, context); + transport_socket, host_and_port, ssl_config_, context); } private: diff --git a/chromium/jingle/glue/fake_ssl_client_socket.cc b/chromium/jingle/glue/fake_ssl_client_socket.cc index 9d722c7861b..bf6d12a7dcc 100644 --- a/chromium/jingle/glue/fake_ssl_client_socket.cc +++ b/chromium/jingle/glue/fake_ssl_client_socket.cc @@ -77,8 +77,8 @@ base::StringPiece FakeSSLClientSocket::GetSslServerHello() { } FakeSSLClientSocket::FakeSSLClientSocket( - scoped_ptr transport_socket) - : transport_socket_(transport_socket.Pass()), + net::StreamSocket* transport_socket) + : transport_socket_(transport_socket), next_handshake_state_(STATE_NONE), handshake_completed_(false), write_buf_(NewDrainableIOBufferWithSize(arraysize(kSslClientHello))), diff --git a/chromium/jingle/glue/fake_ssl_client_socket.h b/chromium/jingle/glue/fake_ssl_client_socket.h index 54a9e2f2b1b..5bc4547d62b 100644 --- a/chromium/jingle/glue/fake_ssl_client_socket.h +++ b/chromium/jingle/glue/fake_ssl_client_socket.h @@ -36,7 +36,8 @@ namespace jingle_glue { class FakeSSLClientSocket : public net::StreamSocket { public: - explicit FakeSSLClientSocket(scoped_ptr transport_socket); + // Takes ownership of |transport_socket|. + explicit FakeSSLClientSocket(net::StreamSocket* transport_socket); virtual ~FakeSSLClientSocket(); diff --git a/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc b/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc index f6d8fea5fb3..5c061f3774c 100644 --- a/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc +++ b/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc @@ -91,7 +91,7 @@ class FakeSSLClientSocketTest : public testing::Test { virtual ~FakeSSLClientSocketTest() {} - scoped_ptr MakeClientSocket() { + net::StreamSocket* MakeClientSocket() { return mock_client_socket_factory_.CreateTransportClientSocket( net::AddressList(), NULL, net::NetLog::Source()); } @@ -269,7 +269,7 @@ class FakeSSLClientSocketTest : public testing::Test { }; TEST_F(FakeSSLClientSocketTest, PassThroughMethods) { - scoped_ptr mock_client_socket(new MockClientSocket()); + MockClientSocket* mock_client_socket = new MockClientSocket(); const int kReceiveBufferSize = 10; const int kSendBufferSize = 20; net::IPEndPoint ip_endpoint(net::IPAddressNumber(net::kIPv4AddressSize), 80); @@ -284,8 +284,7 @@ TEST_F(FakeSSLClientSocketTest, PassThroughMethods) { EXPECT_CALL(*mock_client_socket, SetOmniboxSpeculation()); // Takes ownership of |mock_client_socket|. - FakeSSLClientSocket fake_ssl_client_socket( - mock_client_socket.PassAs()); + FakeSSLClientSocket fake_ssl_client_socket(mock_client_socket); fake_ssl_client_socket.SetReceiveBufferSize(kReceiveBufferSize); fake_ssl_client_socket.SetSendBufferSize(kSendBufferSize); EXPECT_EQ(kPeerAddress, diff --git a/chromium/jingle/glue/resolving_client_socket_factory.h b/chromium/jingle/glue/resolving_client_socket_factory.h index d1b9fc1f389..5be8bc88c2d 100644 --- a/chromium/jingle/glue/resolving_client_socket_factory.h +++ b/chromium/jingle/glue/resolving_client_socket_factory.h @@ -5,7 +5,6 @@ #ifndef JINGLE_GLUE_RESOLVING_CLIENT_SOCKET_FACTORY_H_ #define JINGLE_GLUE_RESOLVING_CLIENT_SOCKET_FACTORY_H_ -#include "base/memory/scoped_ptr.h" namespace net { class ClientSocketHandle; @@ -24,11 +23,11 @@ class ResolvingClientSocketFactory { public: virtual ~ResolvingClientSocketFactory() { } // Method to create a transport socket using a HostPortPair. - virtual scoped_ptr CreateTransportClientSocket( + virtual net::StreamSocket* CreateTransportClientSocket( const net::HostPortPair& host_and_port) = 0; - virtual scoped_ptr CreateSSLClientSocket( - scoped_ptr transport_socket, + virtual net::SSLClientSocket* CreateSSLClientSocket( + net::ClientSocketHandle* transport_socket, const net::HostPortPair& host_and_port) = 0; }; diff --git a/chromium/jingle/glue/xmpp_client_socket_factory.cc b/chromium/jingle/glue/xmpp_client_socket_factory.cc index 4823ee5d9bd..b9e040d619f 100644 --- a/chromium/jingle/glue/xmpp_client_socket_factory.cc +++ b/chromium/jingle/glue/xmpp_client_socket_factory.cc @@ -8,7 +8,6 @@ #include "jingle/glue/fake_ssl_client_socket.h" #include "jingle/glue/proxy_resolving_client_socket.h" #include "net/socket/client_socket_factory.h" -#include "net/socket/client_socket_handle.h" #include "net/socket/ssl_client_socket.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" @@ -29,25 +28,20 @@ XmppClientSocketFactory::XmppClientSocketFactory( XmppClientSocketFactory::~XmppClientSocketFactory() {} -scoped_ptr -XmppClientSocketFactory::CreateTransportClientSocket( +net::StreamSocket* XmppClientSocketFactory::CreateTransportClientSocket( const net::HostPortPair& host_and_port) { // TODO(akalin): Use socket pools. - scoped_ptr transport_socket( - new ProxyResolvingClientSocket( - NULL, - request_context_getter_, - ssl_config_, - host_and_port)); + net::StreamSocket* transport_socket = new ProxyResolvingClientSocket( + NULL, + request_context_getter_, + ssl_config_, + host_and_port); return (use_fake_ssl_client_socket_ ? - scoped_ptr( - new FakeSSLClientSocket(transport_socket.Pass())) : - transport_socket.Pass()); + new FakeSSLClientSocket(transport_socket) : transport_socket); } -scoped_ptr -XmppClientSocketFactory::CreateSSLClientSocket( - scoped_ptr transport_socket, +net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket( + net::ClientSocketHandle* transport_socket, const net::HostPortPair& host_and_port) { net::SSLClientSocketContext context; context.cert_verifier = @@ -58,7 +52,7 @@ XmppClientSocketFactory::CreateSSLClientSocket( // TODO(rkn): context.server_bound_cert_service is NULL because the // ServerBoundCertService class is not thread safe. return client_socket_factory_->CreateSSLClientSocket( - transport_socket.Pass(), host_and_port, ssl_config_, context); + transport_socket, host_and_port, ssl_config_, context); } diff --git a/chromium/jingle/glue/xmpp_client_socket_factory.h b/chromium/jingle/glue/xmpp_client_socket_factory.h index 4204c1982e8..c2a0d6a5187 100644 --- a/chromium/jingle/glue/xmpp_client_socket_factory.h +++ b/chromium/jingle/glue/xmpp_client_socket_factory.h @@ -35,11 +35,11 @@ class XmppClientSocketFactory : public ResolvingClientSocketFactory { virtual ~XmppClientSocketFactory(); // ResolvingClientSocketFactory implementation. - virtual scoped_ptr CreateTransportClientSocket( + virtual net::StreamSocket* CreateTransportClientSocket( const net::HostPortPair& host_and_port) OVERRIDE; - virtual scoped_ptr CreateSSLClientSocket( - scoped_ptr transport_socket, + virtual net::SSLClientSocket* CreateSSLClientSocket( + net::ClientSocketHandle* transport_socket, const net::HostPortPair& host_and_port) OVERRIDE; private: diff --git a/chromium/jingle/notifier/listener/push_notifications_subscribe_task.cc b/chromium/jingle/notifier/listener/push_notifications_subscribe_task.cc index b069c9e4fc3..33f9949c7bf 100644 --- a/chromium/jingle/notifier/listener/push_notifications_subscribe_task.cc +++ b/chromium/jingle/notifier/listener/push_notifications_subscribe_task.cc @@ -43,6 +43,7 @@ int PushNotificationsSubscribeTask::ProcessStart() { scoped_ptr iq_stanza( MakeSubscriptionMessage(subscriptions_, GetClient()->jid(), task_id())); + std::string stanza_str = XmlElementToString(*iq_stanza.get()); DVLOG(1) << "Push notifications: Subscription stanza: " << XmlElementToString(*iq_stanza.get()); @@ -60,9 +61,10 @@ int PushNotificationsSubscribeTask::ProcessResponse() { if (stanza == NULL) { return STATE_BLOCKED; } + std::string stanza_str = XmlElementToString(*stanza); DVLOG(1) << "Push notifications: Subscription response: " << XmlElementToString(*stanza); - // We've received a response to our subscription request. + // We've receieved a response to our subscription request. if (stanza->HasAttr(buzz::QN_TYPE) && stanza->Attr(buzz::QN_TYPE) == buzz::STR_RESULT) { if (delegate_) -- cgit v1.2.1