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

content/renderer/service_worker/embedded_worker_context_client.cc

 // Copyright 2013 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/embedded_worker_context_client.h"
 
 #include <map>
 #include <string>
 
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/pickle.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_local.h"
 #include "base/trace_event/trace_event.h"
 #include "content/child/request_extra_data.h"
 #include "content/child/service_worker/service_worker_dispatcher.h"
-#include "content/child/service_worker/service_worker_message_sender.h"
 #include "content/child/service_worker/service_worker_network_provider.h"
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/child/service_worker/service_worker_registration_handle_reference.h"
 #include "content/child/service_worker/web_service_worker_impl.h"
 #include "content/child/service_worker/web_service_worker_provider_impl.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/worker_task_runner.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
@@ skipping 68 matching lines @@
     int embedded_worker_id,
     int64 service_worker_version_id,
     const GURL& service_worker_scope,
     const GURL& script_url,
     int worker_devtools_agent_route_id)
     : embedded_worker_id_(embedded_worker_id),
       service_worker_version_id_(service_worker_version_id),
       service_worker_scope_(service_worker_scope),
       script_url_(script_url),
       worker_devtools_agent_route_id_(worker_devtools_agent_route_id),
-      sender_(new ServiceWorkerMessageSender(
-          ChildThreadImpl::current()->thread_safe_sender())),
+      sender_(ChildThreadImpl::current()->thread_safe_sender()),
       main_thread_task_runner_(RenderThreadImpl::current()->GetTaskRunner()),
       weak_factory_(this) {
   TRACE_EVENT_ASYNC_BEGIN0("ServiceWorker",
                            "EmbeddedWorkerContextClient::StartingWorkerContext",
                            this);
   TRACE_EVENT_ASYNC_STEP_INTO0(
       "ServiceWorker",
       "EmbeddedWorkerContextClient::StartingWorkerContext",
       this,
       "PrepareWorker");
@@ skipping 156 matching lines @@
 
   Send(new EmbeddedWorkerHostMsg_ReportConsoleMessage(
       embedded_worker_id_, params));
 }
 
 void EmbeddedWorkerContextClient::sendDevToolsMessage(
     int call_id,
     const blink::WebString& message,
     const blink::WebString& state_cookie) {
   DevToolsAgent::SendChunkedProtocolMessage(
-      sender_->thread_safe_sender(), worker_devtools_agent_route_id_,
+      sender_.get(), worker_devtools_agent_route_id_,
       call_id, message.utf8(), state_cookie.utf8());
 }
 
 void EmbeddedWorkerContextClient::didHandleActivateEvent(
     int request_id,
     blink::WebServiceWorkerEventResult result) {
   DCHECK(script_context_);
   script_context_->DidHandleActivateEvent(request_id, result);
 }
 
@@ skipping 83 matching lines @@
   return new WebServiceWorkerNetworkProviderImpl();
 }
 
 blink::WebServiceWorkerProvider*
 EmbeddedWorkerContextClient::createServiceWorkerProvider() {
   DCHECK(main_thread_task_runner_->RunsTasksOnCurrentThread());
   DCHECK(provider_context_);
 
   // Blink is responsible for deleting the returned object.
   return new WebServiceWorkerProviderImpl(
-      sender()->thread_safe_sender(), provider_context_.get());
+      thread_safe_sender(), provider_context_.get());
 }
 
 void EmbeddedWorkerContextClient::postMessageToClient(
     const blink::WebString& uuid,
     const blink::WebString& message,
     blink::WebMessagePortChannelArray* channels) {
   DCHECK(script_context_);
   script_context_->PostMessageToClient(
       uuid, message, make_scoped_ptr(channels));
 }
@@ skipping 50 matching lines @@
   DCHECK(script_context_);
 
   ServiceWorkerRegistrationObjectInfo info;
   ServiceWorkerVersionAttributes attrs;
   bool found =
       provider_context_->GetRegistrationInfoAndVersionAttributes(&info, &attrs);
   if (!found)
     return;  // Cannot be associated with a registration in some tests.
 
   ServiceWorkerDispatcher* dispatcher =
-      ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance(sender());
+      ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance(
+          thread_safe_sender());
 
   // Register a registration and its version attributes with the dispatcher
   // living on the worker thread.
   scoped_ptr<WebServiceWorkerRegistrationImpl> registration(
       dispatcher->CreateServiceWorkerRegistration(info, false));
   registration->SetInstalling(
       dispatcher->GetServiceWorker(attrs.installing, false));
   registration->SetWaiting(
       dispatcher->GetServiceWorker(attrs.waiting, false));
   registration->SetActive(
       dispatcher->GetServiceWorker(attrs.active, false));
 
   script_context_->SetRegistrationInServiceWorkerGlobalScope(
       registration.Pass());
 }
 
 }  // namespace content