1 files changed, 2 insertions, 26 deletions
diff --git a/chromium/content/browser/renderer_host/render_message_filter.cc b/chromium/content/browser/renderer_host/render_message_filter.cc
index c12556a65ba..765a4664465 100644
--- a/chromium/content/browser/renderer_host/render_message_filter.cc
+++ b/chromium/content/browser/renderer_host/render_message_filter.cc
@@ -40,7 +40,6 @@
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_helper.h"
 #include "content/browser/resource_context_impl.h"
-#include "content/common/cache_storage/cache_storage_types.h"
 #include "content/common/content_constants_internal.h"
 #include "content/common/render_message_filter.mojom.h"
 #include "content/common/view_messages.h"
@@ -88,23 +87,6 @@ namespace {
 
 const uint32_t kRenderFilteredMessageClasses[] = {ViewMsgStart};
 
-#if defined(OS_MACOSX)
-void ResizeHelperHandleMsgOnUIThread(int render_process_id,
-                                     const IPC::Message& message) {
-  RenderProcessHost* host = RenderProcessHost::FromID(render_process_id);
-  if (host)
-    host->OnMessageReceived(message);
-}
-
-void ResizeHelperPostMsgToUIThread(int render_process_id,
-                                   const IPC::Message& msg) {
-  ui::WindowResizeHelperMac::Get()->task_runner()->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(ResizeHelperHandleMsgOnUIThread, render_process_id, msg),
-      base::TimeDelta());
-}
-#endif
-
 void NoOpCacheStorageErrorCallback(CacheStorageCacheHandle cache_handle,
                                    CacheStorageError error) {}
 
@@ -144,13 +126,6 @@ RenderMessageFilter::~RenderMessageFilter() {
 bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RenderMessageFilter, message)
-#if defined(OS_MACOSX)
-    // On Mac, ViewHostMsg_ResizeOrRepaint_ACK needs to be handled in a nested
-    // message loop during resize.
-    IPC_MESSAGE_HANDLER_GENERIC(
-        ViewHostMsg_ResizeOrRepaint_ACK,
-        ResizeHelperPostMsgToUIThread(render_process_id_, message))
-#endif
     IPC_MESSAGE_HANDLER(ViewHostMsg_MediaLogEvents, OnMediaLogEvents)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -267,7 +242,8 @@ void RenderMessageFilter::DidGenerateCacheableMetadataInCacheStorage(
     memcpy(buf->data(), &data.front(), data.size());
 
   cache_storage_context_->cache_manager()->OpenCache(
-      cache_storage_origin, cache_storage_cache_name,
+      cache_storage_origin, CacheStorageOwner::kCacheAPI,
+      cache_storage_cache_name,
       base::BindOnce(&RenderMessageFilter::OnCacheStorageOpenCallback,
                      weak_ptr_factory_.GetWeakPtr(), url,
                      expected_response_time, buf, data.size()));