Convert chromecast/net to base::Bind and base::Callback to Once/Repeating

Changed usage of Bind to BindOnce and Callback to OnceCallback where
applicable

Disable base::Bind/base::Callback for //chromecst/net

Bug: 1007651
Change-Id: I08e009fd49effc8e4ef32463cdfa448dea50486b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2274092Reviewed-by: Alex Sakhartchouk <alexst@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Shengfa Lin <shengfa@google.com>
Cr-Commit-Position: refs/heads/master@{#784149}

PRESUBMIT.py

@@ -293,7 +293,6 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^chrome/tools/',
   '^chrome/utility/',
   '^chromecast/media/',
-  '^chromecast/net/',
   '^chromeos/attestation/',
   '^chromeos/components/',
   '^chromeos/network/',

chromecast/net/connectivity_checker_impl.cc

@@ -194,8 +194,8 @@ void ConnectivityCheckerImpl::CheckInternal() {
   url_loader_->DownloadHeadersOnly(url_loader_factory_.get(),
                                    std::move(callback));
 
-  timeout_.Reset(
-      base::Bind(&ConnectivityCheckerImpl::OnUrlRequestTimeout, weak_this_));
+  timeout_.Reset(base::BindOnce(&ConnectivityCheckerImpl::OnUrlRequestTimeout,
+                                weak_this_));
   // Exponential backoff for timeout in 3, 6 and 12 sec.
   const int timeout = kRequestTimeoutInSeconds
                       << (check_errors_ > 2 ? 2 : check_errors_);

chromecast/net/connectivity_checker_impl.h

@@ -106,7 +106,7 @@ class ConnectivityCheckerImpl
   // Timeout handler for connectivity checks.
   // Note: Cancelling this timeout can cause the destructor for this class to be
   // called.
-  base::CancelableCallback<void()> timeout_;
+  base::CancelableOnceCallback<void()> timeout_;
 
   base::WeakPtr<ConnectivityCheckerImpl> weak_this_;
   base::WeakPtrFactory<ConnectivityCheckerImpl> weak_factory_;

chromecast/net/fake_stream_socket_unittest.cc

@@ -76,9 +76,9 @@ TEST_F(FakeStreamSocketTest, GetPeerAddressWithPeer) {
 TEST_F(FakeStreamSocketTest, ReadAndWriteWithoutPeer) {
   auto io_buffer = base::MakeRefCounted<net::IOBuffer>(1);
   EXPECT_EQ(net::ERR_IO_PENDING,
-            socket_1_.Read(io_buffer.get(), 1, base::Bind(&Callback)));
+            socket_1_.Read(io_buffer.get(), 1, base::BindOnce(&Callback)));
   EXPECT_EQ(net::ERR_SOCKET_NOT_CONNECTED,
-            socket_1_.Write(io_buffer.get(), 1, base::Bind(&Callback),
+            socket_1_.Write(io_buffer.get(), 1, base::BindOnce(&Callback),
                             TRAFFIC_ANNOTATION_FOR_TESTS));
 }
 
@@ -89,12 +89,12 @@ TEST_F(FakeStreamSocketTest, ReadAndWriteWithPeer) {
   auto send_buffer = base::MakeRefCounted<net::StringIOBuffer>(kData);
   ASSERT_EQ(
       static_cast<int>(kData.size()),
-      socket_1_.Write(send_buffer.get(), kData.size(), base::Bind(&Callback),
-                      TRAFFIC_ANNOTATION_FOR_TESTS));
+      socket_1_.Write(send_buffer.get(), kData.size(),
+                      base::BindOnce(&Callback), TRAFFIC_ANNOTATION_FOR_TESTS));
   auto receive_buffer = base::MakeRefCounted<net::IOBuffer>(kData.size());
   ASSERT_EQ(static_cast<int>(kData.size()),
             socket_2_.Read(receive_buffer.get(), kData.size(),
-                           base::Bind(&Callback)));
+                           base::BindOnce(&Callback)));
   EXPECT_EQ(0, std::memcmp(kData.data(), receive_buffer->data(), kData.size()));
 }
 
@@ -105,12 +105,12 @@ TEST_F(FakeStreamSocketTest, ReadAndWritePending) {
   auto receive_buffer = base::MakeRefCounted<net::IOBuffer>(kData.size());
   ASSERT_EQ(net::ERR_IO_PENDING,
             socket_2_.Read(receive_buffer.get(), kData.size(),
-                           base::Bind(&Callback)));
+                           base::BindOnce(&Callback)));
   auto send_buffer = base::MakeRefCounted<net::StringIOBuffer>(kData);
   ASSERT_EQ(
       static_cast<int>(kData.size()),
-      socket_1_.Write(send_buffer.get(), kData.size(), base::Bind(&Callback),
-                      TRAFFIC_ANNOTATION_FOR_TESTS));
+      socket_1_.Write(send_buffer.get(), kData.size(),
+                      base::BindOnce(&Callback), TRAFFIC_ANNOTATION_FOR_TESTS));
   EXPECT_EQ(0, std::memcmp(kData.data(), receive_buffer->data(), kData.size()));
 }
 
@@ -122,15 +122,15 @@ TEST_F(FakeStreamSocketTest, ReadAndWriteLargeData) {
   auto send_buffer = base::MakeRefCounted<net::StringIOBuffer>(kData);
   const int kWriteCount = 1024 * 1024 / kData.size();
   for (int i = 0; i < kWriteCount; i++) {
-    ASSERT_EQ(
-        static_cast<int>(kData.size()),
-        socket_1_.Write(send_buffer.get(), kData.size(), base::Bind(&Callback),
-                        TRAFFIC_ANNOTATION_FOR_TESTS));
+    ASSERT_EQ(static_cast<int>(kData.size()),
+              socket_1_.Write(send_buffer.get(), kData.size(),
+                              base::BindOnce(&Callback),
+                              TRAFFIC_ANNOTATION_FOR_TESTS));
   }
   auto receive_buffer = base::MakeRefCounted<net::IOBuffer>(1024);
   for (int i = 0; i < 1024; i++) {
     ASSERT_EQ(1024, socket_2_.Read(receive_buffer.get(), 1024,
-                                   base::Bind(&Callback)));
+                                   base::BindOnce(&Callback)));
   }
 }