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

content/renderer/service_worker/embedded_worker_context_client.h

 // 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.
 
 #ifndef CONTENT_RENDERER_SERVICE_WORKER_EMBEDDED_WORKER_CONTEXT_CLIENT_H_
 #define CONTENT_RENDERER_SERVICE_WORKER_EMBEDDED_WORKER_CONTEXT_CLIENT_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "ipc/ipc_listener.h"
 #include "third_party/WebKit/public/web/WebServiceWorkerContextClient.h"
 #include "url/gurl.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 class TaskRunner;
 }
 
 namespace blink {
 class WebDataSource;
 class WebServiceWorkerProvider;
 }
 
 namespace content {
 
-class ServiceWorkerMessageSender;
 class ServiceWorkerProviderContext;
 class ServiceWorkerScriptContext;
 class ThreadSafeSender;
 
 // This class provides access to/from an embedded worker's WorkerGlobalScope.
 // Unless otherwise noted, all methods are called on the worker thread.
 //
 // TODO(kinuko): Currently EW/SW separation is made a little hazily.
 // This should implement WebEmbeddedWorkerContextClient
 // or sort of it (which doesn't exist yet) rather than
@@ skipping 89 matching lines @@
   virtual void skipWaiting(
       blink::WebServiceWorkerSkipWaitingCallbacks* callbacks);
   virtual void claim(blink::WebServiceWorkerClientsClaimCallbacks* callbacks);
 
   // TODO: Implement DevTools related method overrides.
 
   int embedded_worker_id() const { return embedded_worker_id_; }
   base::SingleThreadTaskRunner* main_thread_task_runner() const {
     return main_thread_task_runner_.get();
   }
-  ServiceWorkerMessageSender* sender() { return sender_.get(); }
+  ThreadSafeSender* thread_safe_sender() { return sender_.get(); }
 
  private:
   void OnMessageToWorker(int thread_id,
                          int embedded_worker_id,
                          const IPC::Message& message);
   void SendWorkerStarted();
   void SetRegistrationInServiceWorkerGlobalScope();
 
   const int embedded_worker_id_;
   const int64 service_worker_version_id_;
   const GURL service_worker_scope_;
   const GURL script_url_;
   const int worker_devtools_agent_route_id_;
-  scoped_refptr<ServiceWorkerMessageSender> sender_;
+  scoped_refptr<ThreadSafeSender> sender_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
   scoped_refptr<base::TaskRunner> worker_task_runner_;
 
   scoped_ptr<ServiceWorkerScriptContext> script_context_;
   scoped_refptr<ServiceWorkerProviderContext> provider_context_;
 
   base::WeakPtrFactory<EmbeddedWorkerContextClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerContextClient);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_SERVICE_WORKER_EMBEDDED_WORKER_CONTEXT_CLIENT_H_