BASELINE: Update Chromium to 70.0.3538.78

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

1 files changed, 10 insertions, 6 deletions

diff --git a/chromium/net/tools/cachetool/cachetool.cc b/chromium/net/tools/cachetool/cachetool.cc
index 3a6468f0138..1b94ba844b9 100644
--- a/chromium/net/tools/cachetool/cachetool.cc
+++ b/chromium/net/tools/cachetool/cachetool.cc
@@ -18,7 +18,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
-#include "base/task_scheduler/task_scheduler.h"
+#include "base/task/task_scheduler/task_scheduler.h"
 #include "net/base/io_buffer.h"
 #include "net/base/test_completion_callback.h"
 #include "net/disk_cache/disk_cache.h"
@@ -322,7 +322,8 @@ bool GetResponseInfoForEntry(disk_cache::Entry* entry,
   int size = entry->GetDataSize(kResponseInfoIndex);
   if (size == 0)
     return false;
-  scoped_refptr<net::IOBuffer> buffer = new net::IOBufferWithSize(size);
+  scoped_refptr<net::IOBuffer> buffer =
+      base::MakeRefCounted<net::IOBufferWithSize>(size);
   net::TestCompletionCallback cb;
 
   int bytes_read = 0;
@@ -357,7 +358,7 @@ std::string GetMD5ForResponseBody(disk_cache::Entry* entry) {
 
   const int kInitBufferSize = 80 * 1024;
   scoped_refptr<net::IOBuffer> buffer =
-      new net::IOBufferWithSize(kInitBufferSize);
+      base::MakeRefCounted<net::IOBufferWithSize>(kInitBufferSize);
   net::TestCompletionCallback cb;
 
   base::MD5Context ctx;
@@ -482,7 +483,8 @@ scoped_refptr<net::GrowableIOBuffer> GetStreamForKeyBuffer(
   }
 
   const int kInitBufferSize = 8192;
-  scoped_refptr<net::GrowableIOBuffer> buffer(new net::GrowableIOBuffer());
+  scoped_refptr<net::GrowableIOBuffer> buffer =
+      base::MakeRefCounted<net::GrowableIOBuffer>();
   buffer->SetCapacity(kInitBufferSize);
   while (true) {
     rv = cache_entry->ReadData(index, buffer->offset(), buffer.get(),
@@ -555,7 +557,8 @@ void UpdateRawResponseHeaders(CommandMarshal* command_marshal) {
     std::cerr << "WARNING: Truncated HTTP response." << std::endl;
 
   response_info.headers = new net::HttpResponseHeaders(raw_headers);
-  scoped_refptr<net::PickledIOBuffer> data(new net::PickledIOBuffer());
+  scoped_refptr<net::PickledIOBuffer> data =
+      base::MakeRefCounted<net::PickledIOBuffer>();
   response_info.Persist(data->pickle(), false, false);
   data->Done();
   Entry* cache_entry;
@@ -585,7 +588,8 @@ void DeleteStreamForKey(CommandMarshal* command_marshal) {
   if (cb.GetResult(rv) != net::OK)
     return command_marshal->ReturnFailure("Couldn't find key's entry.");
 
-  scoped_refptr<net::StringIOBuffer> buffer(new net::StringIOBuffer(""));
+  scoped_refptr<net::StringIOBuffer> buffer =
+      base::MakeRefCounted<net::StringIOBuffer>("");
   rv = cache_entry->WriteData(index, 0, buffer.get(), 0, cb.callback(), true);
   if (cb.GetResult(rv) != net::OK)
     return command_marshal->ReturnFailure("Couldn't delete key stream.");