| 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 5cb4d5a825f1bb12b29bde94c5190ed871f6670c..1922687ca71bfa2bedd7c35a572f4958acdb827f 100644
|
| --- a/content/browser/service_worker/service_worker_version.cc
|
| +++ b/content/browser/service_worker/service_worker_version.cc
|
| @@ -114,17 +114,6 @@ void RunTaskAfterStartWorker(
|
| task.Run();
|
| }
|
|
|
| -void RunErrorMessageCallback(
|
| - const std::vector<TransferredMessagePort>& sent_message_ports,
|
| - const ServiceWorkerVersion::StatusCallback& callback,
|
| - ServiceWorkerStatusCode status) {
|
| - // Transfering the message ports failed, so destroy the ports.
|
| - for (const TransferredMessagePort& port : sent_message_ports) {
|
| - MessagePortService::GetInstance()->ClosePort(port.id);
|
| - }
|
| - callback.Run(status);
|
| -}
|
| -
|
| void KillEmbeddedWorkerProcess(int process_id, ResultCode code) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| RenderProcessHost* render_process_host =
|
| @@ -561,48 +550,6 @@ void ServiceWorkerVersion::RunAfterStartWorker(
|
| error_callback, task));
|
| }
|
|
|
| -void ServiceWorkerVersion::DispatchMessageEvent(
|
| - const base::string16& message,
|
| - const std::vector<TransferredMessagePort>& sent_message_ports,
|
| - const StatusCallback& callback) {
|
| - for (const TransferredMessagePort& port : sent_message_ports) {
|
| - MessagePortService::GetInstance()->HoldMessages(port.id);
|
| - }
|
| -
|
| - DispatchMessageEventInternal(message, sent_message_ports, callback);
|
| -}
|
| -
|
| -void ServiceWorkerVersion::DispatchMessageEventInternal(
|
| - const base::string16& message,
|
| - const std::vector<TransferredMessagePort>& sent_message_ports,
|
| - const StatusCallback& callback) {
|
| - OnBeginEvent();
|
| - if (running_status() != RUNNING) {
|
| - // Schedule calling this method after starting the worker.
|
| - StartWorker(ServiceWorkerMetrics::EventType::MESSAGE,
|
| - base::Bind(&RunTaskAfterStartWorker, weak_factory_.GetWeakPtr(),
|
| - base::Bind(&RunErrorMessageCallback,
|
| - sent_message_ports, callback),
|
| - base::Bind(&self::DispatchMessageEventInternal,
|
| - weak_factory_.GetWeakPtr(), message,
|
| - sent_message_ports, callback)));
|
| - return;
|
| - }
|
| -
|
| - // TODO(kinuko): Cleanup this (and corresponding unit test) when message
|
| - // event becomes extendable, round-trip event. (crbug.com/498596)
|
| - RestartTick(&idle_time_);
|
| -
|
| - MessagePortMessageFilter* filter =
|
| - embedded_worker_->message_port_message_filter();
|
| - std::vector<int> new_routing_ids;
|
| - filter->UpdateMessagePortsWithNewRoutes(sent_message_ports, &new_routing_ids);
|
| - ServiceWorkerStatusCode status =
|
| - embedded_worker_->SendMessage(ServiceWorkerMsg_MessageToWorker(
|
| - message, sent_message_ports, new_routing_ids));
|
| - RunSoon(base::Bind(callback, status));
|
| -}
|
| -
|
| void ServiceWorkerVersion::AddControllee(
|
| ServiceWorkerProviderHost* provider_host) {
|
| const std::string& uuid = provider_host->client_uuid();
|
|
|