BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 9 insertions, 10 deletions

diff --git a/chromium/net/server/http_server_unittest.cc b/chromium/net/server/http_server_unittest.cc
index f1045ae5700..6bff423d411 100644
--- a/chromium/net/server/http_server_unittest.cc
+++ b/chromium/net/server/http_server_unittest.cc
@@ -42,6 +42,7 @@
 #include "net/socket/tcp_client_socket.h"
 #include "net/socket/tcp_server_socket.h"
 #include "net/test/gtest_util.h"
+#include "net/test/test_with_scoped_task_environment.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
@@ -167,7 +168,7 @@ class TestHttpClient {
 
 }  // namespace
 
-class HttpServerTest : public testing::Test,
+class HttpServerTest : public TestWithScopedTaskEnvironment,
                        public HttpServer::Delegate {
  public:
   HttpServerTest()
@@ -548,7 +549,7 @@ class MockStreamSocket : public StreamSocket {
         read_buf_len_(0) {}
 
   // StreamSocket
-  int Connect(const CompletionCallback& callback) override {
+  int Connect(CompletionOnceCallback callback) override {
     return ERR_NOT_IMPLEMENTED;
   }
   void Disconnect() override {
@@ -556,7 +557,7 @@ class MockStreamSocket : public StreamSocket {
     if (!read_callback_.is_null()) {
       read_buf_ = NULL;
       read_buf_len_ = 0;
-      base::ResetAndReturn(&read_callback_).Run(ERR_CONNECTION_CLOSED);
+      std::move(read_callback_).Run(ERR_CONNECTION_CLOSED);
     }
   }
   bool IsConnected() const override { return connected_; }
@@ -568,8 +569,6 @@ class MockStreamSocket : public StreamSocket {
     return ERR_NOT_IMPLEMENTED;
   }
   const NetLogWithSource& NetLog() const override { return net_log_; }
-  void SetSubresourceSpeculation() override {}
-  void SetOmniboxSpeculation() override {}
   bool WasEverUsed() const override { return true; }
   bool WasAlpnNegotiated() const override { return false; }
   NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; }
@@ -588,14 +587,14 @@ class MockStreamSocket : public StreamSocket {
   // Socket
   int Read(IOBuffer* buf,
            int buf_len,
-           const CompletionCallback& callback) override {
+           CompletionOnceCallback callback) override {
     if (!connected_) {
       return ERR_SOCKET_NOT_CONNECTED;
     }
     if (pending_read_data_.empty()) {
       read_buf_ = buf;
       read_buf_len_ = buf_len;
-      read_callback_ = callback;
+      read_callback_ = std::move(callback);
       return ERR_IO_PENDING;
     }
     DCHECK_GT(buf_len, 0);
@@ -608,7 +607,7 @@ class MockStreamSocket : public StreamSocket {
 
   int Write(IOBuffer* buf,
             int buf_len,
-            const CompletionCallback& callback,
+            CompletionOnceCallback callback,
             const NetworkTrafficAnnotationTag& traffic_annotation) override {
     return ERR_NOT_IMPLEMENTED;
   }
@@ -627,7 +626,7 @@ class MockStreamSocket : public StreamSocket {
     pending_read_data_.assign(data + read_len, data_len - read_len);
     read_buf_ = NULL;
     read_buf_len_ = 0;
-    base::ResetAndReturn(&read_callback_).Run(read_len);
+    std::move(read_callback_).Run(read_len);
   }
 
  private:
@@ -636,7 +635,7 @@ class MockStreamSocket : public StreamSocket {
   bool connected_;
   scoped_refptr<IOBuffer> read_buf_;
   int read_buf_len_;
-  CompletionCallback read_callback_;
+  CompletionOnceCallback read_callback_;
   std::string pending_read_data_;
   NetLogWithSource net_log_;