Index: content/child/service_worker/service_worker_dispatcher.h |
diff --git a/content/child/service_worker/service_worker_dispatcher.h b/content/child/service_worker/service_worker_dispatcher.h |
index 775c16b3d1d0d8bf87abdca3750cb30d6ec048e0..fe3902846c077247dfc8aed696f78d6164676ad0 100644 |
--- a/content/child/service_worker/service_worker_dispatcher.h |
+++ b/content/child/service_worker/service_worker_dispatcher.h |
@@ -28,7 +28,7 @@ class Message; |
namespace content { |
-class ServiceWorkerMessageFilter; |
+class ServiceWorkerMessageSender; |
class ServiceWorkerProviderContext; |
class ThreadSafeSender; |
class WebServiceWorkerImpl; |
@@ -41,7 +41,8 @@ struct TransferredMessagePort; |
// This class manages communication with the browser process about |
// registration of the service worker, exposed to renderer and worker |
// scripts through methods like navigator.registerServiceWorker(). |
-class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer { |
+class CONTENT_EXPORT ServiceWorkerDispatcher |
+ : public WorkerTaskRunner::Observer { |
public: |
typedef blink::WebServiceWorkerProvider::WebServiceWorkerRegistrationCallbacks |
WebServiceWorkerRegistrationCallbacks; |
@@ -56,10 +57,10 @@ class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer { |
WebServiceWorkerGetRegistrationForReadyCallbacks; |
explicit ServiceWorkerDispatcher(ThreadSafeSender* thread_safe_sender); |
+ explicit ServiceWorkerDispatcher(ServiceWorkerMessageSender* sender); |
~ServiceWorkerDispatcher() override; |
void OnMessageReceived(const IPC::Message& msg); |
- bool Send(IPC::Message* msg); |
// Corresponds to navigator.serviceWorker.register() |
void RegisterServiceWorker( |
@@ -155,6 +156,7 @@ class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer { |
typedef std::map<int, WebServiceWorkerRegistrationImpl*> |
RegistrationObjectMap; |
+ friend class ServiceWorkerDispatcherTest; |
friend class WebServiceWorkerImpl; |
friend class WebServiceWorkerRegistrationImpl; |
@@ -252,7 +254,7 @@ class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer { |
// (e.g. as .current). |
WorkerToProviderMap worker_to_provider_; |
- scoped_refptr<ThreadSafeSender> thread_safe_sender_; |
+ scoped_refptr<ServiceWorkerMessageSender> sender_; |
DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDispatcher); |
}; |