commit da457d20eb3d121e5f6d6fed3d1e8147a29c22b3
author Mario Sanchez Prada <mario@igalia.com> Fri Mar 22 15:09:25 2019
committer Commit Bot <commit-bot@chromium.org> Fri Mar 22 15:09:25 2019
tree 05cbca50fb3c3482f31811443b6ed88673898dd5
parent 1aece77401e587f96ea690ee66a5130a3c550ba8

Migrate //chromecast/net to net::CompletionOnceCallback

Replace usage of net::CompletionCallback wherever possible, and remove
custom mock implementations of Socket's Write(), Read() and Connect()
methods, now that they already expect a CompletionOnceCallback.

Bug: 807724
Change-Id: I57c4e46f392ad0c09e4fd7dc7670d425ca4ac24b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1530879
Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Reviewed-by: Bence Béky <bnc@chromium.org>
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Cr-Commit-Position: refs/heads/master@{#643362}

chromecast/net/mock_stream_socket.cc

diff --git a/chromecast/net/mock_stream_socket.cc b/chromecast/net/mock_stream_socket.cc
index ecf9b18..07037e8c 100644
--- a/chromecast/net/mock_stream_socket.cc
+++ b/chromecast/net/mock_stream_socket.cc
@@ -23,7 +23,7 @@
   ON_CALL(*this, Write(_, _, _, _))
       .WillByDefault(Invoke(
           [](net::IOBuffer* buf, int buf_len,
-             const net::CompletionCallback& callback,
+             net::CompletionOnceCallback callback,
              const net::NetworkTrafficAnnotationTag& traffic_annotation) {
             return buf_len;
           }));

chromecast/net/mock_stream_socket.h

diff --git a/chromecast/net/mock_stream_socket.h b/chromecast/net/mock_stream_socket.h
index 6499b57..951d353 100644
--- a/chromecast/net/mock_stream_socket.h
+++ b/chromecast/net/mock_stream_socket.h
@@ -7,9 +7,8 @@
 
 #include <stdint.h>
 
-#include "base/callback_helpers.h"
 #include "base/macros.h"
-#include "net/base/completion_callback.h"
+#include "net/base/completion_once_callback.h"
 #include "net/log/net_log_with_source.h"
 #include "net/socket/stream_socket.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
@@ -23,34 +22,15 @@
   MockStreamSocket();
   ~MockStreamSocket() override;
 
-  int Read(net::IOBuffer* buffer,
-           int bytes,
-           net::CompletionOnceCallback callback) override {
-    return Read(buffer, bytes,
-                base::AdaptCallbackForRepeating(std::move(callback)));
-  }
-
-  int Write(net::IOBuffer* buffer,
-            int bytes,
-            net::CompletionOnceCallback callback,
-            const net::NetworkTrafficAnnotationTag& tag) override {
-    return Write(buffer, bytes,
-                 base::AdaptCallbackForRepeating(std::move(callback)), tag);
-  }
-
-  int Connect(net::CompletionOnceCallback callback) override {
-    return Connect(base::AdaptCallbackForRepeating(std::move(callback)));
-  }
-
-  MOCK_METHOD3(Read, int(net::IOBuffer*, int, const net::CompletionCallback&));
+  MOCK_METHOD3(Read, int(net::IOBuffer*, int, net::CompletionOnceCallback));
   MOCK_METHOD4(Write,
                int(net::IOBuffer*,
                    int,
-                   const net::CompletionCallback&,
+                   net::CompletionOnceCallback,
                    const net::NetworkTrafficAnnotationTag&));
   MOCK_METHOD1(SetReceiveBufferSize, int(int32_t));
   MOCK_METHOD1(SetSendBufferSize, int(int32_t));
-  MOCK_METHOD1(Connect, int(const net::CompletionCallback&));
+  MOCK_METHOD1(Connect, int(net::CompletionOnceCallback));
   MOCK_METHOD0(Disconnect, void());
   MOCK_CONST_METHOD0(IsConnected, bool());
   MOCK_CONST_METHOD0(IsConnectedAndIdle, bool());