AppCache: Remove OnceCompletionCallback alias.

This CL removes the content::OnceCompletionCallback alias, and replaces
it with net::CompletionOnceCallback. Explicitly referencing the net::
namespace is intended to be a readability improvement, because it makes
it clear that the callback's int argument follows the //net convention,
where negative values are errors, and non-negative values are byte
counts.

Bug: 1055133
Change-Id: Ie5057f0abe27f97620ce1897ac839e9e1d53bf82
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2069507
Auto-Submit: Victor Costan <pwnall@chromium.org>
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Reviewed-by: Kenichi Ishibashi <bashi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743850}

content/browser/appcache/appcache_response.cc

@@ -30,8 +30,6 @@ namespace content {
 
 namespace {
 
-using OnceCompletionCallback = base::OnceCallback<void(int)>;
-
 // Disk cache entry data indices.
 enum { kResponseInfoIndex, kResponseContentIndex, kResponseMetadataIndex };
 
@@ -114,7 +112,7 @@ void AppCacheResponseIO::InvokeUserCompletionCallback(int result) {
   // so the caller can schedule additional operations in the callback.
   buffer_ = nullptr;
   info_buffer_ = nullptr;
-  OnceCompletionCallback cb = std::move(callback_);
+  net::CompletionOnceCallback cb = std::move(callback_);
   callback_.Reset();
   std::move(cb).Run(result);
 }
@@ -198,7 +196,7 @@ AppCacheResponseReader::AppCacheResponseReader(
 AppCacheResponseReader::~AppCacheResponseReader() = default;
 
 void AppCacheResponseReader::ReadInfo(HttpResponseInfoIOBuffer* info_buf,
-                                      OnceCompletionCallback callback) {
+                                      net::CompletionOnceCallback callback) {
   DCHECK(!callback.is_null());
   DCHECK(!IsReadPending());
   DCHECK(info_buf);
@@ -224,7 +222,7 @@ void AppCacheResponseReader::ContinueReadInfo() {
 
 void AppCacheResponseReader::ReadData(net::IOBuffer* buf,
                                       int buf_len,
-                                      OnceCompletionCallback callback) {
+                                      net::CompletionOnceCallback callback) {
   DCHECK(!callback.is_null());
   DCHECK(!IsReadPending());
   DCHECK(buf);
@@ -329,7 +327,7 @@ AppCacheResponseWriter::AppCacheResponseWriter(
 AppCacheResponseWriter::~AppCacheResponseWriter() = default;
 
 void AppCacheResponseWriter::WriteInfo(HttpResponseInfoIOBuffer* info_buf,
-                                       OnceCompletionCallback callback) {
+                                       net::CompletionOnceCallback callback) {
   DCHECK(!callback.is_null());
   DCHECK(!IsWritePending());
   DCHECK(info_buf);
@@ -361,7 +359,7 @@ void AppCacheResponseWriter::ContinueWriteInfo() {
 
 void AppCacheResponseWriter::WriteData(net::IOBuffer* buf,
                                        int buf_len,
-                                       OnceCompletionCallback callback) {
+                                       net::CompletionOnceCallback callback) {
   DCHECK(!callback.is_null());
   DCHECK(!IsWritePending());
   DCHECK(buf);

content/browser/appcache/appcache_response.h

@@ -29,8 +29,6 @@ class AppCacheStorage;
 
 static const int kUnknownResponseDataSize = -1;
 
-using OnceCompletionCallback = base::OnceCallback<void(int)>;
-
 // Response info for a particular response id. Instances are tracked in
 // the working set.
 class CONTENT_EXPORT AppCacheResponseInfo
@@ -106,7 +104,7 @@ class CONTENT_EXPORT AppCacheResponseIO {
   scoped_refptr<HttpResponseInfoIOBuffer> info_buffer_;
   scoped_refptr<net::IOBuffer> buffer_;
   int buffer_len_;
-  OnceCompletionCallback callback_;
+  net::CompletionOnceCallback callback_;
   net::CompletionOnceCallback open_callback_;
 
  private:
@@ -141,7 +139,7 @@ class CONTENT_EXPORT AppCacheResponseReader : public AppCacheResponseIO {
   // Should only be called where there is no Read operation in progress.
   // (virtual for testing)
   virtual void ReadInfo(HttpResponseInfoIOBuffer* info_buf,
-                        OnceCompletionCallback callback);
+                        net::CompletionOnceCallback callback);
 
   // Reads data from storage. Always returns the result of the read
   // asynchronously through the 'callback'. Returns the number of bytes read
@@ -153,7 +151,7 @@ class CONTENT_EXPORT AppCacheResponseReader : public AppCacheResponseIO {
   // (virtual for testing)
   virtual void ReadData(net::IOBuffer* buf,
                         int buf_len,
-                        OnceCompletionCallback callback);
+                        net::CompletionOnceCallback callback);
 
   // Returns true if there is a read operation, for data or info, pending.
   bool IsReadPending() { return IsIOPending(); }
@@ -202,7 +200,7 @@ class CONTENT_EXPORT AppCacheResponseWriter : public AppCacheResponseIO {
   // Should only be called where there is no Write operation in progress.
   // (virtual for testing)
   virtual void WriteInfo(HttpResponseInfoIOBuffer* info_buf,
-                         OnceCompletionCallback callback);
+                         net::CompletionOnceCallback callback);
 
   // Writes data to storage. Always returns the result of the write
   // asynchronously through the 'callback'. Returns the number of bytes written
@@ -215,7 +213,7 @@ class CONTENT_EXPORT AppCacheResponseWriter : public AppCacheResponseIO {
   // (virtual for testing)
   virtual void WriteData(net::IOBuffer* buf,
                          int buf_len,
-                         OnceCompletionCallback callback);
+                         net::CompletionOnceCallback callback);
 
   // Returns true if there is a write pending.
   bool IsWritePending() { return IsIOPending(); }

content/browser/appcache/appcache_service_impl.cc

@@ -29,6 +29,7 @@
 #include "content/browser/appcache/appcache_storage_impl.h"
 #include "content/browser/loader/navigation_url_loader_impl.h"
 #include "content/public/browser/browser_task_traits.h"
+#include "net/base/completion_once_callback.h"
 #include "net/base/io_buffer.h"
 #include "storage/browser/quota/special_storage_policy.h"
 #include "third_party/blink/public/mojom/appcache/appcache_info.mojom.h"
@@ -39,7 +40,8 @@ namespace content {
 
 class AppCacheServiceImpl::AsyncHelper : public AppCacheStorage::Delegate {
  public:
-  AsyncHelper(AppCacheServiceImpl* service, OnceCompletionCallback callback)
+  AsyncHelper(AppCacheServiceImpl* service,
+              net::CompletionOnceCallback callback)
       : service_(service), callback_(std::move(callback)) {
     service_->pending_helpers_[this] = base::WrapUnique(this);
   }
@@ -65,7 +67,7 @@ class AppCacheServiceImpl::AsyncHelper : public AppCacheStorage::Delegate {
   }
 
   AppCacheServiceImpl* service_;
-  OnceCompletionCallback callback_;
+  net::CompletionOnceCallback callback_;
 };
 
 void AppCacheServiceImpl::AsyncHelper::Cancel() {
@@ -222,7 +224,7 @@ class AppCacheServiceImpl::GetInfoHelper : AsyncHelper {
  public:
   GetInfoHelper(AppCacheServiceImpl* service,
                 AppCacheInfoCollection* collection,
-                OnceCompletionCallback callback)
+                net::CompletionOnceCallback callback)
       : AsyncHelper(service, std::move(callback)), collection_(collection) {}
 
   void Start() override { service_->storage()->GetAllInfo(this); }
@@ -458,8 +460,9 @@ void AppCacheServiceImpl::Reinitialize() {
   Initialize(cache_directory_);
 }
 
-void AppCacheServiceImpl::GetAllAppCacheInfo(AppCacheInfoCollection* collection,
-                                             OnceCompletionCallback callback) {
+void AppCacheServiceImpl::GetAllAppCacheInfo(
+    AppCacheInfoCollection* collection,
+    net::CompletionOnceCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(collection);
   GetInfoHelper* helper =

content/browser/appcache/appcache_service_impl.h

@@ -67,8 +67,6 @@ class CONTENT_EXPORT AppCacheStorageReference
 // on disk.
 class CONTENT_EXPORT AppCacheServiceImpl : public AppCacheService {
  public:
-  using OnceCompletionCallback = base::OnceCallback<void(int)>;
-
   class CONTENT_EXPORT Observer {
    public:
     Observer(const Observer&) = delete;
@@ -112,7 +110,7 @@ class CONTENT_EXPORT AppCacheServiceImpl : public AppCacheService {
 
   // AppCacheService
   void GetAllAppCacheInfo(AppCacheInfoCollection* collection,
-                          OnceCompletionCallback callback) override;
+                          net::CompletionOnceCallback callback) override;
   void DeleteAppCachesForOrigin(const url::Origin& origin,
                                 net::CompletionOnceCallback callback) override;
 

content/browser/appcache/appcache_service_unittest.cc

@@ -51,7 +51,7 @@ class MockResponseReader : public AppCacheResponseReader {
         data_(data),
         data_size_(data_size) {}
   void ReadInfo(HttpResponseInfoIOBuffer* info_buf,
-                OnceCompletionCallback callback) override {
+                net::CompletionOnceCallback callback) override {
     info_buffer_ = info_buf;
     callback_ = std::move(callback);  // Cleared on completion.
 
@@ -62,7 +62,7 @@ class MockResponseReader : public AppCacheResponseReader {
   }
   void ReadData(net::IOBuffer* buf,
                 int buf_len,
-                OnceCompletionCallback callback) override {
+                net::CompletionOnceCallback callback) override {
     buffer_ = buf;
     buffer_len_ = buf_len;
     callback_ = std::move(callback);  // Cleared on completion.

content/browser/service_worker/service_worker_test_utils.cc

@@ -30,6 +30,7 @@
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
+#include "net/base/completion_once_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/test_completion_callback.h"
 #include "net/http/http_response_info.h"
@@ -533,7 +534,7 @@ MockServiceWorkerResponseReader::~MockServiceWorkerResponseReader() {}
 
 void MockServiceWorkerResponseReader::ReadInfo(
     HttpResponseInfoIOBuffer* info_buf,
-    OnceCompletionCallback callback) {
+    net::CompletionOnceCallback callback) {
   DCHECK(!expected_reads_.empty());
   ExpectedRead expected = expected_reads_.front();
   EXPECT_TRUE(expected.info);
@@ -550,7 +551,7 @@ void MockServiceWorkerResponseReader::ReadInfo(
 void MockServiceWorkerResponseReader::ReadData(
     net::IOBuffer* buf,
     int buf_len,
-    OnceCompletionCallback callback) {
+    net::CompletionOnceCallback callback) {
   DCHECK(!expected_reads_.empty());
   ExpectedRead expected = expected_reads_.front();
   EXPECT_FALSE(expected.info);
@@ -615,7 +616,7 @@ void MockServiceWorkerResponseReader::CompletePendingRead() {
   }
   pending_info_ = nullptr;
   pending_buffer_ = nullptr;
-  OnceCompletionCallback callback = std::move(pending_callback_);
+  net::CompletionOnceCallback callback = std::move(pending_callback_);
   pending_callback_.Reset();
   std::move(callback).Run(expected.result);
 }
@@ -629,7 +630,7 @@ MockServiceWorkerResponseWriter::~MockServiceWorkerResponseWriter() = default;
 
 void MockServiceWorkerResponseWriter::WriteInfo(
     HttpResponseInfoIOBuffer* info_buf,
-    OnceCompletionCallback callback) {
+    net::CompletionOnceCallback callback) {
   DCHECK(!expected_writes_.empty());
   ExpectedWrite write = expected_writes_.front();
   EXPECT_TRUE(write.is_info);
@@ -648,7 +649,7 @@ void MockServiceWorkerResponseWriter::WriteInfo(
 void MockServiceWorkerResponseWriter::WriteData(
     net::IOBuffer* buf,
     int buf_len,
-    OnceCompletionCallback callback) {
+    net::CompletionOnceCallback callback) {
   DCHECK(!expected_writes_.empty());
   ExpectedWrite write = expected_writes_.front();
   EXPECT_FALSE(write.is_info);

content/browser/service_worker/service_worker_test_utils.h

@@ -24,6 +24,7 @@
 #include "mojo/public/cpp/bindings/associated_remote.h"
 #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
+#include "net/base/completion_once_callback.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/mojom/service_worker/service_worker_provider.mojom.h"
 #include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h"
@@ -232,10 +233,10 @@ class MockServiceWorkerResponseReader : public ServiceWorkerResponseReader {
 
   // ServiceWorkerResponseReader overrides
   void ReadInfo(HttpResponseInfoIOBuffer* info_buf,
-                OnceCompletionCallback callback) override;
+                net::CompletionOnceCallback callback) override;
   void ReadData(net::IOBuffer* buf,
                 int buf_len,
-                OnceCompletionCallback callback) override;
+                net::CompletionOnceCallback callback) override;
 
   // Test helpers. ExpectReadInfo() and ExpectReadData() give precise control
   // over both the data to be written and the result to return.
@@ -284,7 +285,7 @@ class MockServiceWorkerResponseReader : public ServiceWorkerResponseReader {
   scoped_refptr<net::IOBuffer> pending_buffer_;
   size_t pending_buffer_len_;
   scoped_refptr<HttpResponseInfoIOBuffer> pending_info_;
-  OnceCompletionCallback pending_callback_;
+  net::CompletionOnceCallback pending_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(MockServiceWorkerResponseReader);
 };
@@ -316,10 +317,10 @@ class MockServiceWorkerResponseWriter : public ServiceWorkerResponseWriter {
 
   // ServiceWorkerResponseWriter overrides
   void WriteInfo(HttpResponseInfoIOBuffer* info_buf,
-                 OnceCompletionCallback callback) override;
+                 net::CompletionOnceCallback callback) override;
   void WriteData(net::IOBuffer* buf,
                  int buf_len,
-                 OnceCompletionCallback callback) override;
+                 net::CompletionOnceCallback callback) override;
 
   // Enqueue expected writes.
   void ExpectWriteInfoOk(size_t len, bool async);
@@ -350,7 +351,7 @@ class MockServiceWorkerResponseWriter : public ServiceWorkerResponseWriter {
   size_t info_written_;
   size_t data_written_;
 
-  OnceCompletionCallback pending_callback_;
+  net::CompletionOnceCallback pending_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(MockServiceWorkerResponseWriter);
 };