BASELINE: Update Chromium to 92.0.4515.166

Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364

1 files changed, 4 insertions, 6 deletions

diff --git a/chromium/net/http/mock_http_cache.cc b/chromium/net/http/mock_http_cache.cc
index 541dce74fcc..e6ea9bcedaf 100644
--- a/chromium/net/http/mock_http_cache.cc
+++ b/chromium/net/http/mock_http_cache.cc
@@ -436,13 +436,10 @@ disk_cache::EntryResult MockDiskCache::OpenOrCreateEntry(
     net::RequestPriority request_priority,
     EntryResultCallback callback) {
   DCHECK(!callback.is_null());
-  base::RepeatingCallback<void(EntryResult)> copyable_callback;
-  if (callback)
-    copyable_callback = base::AdaptCallbackForRepeating(std::move(callback));
 
   if (force_fail_callback_later_) {
     CallbackLater(base::BindOnce(
-        copyable_callback,
+        std::move(callback),
         EntryResult::MakeError(ERR_CACHE_OPEN_OR_CREATE_FAILURE)));
     return EntryResult::MakeError(ERR_IO_PENDING);
   }
@@ -453,12 +450,13 @@ disk_cache::EntryResult MockDiskCache::OpenOrCreateEntry(
   EntryResult result;
 
   // First try opening the entry.
-  result = OpenEntry(key, request_priority, copyable_callback);
+  auto split_callback = base::SplitOnceCallback(std::move(callback));
+  result = OpenEntry(key, request_priority, std::move(split_callback.first));
   if (result.net_error() == OK || result.net_error() == ERR_IO_PENDING)
     return result;
 
   // Unable to open, try creating the entry.
-  result = CreateEntry(key, request_priority, copyable_callback);
+  result = CreateEntry(key, request_priority, std::move(split_callback.second));
   if (result.net_error() == OK || result.net_error() == ERR_IO_PENDING)
     return result;