Revert of ServiceWorker: Introduce SWMessageSender in order to mock IPC messaging

content/renderer/service_worker/service_worker_script_context.cc

 // Copyright 2014 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.
 
 #include "content/renderer/service_worker/service_worker_script_context.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "content/child/notifications/notification_data_conversions.h"
-#include "content/child/service_worker/service_worker_message_sender.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/message_port_messages.h"
 #include "content/common/service_worker/service_worker_messages.h"
 #include "content/public/common/referrer.h"
 #include "content/renderer/service_worker/embedded_worker_context_client.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/WebCrossOriginServiceWorkerClient.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerClientQueryOptions.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerRequest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationData.h"
 #include "third_party/WebKit/public/web/WebServiceWorkerContextClient.h"
 #include "third_party/WebKit/public/web/WebServiceWorkerContextProxy.h"
 
 namespace content {
 
 namespace {
 
 void SendPostMessageToClientOnMainThread(
-    ServiceWorkerMessageSender* sender,
+    ThreadSafeSender* sender,
     int routing_id,
     const std::string& uuid,
     const base::string16& message,
     scoped_ptr<blink::WebMessagePortChannelArray> channels) {
   sender->Send(new ServiceWorkerHostMsg_PostMessageToClient(
       routing_id, uuid, message,
       WebMessagePortChannelImpl::ExtractMessagePortIDs(channels.release())));
 }
 
 void SendCrossOriginMessageToClientOnMainThread(
-    ServiceWorkerMessageSender* sender,
+    ThreadSafeSender* sender,
     int message_port_id,
     const base::string16& message,
     scoped_ptr<blink::WebMessagePortChannelArray> channels) {
   sender->Send(new MessagePortHostMsg_PostMessage(
       message_port_id,
       MessagePortMessage(message),
                          WebMessagePortChannelImpl::ExtractMessagePortIDs(
                              channels.release())));
 }
 
@@ skipping 201 matching lines @@
     const base::string16& uuid,
     const base::string16& message,
     scoped_ptr<blink::WebMessagePortChannelArray> channels) {
   // This may send channels for MessagePorts, and all internal book-keeping
   // messages for MessagePort (e.g. QueueMessages) are sent from main thread
   // (with thread hopping), so we need to do the same thread hopping here not
   // to overtake those messages.
   embedded_context_->main_thread_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&SendPostMessageToClientOnMainThread,
-                 make_scoped_refptr(embedded_context_->sender()),
+                 make_scoped_refptr(embedded_context_->thread_safe_sender()),
                  GetRoutingID(),
                  base::UTF16ToUTF8(uuid),
                  message, base::Passed(&channels)));
 }
 
 void ServiceWorkerScriptContext::PostCrossOriginMessageToClient(
     const blink::WebCrossOriginServiceWorkerClient& client,
     const base::string16& message,
     scoped_ptr<blink::WebMessagePortChannelArray> channels) {
   // This may send channels for MessagePorts, and all internal book-keeping
   // messages for MessagePort (e.g. QueueMessages) are sent from main thread
   // (with thread hopping), so we need to do the same thread hopping here not
   // to overtake those messages.
   embedded_context_->main_thread_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&SendCrossOriginMessageToClientOnMainThread,
-                 make_scoped_refptr(embedded_context_->sender()),
+                 make_scoped_refptr(embedded_context_->thread_safe_sender()),
                  client.clientID, message, base::Passed(&channels)));
 }
 
 void ServiceWorkerScriptContext::FocusClient(
     const base::string16& uuid,
     blink::WebServiceWorkerClientCallbacks* callback) {
   DCHECK(callback);
   int request_id = pending_client_callbacks_.Add(callback);
   Send(new ServiceWorkerHostMsg_FocusClient(GetRoutingID(), request_id,
                                             base::UTF16ToUTF8(uuid)));
@@ skipping 288 matching lines @@
       new blink::WebServiceWorkerError(error_type, message));
   callbacks->onError(error.release());
   pending_claim_clients_callbacks_.Remove(request_id);
 }
 
 void ServiceWorkerScriptContext::OnPing() {
   Send(new ServiceWorkerHostMsg_Pong(GetRoutingID()));
 }
 
 }  // namespace content