| Index: content/browser/service_worker/service_worker_version.cc
|
| diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
|
| index d3385d07a54cd8044213e1c943fe9f1c7920d760..e72bc88a66c8fa4c0c0fc0428b0c684a9fb9bc43 100644
|
| --- a/content/browser/service_worker/service_worker_version.cc
|
| +++ b/content/browser/service_worker/service_worker_version.cc
|
| @@ -630,26 +630,6 @@ void ServiceWorkerVersion::RunAfterStartWorker(
|
| error_callback, task));
|
| }
|
|
|
| -void ServiceWorkerVersion::DispatchEvent(const std::vector<int>& request_ids,
|
| - const IPC::Message& message) {
|
| - DCHECK_EQ(EmbeddedWorkerStatus::RUNNING, running_status());
|
| -
|
| - const ServiceWorkerStatusCode status = embedded_worker_->SendMessage(message);
|
| -
|
| - for (int request_id : request_ids) {
|
| - PendingRequest* request = pending_requests_.Lookup(request_id);
|
| - DCHECK(request) << "Invalid request id";
|
| - DCHECK(!request->is_dispatched)
|
| - << "Request already dispatched an IPC event";
|
| - if (status != SERVICE_WORKER_OK) {
|
| - RunSoon(base::Bind(request->error_callback, status));
|
| - pending_requests_.Remove(request_id);
|
| - } else {
|
| - request->is_dispatched = true;
|
| - }
|
| - }
|
| -}
|
| -
|
| void ServiceWorkerVersion::AddControllee(
|
| ServiceWorkerProviderHost* provider_host) {
|
| const std::string& uuid = provider_host->client_uuid();
|
| @@ -961,8 +941,6 @@ bool ServiceWorkerVersion::OnMessageReceived(const IPC::Message& message) {
|
| OnSkipWaiting)
|
| IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_ClaimClients,
|
| OnClaimClients)
|
| - IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_RegisterForeignFetchScopes,
|
| - OnRegisterForeignFetchScopes)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -1337,7 +1315,7 @@ void ServiceWorkerVersion::OnPongFromWorker() {
|
| ping_controller_->OnPongReceived();
|
| }
|
|
|
| -void ServiceWorkerVersion::OnRegisterForeignFetchScopes(
|
| +void ServiceWorkerVersion::RegisterForeignFetchScopes(
|
| const std::vector<GURL>& sub_scopes,
|
| const std::vector<url::Origin>& origins) {
|
| DCHECK(status() == INSTALLING || status() == REDUNDANT) << status();
|
|
|