| Index: content/renderer/service_worker/service_worker_context_client.h
|
| diff --git a/content/renderer/service_worker/service_worker_context_client.h b/content/renderer/service_worker/service_worker_context_client.h
|
| index d4561c3201db5862c1bec620bd5e557ce647095e..2e47cc76329fcd7111ea2aa87db373b2947b8f31 100644
|
| --- a/content/renderer/service_worker/service_worker_context_client.h
|
| +++ b/content/renderer/service_worker/service_worker_context_client.h
|
| @@ -22,6 +22,7 @@
|
| #include "content/child/webmessageportchannel_impl.h"
|
| #include "content/common/service_worker/service_worker_status_code.h"
|
| #include "content/common/service_worker/service_worker_types.h"
|
| +#include "content/renderer/mojo/blink_interface_registry_impl.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
|
| #include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
|
| @@ -45,6 +46,7 @@ struct WebServiceWorkerClientQueryOptions;
|
| class WebServiceWorkerContextProxy;
|
| class WebServiceWorkerProvider;
|
| class WebServiceWorkerResponse;
|
| +class InterfaceRegistry;
|
| }
|
|
|
| namespace IPC {
|
| @@ -66,9 +68,6 @@ class EmbeddedWorkerInstanceClientImpl;
|
| class ServiceWorkerContextClient
|
| : public blink::WebServiceWorkerContextClient {
|
| public:
|
| - using SyncCallback =
|
| - base::Callback<void(blink::mojom::ServiceWorkerEventStatus,
|
| - base::Time /* dispatch_event_time */)>;
|
| using FetchCallback =
|
| base::Callback<void(ServiceWorkerStatusCode,
|
| base::Time /* dispatch_event_time */)>;
|
| @@ -165,9 +164,6 @@ class ServiceWorkerContextClient
|
| void didHandlePushEvent(int request_id,
|
| blink::WebServiceWorkerEventResult result,
|
| double dispatch_event_time) override;
|
| - void didHandleSyncEvent(int request_id,
|
| - blink::WebServiceWorkerEventResult result,
|
| - double dispatch_event_time) override;
|
|
|
| // Called on the main thread.
|
| blink::WebServiceWorkerNetworkProvider* createServiceWorkerNetworkProvider(
|
| @@ -193,11 +189,7 @@ class ServiceWorkerContextClient
|
| void registerForeignFetchScopes(
|
| const blink::WebVector<blink::WebURL>& sub_scopes,
|
| const blink::WebVector<blink::WebSecurityOrigin>& origins) override;
|
| -
|
| - virtual void DispatchSyncEvent(
|
| - const std::string& tag,
|
| - blink::WebServiceWorkerContextProxy::LastChanceOption last_chance,
|
| - const SyncCallback& callback);
|
| + blink::InterfaceRegistry* interfaceRegistry() override;
|
|
|
| private:
|
| struct WorkerContextData;
|
| @@ -285,6 +277,8 @@ class ServiceWorkerContextClient
|
| // destructed on the worker thread in willDestroyWorkerContext.
|
| std::unique_ptr<WorkerContextData> context_;
|
|
|
| + std::unique_ptr<BlinkInterfaceRegistryImpl> blink_interface_registry_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ServiceWorkerContextClient);
|
| };
|
|
|
|
|