Fix some parameters to use std::unique_ptr.

I noticed this while reviewing some other CL.

Bug: none
Change-Id: Iab610a1e10079bc8e448eb392b2ce1229fe24fab
Reviewed-on: https://chromium-review.googlesource.com/1101574
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567852}

jingle/glue/chrome_async_socket.cc

@@ -27,11 +27,13 @@
 namespace jingle_glue {
 
 ChromeAsyncSocket::ChromeAsyncSocket(
-    ResolvingClientSocketFactory* resolving_client_socket_factory,
+    std::unique_ptr<ResolvingClientSocketFactory>
+        resolving_client_socket_factory,
     size_t read_buf_size,
     size_t write_buf_size,
     const net::NetworkTrafficAnnotationTag& traffic_annotation)
-    : resolving_client_socket_factory_(resolving_client_socket_factory),
+    : resolving_client_socket_factory_(
+          std::move(resolving_client_socket_factory)),
       state_(STATE_CLOSED),
       error_(ERROR_NONE),
       net_error_(net::OK),

jingle/glue/chrome_async_socket.h

@@ -34,11 +34,11 @@ class ResolvingClientSocketFactory;
 class ChromeAsyncSocket : public buzz::AsyncSocket {
  public:
   // Takes ownership of |resolving_client_socket_factory|.
-  ChromeAsyncSocket(
-      ResolvingClientSocketFactory* resolving_client_socket_factory,
-      size_t read_buf_size,
-      size_t write_buf_size,
-      const net::NetworkTrafficAnnotationTag& traffic_annotation);
+  ChromeAsyncSocket(std::unique_ptr<ResolvingClientSocketFactory>
+                        resolving_client_socket_factory,
+                    size_t read_buf_size,
+                    size_t write_buf_size,
+                    const net::NetworkTrafficAnnotationTag& traffic_annotation);
 
   // Does not raise any signals.
   ~ChromeAsyncSocket() override;

jingle/glue/chrome_async_socket_unittest.cc

@@ -119,13 +119,12 @@ class AsyncSocketDataProvider : public net::SocketDataProvider {
 class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
  public:
   MockXmppClientSocketFactory(
-      net::ClientSocketFactory* mock_client_socket_factory,
+      std::unique_ptr<net::ClientSocketFactory> mock_client_socket_factory,
       const net::AddressList& address_list)
-          : mock_client_socket_factory_(mock_client_socket_factory),
-            address_list_(address_list),
-            cert_verifier_(new net::MockCertVerifier),
-            transport_security_state_(new net::TransportSecurityState) {
-  }
+      : mock_client_socket_factory_(std::move(mock_client_socket_factory)),
+        address_list_(address_list),
+        cert_verifier_(new net::MockCertVerifier),
+        transport_security_state_(new net::TransportSecurityState) {}
 
   // ResolvingClientSocketFactory implementation.
   std::unique_ptr<net::StreamSocket> CreateTransportClientSocket(
@@ -181,10 +180,10 @@ class ChromeAsyncSocketTest
         net::IPAddress::IPv4Localhost(), addr_.port());
     std::unique_ptr<MockXmppClientSocketFactory>
         mock_xmpp_client_socket_factory(new MockXmppClientSocketFactory(
-            mock_client_socket_factory.release(), address_list));
+            std::move(mock_client_socket_factory), address_list));
     chrome_async_socket_.reset(
-        new ChromeAsyncSocket(mock_xmpp_client_socket_factory.release(), 14, 20,
-                              TRAFFIC_ANNOTATION_FOR_TESTS)),
+        new ChromeAsyncSocket(std::move(mock_xmpp_client_socket_factory), 14,
+                              20, TRAFFIC_ANNOTATION_FOR_TESTS)),
 
         chrome_async_socket_->SignalConnected.connect(
             this, &ChromeAsyncSocketTest::OnConnect);

jingle/notifier/base/xmpp_connection.cc

@@ -37,15 +37,14 @@ buzz::AsyncSocket* CreateSocket(
   // XmppSocketAdapter.
   const size_t kReadBufSize = 64U * 1024U;
   const size_t kWriteBufSize = 64U * 1024U;
-  jingle_glue::XmppClientSocketFactory* const client_socket_factory =
-      new jingle_glue::XmppClientSocketFactory(
-          net::ClientSocketFactory::GetDefaultFactory(),
-          ssl_config,
-          request_context_getter,
-          use_fake_ssl_client_socket);
-
-  return new jingle_glue::ChromeAsyncSocket(client_socket_factory, kReadBufSize,
-                                            kWriteBufSize, traffic_annotation);
+  auto client_socket_factory =
+      std::make_unique<jingle_glue::XmppClientSocketFactory>(
+          net::ClientSocketFactory::GetDefaultFactory(), ssl_config,
+          request_context_getter, use_fake_ssl_client_socket);
+
+  return new jingle_glue::ChromeAsyncSocket(std::move(client_socket_factory),
+                                            kReadBufSize, kWriteBufSize,
+                                            traffic_annotation);
 }
 
 }  // namespace
@@ -90,7 +89,7 @@ XmppConnection::~XmppConnection() {
   // things happen when the stack pops back up to the XmppClient's
   // (which is deleted by |task_pump_|) function.
   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE,
-                                                  task_pump_.release());
+                                                  std::move(task_pump_));
 }
 
 void XmppConnection::OnStateChange(buzz::XmppEngine::State state) {