| Index: content/child/service_worker/service_worker_dispatcher.cc
|
| diff --git a/content/child/service_worker/service_worker_dispatcher.cc b/content/child/service_worker/service_worker_dispatcher.cc
|
| index c1934f515c181edec240f2fc7081ef25eac5cdae..3aef573277172772a95a20af2e1c7c97930a8ca3 100644
|
| --- a/content/child/service_worker/service_worker_dispatcher.cc
|
| +++ b/content/child/service_worker/service_worker_dispatcher.cc
|
| @@ -622,7 +622,8 @@ void ServiceWorkerDispatcher::OnRegistrationError(
|
| if (!callbacks)
|
| return;
|
|
|
| - callbacks->onError(WebServiceWorkerError(error_type, message));
|
| + callbacks->onError(
|
| + WebServiceWorkerError(error_type, blink::WebString::fromUTF16(message)));
|
| pending_registration_callbacks_.Remove(request_id);
|
| }
|
|
|
| @@ -643,7 +644,8 @@ void ServiceWorkerDispatcher::OnUpdateError(
|
| if (!callbacks)
|
| return;
|
|
|
| - callbacks->onError(WebServiceWorkerError(error_type, message));
|
| + callbacks->onError(
|
| + WebServiceWorkerError(error_type, blink::WebString::fromUTF16(message)));
|
| pending_update_callbacks_.Remove(request_id);
|
| }
|
|
|
| @@ -666,7 +668,8 @@ void ServiceWorkerDispatcher::OnUnregistrationError(
|
| if (!callbacks)
|
| return;
|
|
|
| - callbacks->onError(WebServiceWorkerError(error_type, message));
|
| + callbacks->onError(
|
| + WebServiceWorkerError(error_type, blink::WebString::fromUTF16(message)));
|
| pending_unregistration_callbacks_.Remove(request_id);
|
| }
|
|
|
| @@ -689,7 +692,8 @@ void ServiceWorkerDispatcher::OnGetRegistrationError(
|
| if (!callbacks)
|
| return;
|
|
|
| - callbacks->onError(WebServiceWorkerError(error_type, message));
|
| + callbacks->onError(
|
| + WebServiceWorkerError(error_type, blink::WebString::fromUTF16(message)));
|
| pending_get_registration_callbacks_.Remove(request_id);
|
| }
|
|
|
| @@ -712,7 +716,8 @@ void ServiceWorkerDispatcher::OnGetRegistrationsError(
|
| if (!callbacks)
|
| return;
|
|
|
| - callbacks->onError(WebServiceWorkerError(error_type, message));
|
| + callbacks->onError(
|
| + WebServiceWorkerError(error_type, blink::WebString::fromUTF16(message)));
|
| pending_get_registrations_callbacks_.Remove(request_id);
|
| }
|
|
|
| @@ -871,7 +876,8 @@ void ServiceWorkerDispatcher::OnPostMessage(
|
| base::ThreadTaskRunnerHandle::Get());
|
|
|
| found->second->dispatchMessageEvent(
|
| - WebServiceWorkerImpl::CreateHandle(worker), params.message, ports);
|
| + WebServiceWorkerImpl::CreateHandle(worker),
|
| + blink::WebString::fromUTF16(params.message), ports);
|
| }
|
|
|
| void ServiceWorkerDispatcher::AddServiceWorker(
|
|
|