From 2a19c63448c84c1805fb1a585c3651318bb86ca7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 28 Aug 2018 15:28:34 +0200 Subject: BASELINE: Update Chromium to 69.0.3497.70 Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0 Reviewed-by: Allan Sandfeld Jensen --- chromium/net/http/http_transaction_test_util.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'chromium/net/http/http_transaction_test_util.h') diff --git a/chromium/net/http/http_transaction_test_util.h b/chromium/net/http/http_transaction_test_util.h index bdca109c22d..745a31f1b9d 100644 --- a/chromium/net/http/http_transaction_test_util.h +++ b/chromium/net/http/http_transaction_test_util.h @@ -15,6 +15,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" +#include "net/base/completion_once_callback.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" #include "net/base/net_error_details.h" @@ -187,23 +188,23 @@ class MockNetworkTransaction ~MockNetworkTransaction() override; int Start(const HttpRequestInfo* request, - const CompletionCallback& callback, + CompletionOnceCallback callback, const NetLogWithSource& net_log) override; - int RestartIgnoringLastError(const CompletionCallback& callback) override; + int RestartIgnoringLastError(CompletionOnceCallback callback) override; int RestartWithCertificate(scoped_refptr client_cert, scoped_refptr client_private_key, - const CompletionCallback& callback) override; + CompletionOnceCallback callback) override; int RestartWithAuth(const AuthCredentials& credentials, - const CompletionCallback& callback) override; + CompletionOnceCallback callback) override; bool IsReadyToRestartForAuth() override; int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) override; + CompletionOnceCallback callback) override; void PopulateNetErrorDetails(NetErrorDetails* details) const override; void StopCaching() override; @@ -260,10 +261,10 @@ class MockNetworkTransaction private: int StartInternal(const HttpRequestInfo* request, - const CompletionCallback& callback, + CompletionOnceCallback callback, const NetLogWithSource& net_log); - void CallbackLater(const CompletionCallback& callback, int result); - void RunCallback(const CompletionCallback& callback, int result); + void CallbackLater(CompletionOnceCallback callback, int result); + void RunCallback(CompletionOnceCallback callback, int result); const HttpRequestInfo* request_; HttpResponseInfo response_; @@ -288,7 +289,7 @@ class MockNetworkTransaction bool done_reading_called_; bool reading_; - CompletionCallback resume_start_callback_; // used for pause and restart. + CompletionOnceCallback resume_start_callback_; // used for pause and restart. base::WeakPtrFactory weak_factory_; -- cgit v1.2.1