1 files changed, 8 insertions, 5 deletions
diff --git a/chromium/content/browser/loader/resource_message_filter.cc b/chromium/content/browser/loader/resource_message_filter.cc
index c3f30ff796e..137029cf644 100644
--- a/chromium/content/browser/loader/resource_message_filter.cc
+++ b/chromium/content/browser/loader/resource_message_filter.cc
@@ -7,6 +7,8 @@
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
+#include "content/browser/service_worker/service_worker_context_wrapper.h"
+#include "content/common/resource_messages.h"
 #include "content/public/browser/resource_context.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 
@@ -18,12 +20,15 @@ ResourceMessageFilter::ResourceMessageFilter(
     ChromeAppCacheService* appcache_service,
     ChromeBlobStorageContext* blob_storage_context,
     fileapi::FileSystemContext* file_system_context,
+    ServiceWorkerContextWrapper* service_worker_context,
     const GetContextsCallback& get_contexts_callback)
-    : child_id_(child_id),
+    : BrowserMessageFilter(ResourceMsgStart),
+      child_id_(child_id),
       process_type_(process_type),
       appcache_service_(appcache_service),
       blob_storage_context_(blob_storage_context),
       file_system_context_(file_system_context),
+      service_worker_context_(service_worker_context),
       get_contexts_callback_(get_contexts_callback),
       weak_ptr_factory_(this) {
 }
@@ -37,10 +42,8 @@ void ResourceMessageFilter::OnChannelClosing() {
   ResourceDispatcherHostImpl::Get()->CancelRequestsForProcess(child_id_);
 }
 
-bool ResourceMessageFilter::OnMessageReceived(const IPC::Message& message,
-                                              bool* message_was_ok) {
-  return ResourceDispatcherHostImpl::Get()->OnMessageReceived(
-      message, this, message_was_ok);
+bool ResourceMessageFilter::OnMessageReceived(const IPC::Message& message) {
+  return ResourceDispatcherHostImpl::Get()->OnMessageReceived(message, this);
 }
 
 void ResourceMessageFilter::GetContexts(