Revert 258831 "Revert 258727 "Implement ServiceWorker::postMessage()""

content/browser/renderer_host/render_process_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #include <algorithm>
@@ skipping 691 matching lines @@
   AddFilter(new AppCacheDispatcherHost(
       storage_partition_impl_->GetAppCacheService(),
       GetID()));
   AddFilter(new ClipboardMessageFilter);
   AddFilter(new DOMStorageMessageFilter(
       GetID(),
       storage_partition_impl_->GetDOMStorageContext()));
   AddFilter(new IndexedDBDispatcherHost(
       storage_partition_impl_->GetIndexedDBContext()));
 
-  scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter =
-      new ServiceWorkerDispatcherHost(GetID());
-  service_worker_filter->Init(
-      storage_partition_impl_->GetServiceWorkerContext());
-  AddFilter(service_worker_filter);
-
   if (IsGuest()) {
     if (!g_browser_plugin_geolocation_context.Get().get()) {
       g_browser_plugin_geolocation_context.Get() =
           new BrowserPluginGeolocationPermissionContext();
     }
     geolocation_dispatcher_host_ = GeolocationDispatcherHost::New(
         GetID(), g_browser_plugin_geolocation_context.Get().get());
   } else {
     geolocation_dispatcher_host_ = GeolocationDispatcherHost::New(
         GetID(), browser_context->GetGeolocationPermissionContext());
@@ skipping 57 matching lines @@
           base::Bind(&GetRequestContext, request_context,
                      media_request_context, ResourceType::SUB_RESOURCE));
 
   AddFilter(new WebSocketDispatcherHost(websocket_request_context_callback));
 
   message_port_message_filter_ = new MessagePortMessageFilter(
       base::Bind(&RenderWidgetHelper::GetNextRoutingID,
                  base::Unretained(widget_helper_.get())));
   AddFilter(message_port_message_filter_);
 
+  scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter =
+      new ServiceWorkerDispatcherHost(GetID(), message_port_message_filter_);
+  service_worker_filter->Init(
+      storage_partition_impl_->GetServiceWorkerContext());
+  AddFilter(service_worker_filter);
+
   // If "--enable-embedded-shared-worker" is set, we use
   // SharedWorkerMessageFilter in stead of WorkerMessageFilter.
   if (WorkerService::EmbeddedSharedWorkerEnabled()) {
     AddFilter(new SharedWorkerMessageFilter(
         GetID(),
         resource_context,
         WorkerStoragePartition(
             storage_partition_impl_->GetURLRequestContext(),
             storage_partition_impl_->GetMediaURLRequestContext(),
             storage_partition_impl_->GetAppCacheService(),
@@ skipping 1367 matching lines @@
         child_process_launcher_->GetHandle();
     base::PlatformFile client_file =
         PlatformFileFromScopedPlatformHandle(channel_pair.PassClientHandle());
     Send(new MojoMsg_ChannelCreated(
              IPC::GetFileHandleForProcess(client_file, process_handle, true)));
   }
 }
 #endif
 
 }  // namespace content