| Index: content/child/service_worker/web_service_worker_impl.cc
|
| diff --git a/content/child/service_worker/web_service_worker_impl.cc b/content/child/service_worker/web_service_worker_impl.cc
|
| index 7f7afbd993eea16fc2d692c2deb35b2383a2aed9..d1f73bcdfc12e921093ad2e9dc1b937e05bd05a1 100644
|
| --- a/content/child/service_worker/web_service_worker_impl.cc
|
| +++ b/content/child/service_worker/web_service_worker_impl.cc
|
| @@ -24,7 +24,7 @@ namespace {
|
| void SendPostMessageToWorkerOnMainThread(
|
| ThreadSafeSender* thread_safe_sender,
|
| int handle_id,
|
| - const WebString& message,
|
| + const base::string16& message,
|
| scoped_ptr<WebMessagePortChannelArray> channels) {
|
| thread_safe_sender->Send(new ServiceWorkerHostMsg_PostMessageToWorker(
|
| handle_id, message,
|
| @@ -90,7 +90,10 @@ void WebServiceWorkerImpl::postMessage(const WebString& message,
|
| dispatcher->main_thread_task_runner()->PostTask(
|
| FROM_HERE, base::Bind(&SendPostMessageToWorkerOnMainThread,
|
| thread_safe_sender_, handle_ref_->handle_id(),
|
| - message, base::Passed(make_scoped_ptr(channels))));
|
| + // We cast WebString to string16 before crossing
|
| + // threads for thread-safety.
|
| + static_cast<base::string16>(message),
|
| + base::Passed(make_scoped_ptr(channels))));
|
| }
|
|
|
| void WebServiceWorkerImpl::terminate() {
|
|
|