Use CompletionOnceCallback in net::SourceStream.

Bug: 807724
Change-Id: Iff21f7cc6ba5c3005b440fb7b6d51fdccbbd230b
Reviewed-on: https://chromium-review.googlesource.com/1117325
Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571558}

Author: Bence Béky

chromeos/printing/ppd_line_reader.cc

@@ -9,6 +9,7 @@
 #include <utility>
 
 #include "base/strings/string_util.h"
+#include "net/base/completion_once_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/filter/gzip_header.h"
 #include "net/filter/gzip_source_stream.h"
@@ -44,7 +45,7 @@ class StringSourceStream : public net::SourceStream {
   // This source always reads sychronously, so never uses the callback.
   int Read(net::IOBuffer* dest_buffer,
            int buffer_size,
-           const net::CompletionCallback&) override {
+           net::CompletionOnceCallback) override {
     int read_size = src_.size() - read_ofs_;
     if (read_size > buffer_size) {
       read_size = buffer_size;

content/browser/loader/data_pipe_to_source_stream.cc

@@ -4,6 +4,8 @@
 
 #include "content/browser/loader/data_pipe_to_source_stream.h"
 
+#include <utility>
+
 #include "base/auto_reset.h"
 #include "net/base/io_buffer.h"
 
@@ -30,7 +32,7 @@ std::string DataPipeToSourceStream::Description() const {
 
 int DataPipeToSourceStream::Read(net::IOBuffer* buf,
                                  int buf_size,
-                                 const net::CompletionCallback& callback) {
+                                 net::CompletionOnceCallback callback) {
   base::AutoReset<bool>(&inside_read_, true);
 
   if (!body_.get()) {
@@ -56,7 +58,7 @@ int DataPipeToSourceStream::Read(net::IOBuffer* buf,
       return 0;
     case MOJO_RESULT_SHOULD_WAIT:
       // Data is not available yet.
-      pending_callback_ = callback;
+      pending_callback_ = std::move(callback);
       output_buf_ = buf;
       output_buf_size_ = buf_size;
       handle_watcher_.ArmOrNotify();

content/browser/loader/data_pipe_to_source_stream.h

@@ -8,6 +8,7 @@
 #include "content/common/content_export.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/public/cpp/system/simple_watcher.h"
+#include "net/base/completion_once_callback.h"
 #include "net/filter/source_stream.h"
 
 namespace content {
@@ -19,7 +20,7 @@ class CONTENT_EXPORT DataPipeToSourceStream final : public net::SourceStream {
 
   int Read(net::IOBuffer* buf,
            int buf_size,
-           const net::CompletionCallback& callback) override;
+           net::CompletionOnceCallback callback) override;
   std::string Description() const override;
 
  private:
@@ -33,7 +34,7 @@ class CONTENT_EXPORT DataPipeToSourceStream final : public net::SourceStream {
 
   scoped_refptr<net::IOBuffer> output_buf_;
   int output_buf_size_ = 0;
-  net::CompletionCallback pending_callback_;
+  net::CompletionOnceCallback pending_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(DataPipeToSourceStream);
 };

net/filter/filter_source_stream.cc

@@ -4,6 +4,8 @@
 
 #include "net/filter/filter_source_stream.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ -40,7 +42,7 @@ FilterSourceStream::~FilterSourceStream() = default;
 
 int FilterSourceStream::Read(IOBuffer* read_buffer,
                              int read_buffer_size,
-                             const CompletionCallback& callback) {
+                             CompletionOnceCallback callback) {
   DCHECK_EQ(STATE_NONE, next_state_);
   DCHECK(read_buffer);
   DCHECK_LT(0, read_buffer_size);
@@ -61,7 +63,7 @@ int FilterSourceStream::Read(IOBuffer* read_buffer,
   int rv = DoLoop(OK);
 
   if (rv == ERR_IO_PENDING)
-    callback_ = callback;
+    callback_ = std::move(callback);
   return rv;
 }
 

net/filter/filter_source_stream.h

@@ -10,7 +10,7 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/completion_callback.h"
+#include "net/base/completion_once_callback.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_export.h"
 #include "net/filter/source_stream.h"
@@ -34,7 +34,7 @@ class NET_EXPORT_PRIVATE FilterSourceStream : public SourceStream {
 
   int Read(IOBuffer* read_buffer,
            int read_buffer_size,
-           const CompletionCallback& callback) override;
+           CompletionOnceCallback callback) override;
 
   std::string Description() const override;
 
@@ -110,7 +110,7 @@ class NET_EXPORT_PRIVATE FilterSourceStream : public SourceStream {
   // Not null if there is a pending Read.
   scoped_refptr<IOBuffer> output_buffer_;
   int output_buffer_size_;
-  CompletionCallback callback_;
+  CompletionOnceCallback callback_;
 
   // Reading from |upstream_| has returned 0 byte or an error code.
   bool upstream_end_reached_;

net/filter/fuzzed_source_stream.cc

@@ -5,6 +5,7 @@
 #include "net/filter/fuzzed_source_stream.h"
 
 #include <algorithm>
+#include <utility>
 
 #include "base/test/fuzzed_data_provider.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -32,7 +33,7 @@ FuzzedSourceStream::~FuzzedSourceStream() {
 
 int FuzzedSourceStream::Read(IOBuffer* buf,
                              int buf_len,
-                             const CompletionCallback& callback) {
+                             CompletionOnceCallback callback) {
   DCHECK(!read_pending_);
   DCHECK(!end_returned_);
   DCHECK_LE(0, buf_len);
@@ -59,17 +60,17 @@ int FuzzedSourceStream::Read(IOBuffer* buf,
   read_pending_ = true;
   // |this| is owned by the caller so use base::Unretained is safe.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE,
-      base::Bind(&FuzzedSourceStream::OnReadComplete, base::Unretained(this),
-                 callback, data, pending_read_buf, result));
+      FROM_HERE, base::BindOnce(&FuzzedSourceStream::OnReadComplete,
+                                base::Unretained(this), std::move(callback),
+                                data, pending_read_buf, result));
   return ERR_IO_PENDING;
 }
 
 std::string FuzzedSourceStream::Description() const {
   return "";
 }
 
-void FuzzedSourceStream::OnReadComplete(const CompletionCallback& callback,
+void FuzzedSourceStream::OnReadComplete(CompletionOnceCallback callback,
                                         const std::string& fuzzed_data,
                                         scoped_refptr<IOBuffer> read_buf,
                                         int result) {
@@ -82,7 +83,7 @@ void FuzzedSourceStream::OnReadComplete(const CompletionCallback& callback,
     end_returned_ = true;
   }
   read_pending_ = false;
-  callback.Run(result);
+  std::move(callback).Run(result);
 }
 
 }  // namespace net

net/filter/fuzzed_source_stream.h

@@ -9,7 +9,7 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/completion_callback.h"
+#include "net/base/completion_once_callback.h"
 #include "net/filter/source_stream.h"
 
 namespace base {
@@ -32,11 +32,11 @@ class FuzzedSourceStream : public SourceStream {
   // SourceStream implementation
   int Read(IOBuffer* dest_buffer,
            int buffer_size,
-           const CompletionCallback& callback) override;
+           CompletionOnceCallback callback) override;
   std::string Description() const override;
 
  private:
-  void OnReadComplete(const CompletionCallback& callback,
+  void OnReadComplete(CompletionOnceCallback callback,
                       const std::string& fuzzed_data,
                       scoped_refptr<IOBuffer> read_buf,
                       int result);

net/filter/gzip_source_stream_unittest.cc

@@ -8,7 +8,6 @@
 #include "base/bind.h"
 #include "base/bit_cast.h"
 #include "base/callback.h"
-#include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/test_completion_callback.h"
 #include "net/filter/filter_source_stream_test_util.h"

net/filter/mock_source_stream.cc

@@ -4,6 +4,8 @@
 
 #include "net/filter/mock_source_stream.h"
 
+#include <utility>
+
 #include "base/logging.h"
 #include "net/base/io_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -25,7 +27,7 @@ MockSourceStream::~MockSourceStream() {
 
 int MockSourceStream::Read(IOBuffer* dest_buffer,
                            int buffer_size,
-                           const CompletionCallback& callback) {
+                           CompletionOnceCallback callback) {
   DCHECK(!awaiting_completion_);
   DCHECK(!results_.empty());
 
@@ -38,7 +40,7 @@ int MockSourceStream::Read(IOBuffer* dest_buffer,
     awaiting_completion_ = true;
     dest_buffer_ = dest_buffer;
     dest_buffer_size_ = buffer_size;
-    callback_ = callback;
+    callback_ = std::move(callback);
     return ERR_IO_PENDING;
   }
 
@@ -93,7 +95,7 @@ void MockSourceStream::CompleteNextRead() {
   DCHECK_GE(dest_buffer_size_, r.len);
   memcpy(dest_buffer_->data(), r.data, r.len);
   dest_buffer_ = nullptr;
-  callback_.Run(r.error == OK ? r.len : r.error);
+  std::move(callback_).Run(r.error == OK ? r.len : r.error);
 }
 
 }  // namespace net

net/filter/mock_source_stream.h

@@ -10,7 +10,7 @@
 #include "base/containers/queue.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/completion_callback.h"
+#include "net/base/completion_once_callback.h"
 #include "net/base/net_errors.h"
 #include "net/filter/source_stream.h"
 
@@ -33,7 +33,7 @@ class MockSourceStream : public SourceStream {
   // SourceStream implementation
   int Read(IOBuffer* dest_buffer,
            int buffer_size,
-           const CompletionCallback& callback) override;
+           CompletionOnceCallback callback) override;
   std::string Description() const override;
 
   // Enqueues a result to be returned by |Read|. This method does not make a
@@ -72,7 +72,7 @@ class MockSourceStream : public SourceStream {
   base::queue<QueuedResult> results_;
   bool awaiting_completion_;
   scoped_refptr<IOBuffer> dest_buffer_;
-  CompletionCallback callback_;
+  CompletionOnceCallback callback_;
   int dest_buffer_size_;
 
   DISALLOW_COPY_AND_ASSIGN(MockSourceStream);

net/filter/source_stream.h

@@ -10,7 +10,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/completion_callback.h"
+#include "net/base/completion_once_callback.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_export.h"
 
@@ -48,7 +48,7 @@ class NET_EXPORT_PRIVATE SourceStream {
   // asynchronously to ensure it does not get freed mid-read.
   virtual int Read(IOBuffer* dest_buffer,
                    int buffer_size,
-                   const CompletionCallback& callback) = 0;
+                   CompletionOnceCallback callback) = 0;
 
   // Returns a string that represents stream. This is for UMA and NetLog
   // logging.

net/tools/content_decoder_tool/content_decoder_tool.cc

@@ -9,6 +9,7 @@
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "net/base/completion_once_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/test_completion_callback.h"
 #include "net/filter/brotli_source_stream.h"
@@ -35,7 +36,7 @@ class StdinSourceStream : public SourceStream {
   // SourceStream implementation.
   int Read(IOBuffer* dest_buffer,
            int buffer_size,
-           const CompletionCallback& callback) override {
+           CompletionOnceCallback callback) override {
     if (input_stream_->eof())
       return OK;
     if (input_stream_) {

net/url_request/url_request_job.cc

@@ -63,9 +63,10 @@ class URLRequestJob::URLRequestJobSourceStream : public SourceStream {
   // SourceStream implementation:
   int Read(IOBuffer* dest_buffer,
            int buffer_size,
-           const CompletionCallback& callback) override {
+           CompletionOnceCallback callback) override {
     DCHECK(job_);
-    return job_->ReadRawDataHelper(dest_buffer, buffer_size, callback);
+    return job_->ReadRawDataHelper(dest_buffer, buffer_size,
+                                   std::move(callback));
   }
 
   std::string Description() const override { return std::string(); }
@@ -512,7 +513,7 @@ void URLRequestJob::ReadRawDataComplete(int result) {
   // Notify SourceStream.
   DCHECK(!read_raw_callback_.is_null());
 
-  base::ResetAndReturn(&read_raw_callback_).Run(result);
+  std::move(read_raw_callback_).Run(result);
   // |this| may be destroyed at this point.
 }
 
@@ -657,7 +658,7 @@ void URLRequestJob::SourceStreamReadComplete(bool synchronous, int result) {
 
 int URLRequestJob::ReadRawDataHelper(IOBuffer* buf,
                                      int buf_size,
-                                     const CompletionCallback& callback) {
+                                     CompletionOnceCallback callback) {
   DCHECK(!raw_read_buffer_);
 
   // Keep a pointer to the read buffer, so URLRequestJob::GatherRawReadStats()
@@ -673,7 +674,7 @@ int URLRequestJob::ReadRawDataHelper(IOBuffer* buf,
     // GatherRawReadStats so we can account for the completed read.
     GatherRawReadStats(result);
   } else {
-    read_raw_callback_ = callback;
+    read_raw_callback_ = std::move(callback);
   }
   return result;
 }

net/url_request/url_request_job.h

@@ -15,6 +15,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "base/power_monitor/power_observer.h"
+#include "net/base/completion_once_callback.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_states.h"
 #include "net/base/net_error_details.h"
@@ -359,7 +360,7 @@ class NET_EXPORT URLRequestJob : public base::PowerObserver {
   // synchronously.
   int ReadRawDataHelper(IOBuffer* buf,
                         int buf_size,
-                        const CompletionCallback& callback);
+                        CompletionOnceCallback callback);
 
   // Returns OK if |new_url| is a valid redirect target and an error code
   // otherwise.
@@ -455,7 +456,7 @@ class NET_EXPORT URLRequestJob : public base::PowerObserver {
 
   // Non-null if ReadRawData() returned ERR_IO_PENDING, and the read has not
   // completed.
-  CompletionCallback read_raw_callback_;
+  CompletionOnceCallback read_raw_callback_;
 
   base::WeakPtrFactory<URLRequestJob> weak_factory_;