BASELINE: Update Chromium to 70.0.3538.78

Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

3 files changed, 28 insertions, 27 deletions

diff --git a/chromium/net/server/http_connection.cc b/chromium/net/server/http_connection.cc
index 99324350c9e..a42f23bcf2f 100644
--- a/chromium/net/server/http_connection.cc
+++ b/chromium/net/server/http_connection.cc
@@ -13,7 +13,7 @@
 namespace net {
 
 HttpConnection::ReadIOBuffer::ReadIOBuffer()
-    : base_(new GrowableIOBuffer()),
+    : base_(base::MakeRefCounted<GrowableIOBuffer>()),
       max_buffer_size_(kDefaultMaxBufferSize) {
   SetCapacity(kInitialBufSize);
 }
@@ -153,8 +153,8 @@ int HttpConnection::QueuedWriteIOBuffer::GetSizeToWrite() const {
 HttpConnection::HttpConnection(int id, std::unique_ptr<StreamSocket> socket)
     : id_(id),
       socket_(std::move(socket)),
-      read_buf_(new ReadIOBuffer()),
-      write_buf_(new QueuedWriteIOBuffer()) {}
+      read_buf_(base::MakeRefCounted<ReadIOBuffer>()),
+      write_buf_(base::MakeRefCounted<QueuedWriteIOBuffer>()) {}
 
 HttpConnection::~HttpConnection() = default;
 
diff --git a/chromium/net/server/http_connection_unittest.cc b/chromium/net/server/http_connection_unittest.cc
index 1b6af927c5d..d1eb56147b1 100644
--- a/chromium/net/server/http_connection_unittest.cc
+++ b/chromium/net/server/http_connection_unittest.cc
@@ -22,8 +22,8 @@ std::string GetTestString(int size) {
 }
 
 TEST(HttpConnectionTest, ReadIOBuffer_SetCapacity) {
-  scoped_refptr<HttpConnection::ReadIOBuffer> buffer(
-      new HttpConnection::ReadIOBuffer);
+  scoped_refptr<HttpConnection::ReadIOBuffer> buffer =
+      base::MakeRefCounted<HttpConnection::ReadIOBuffer>();
   EXPECT_EQ(HttpConnection::ReadIOBuffer::kInitialBufSize + 0,
             buffer->GetCapacity());
   EXPECT_EQ(HttpConnection::ReadIOBuffer::kInitialBufSize + 0,
@@ -38,8 +38,8 @@ TEST(HttpConnectionTest, ReadIOBuffer_SetCapacity) {
 }
 
 TEST(HttpConnectionTest, ReadIOBuffer_SetCapacity_WithData) {
-  scoped_refptr<HttpConnection::ReadIOBuffer> buffer(
-      new HttpConnection::ReadIOBuffer);
+  scoped_refptr<HttpConnection::ReadIOBuffer> buffer =
+      base::MakeRefCounted<HttpConnection::ReadIOBuffer>();
   EXPECT_EQ(HttpConnection::ReadIOBuffer::kInitialBufSize + 0,
             buffer->GetCapacity());
   EXPECT_EQ(HttpConnection::ReadIOBuffer::kInitialBufSize + 0,
@@ -71,8 +71,8 @@ TEST(HttpConnectionTest, ReadIOBuffer_SetCapacity_WithData) {
 }
 
 TEST(HttpConnectionTest, ReadIOBuffer_IncreaseCapacity) {
-  scoped_refptr<HttpConnection::ReadIOBuffer> buffer(
-      new HttpConnection::ReadIOBuffer);
+  scoped_refptr<HttpConnection::ReadIOBuffer> buffer =
+      base::MakeRefCounted<HttpConnection::ReadIOBuffer>();
   EXPECT_TRUE(buffer->IncreaseCapacity());
   const int kExpectedInitialBufSize =
       HttpConnection::ReadIOBuffer::kInitialBufSize *
@@ -106,8 +106,8 @@ TEST(HttpConnectionTest, ReadIOBuffer_IncreaseCapacity) {
 }
 
 TEST(HttpConnectionTest, ReadIOBuffer_IncreaseCapacity_WithData) {
-  scoped_refptr<HttpConnection::ReadIOBuffer> buffer(
-      new HttpConnection::ReadIOBuffer);
+  scoped_refptr<HttpConnection::ReadIOBuffer> buffer =
+      base::MakeRefCounted<HttpConnection::ReadIOBuffer>();
   EXPECT_TRUE(buffer->IncreaseCapacity());
   const int kExpectedInitialBufSize =
       HttpConnection::ReadIOBuffer::kInitialBufSize *
@@ -144,8 +144,8 @@ TEST(HttpConnectionTest, ReadIOBuffer_IncreaseCapacity_WithData) {
 }
 
 TEST(HttpConnectionTest, ReadIOBuffer_DidRead_DidConsume) {
-  scoped_refptr<HttpConnection::ReadIOBuffer> buffer(
-      new HttpConnection::ReadIOBuffer);
+  scoped_refptr<HttpConnection::ReadIOBuffer> buffer =
+      base::MakeRefCounted<HttpConnection::ReadIOBuffer>();
   const char* start_of_buffer = buffer->StartOfBuffer();
   EXPECT_EQ(start_of_buffer, buffer->data());
 
@@ -230,8 +230,8 @@ TEST(HttpConnectionTest, ReadIOBuffer_DidRead_DidConsume) {
 }
 
 TEST(HttpConnectionTest, QueuedWriteIOBuffer_Append_DidConsume) {
-  scoped_refptr<HttpConnection::QueuedWriteIOBuffer> buffer(
-      new HttpConnection::QueuedWriteIOBuffer());
+  scoped_refptr<HttpConnection::QueuedWriteIOBuffer> buffer =
+      base::MakeRefCounted<HttpConnection::QueuedWriteIOBuffer>();
   EXPECT_TRUE(buffer->IsEmpty());
   EXPECT_EQ(0, buffer->GetSizeToWrite());
   EXPECT_EQ(0, buffer->total_size());
@@ -288,8 +288,8 @@ TEST(HttpConnectionTest, QueuedWriteIOBuffer_Append_DidConsume) {
 }
 
 TEST(HttpConnectionTest, QueuedWriteIOBuffer_TotalSizeLimit) {
-  scoped_refptr<HttpConnection::QueuedWriteIOBuffer> buffer(
-      new HttpConnection::QueuedWriteIOBuffer());
+  scoped_refptr<HttpConnection::QueuedWriteIOBuffer> buffer =
+      base::MakeRefCounted<HttpConnection::QueuedWriteIOBuffer>();
   EXPECT_EQ(HttpConnection::QueuedWriteIOBuffer::kDefaultMaxBufferSize + 0,
             buffer->max_buffer_size());
 
@@ -331,8 +331,8 @@ TEST(HttpConnectionTest, QueuedWriteIOBuffer_DataPointerStability) {
   // This is a regression test that makes sure that QueuedWriteIOBuffer deals
   // with base::queue's semantics differences vs. std::queue right, and still
   // makes sure our data() pointers are stable.
-  scoped_refptr<HttpConnection::QueuedWriteIOBuffer> buffer(
-      new HttpConnection::QueuedWriteIOBuffer());
+  scoped_refptr<HttpConnection::QueuedWriteIOBuffer> buffer =
+      base::MakeRefCounted<HttpConnection::QueuedWriteIOBuffer>();
 
   // We append a short string to make it fit within any short string
   // optimization, so that if the underlying queue moves the std::string,
diff --git a/chromium/net/server/http_server_unittest.cc b/chromium/net/server/http_server_unittest.cc
index 6bff423d411..ca6062aeeb3 100644
--- a/chromium/net/server/http_server_unittest.cc
+++ b/chromium/net/server/http_server_unittest.cc
@@ -75,8 +75,8 @@ class TestHttpClient {
   }
 
   void Send(const std::string& data) {
-    write_buffer_ =
-        new DrainableIOBuffer(new StringIOBuffer(data), data.length());
+    write_buffer_ = base::MakeRefCounted<DrainableIOBuffer>(
+        base::MakeRefCounted<StringIOBuffer>(data), data.length());
     Write();
   }
 
@@ -85,7 +85,7 @@ class TestHttpClient {
     message->clear();
     while (total_bytes_received < expected_bytes) {
       TestCompletionCallback callback;
-      ReadInternal(callback.callback());
+      ReadInternal(&callback);
       int bytes_received = callback.WaitForResult();
       if (bytes_received <= 0)
         return false;
@@ -138,12 +138,13 @@ class TestHttpClient {
       Write();
   }
 
-  void ReadInternal(const CompletionCallback& callback) {
-    read_buffer_ = new IOBufferWithSize(kMaxExpectedResponseLength);
-    int result =
-        socket_->Read(read_buffer_.get(), kMaxExpectedResponseLength, callback);
+  void ReadInternal(TestCompletionCallback* callback) {
+    read_buffer_ =
+        base::MakeRefCounted<IOBufferWithSize>(kMaxExpectedResponseLength);
+    int result = socket_->Read(read_buffer_.get(), kMaxExpectedResponseLength,
+                               callback->callback());
     if (result != ERR_IO_PENDING)
-      callback.Run(result);
+      callback->callback().Run(result);
   }
 
   bool IsCompleteResponse(const std::string& response) {