Index: content/renderer/service_worker/service_worker_context_client.cc |
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc |
index 8d566ab79776df76158cf9f8cf31cff6bab16c69..64c72d8fcf71f1b909dadefd5e39dc4ac6c6329e 100644 |
--- a/content/renderer/service_worker/service_worker_context_client.cc |
+++ b/content/renderer/service_worker/service_worker_context_client.cc |
@@ -97,7 +97,7 @@ class WebServiceWorkerNetworkProviderImpl |
ServiceWorkerNetworkProvider* provider = |
ServiceWorkerNetworkProvider::FromDocumentState( |
static_cast<DataSourceExtraData*>(data_source->getExtraData())); |
- scoped_ptr<RequestExtraData> extra_data(new RequestExtraData); |
+ std::unique_ptr<RequestExtraData> extra_data(new RequestExtraData); |
extra_data->set_service_worker_provider_id(provider->provider_id()); |
extra_data->set_originated_from_service_worker(true); |
request.setExtraData(extra_data.release()); |
@@ -109,7 +109,7 @@ void SendPostMessageToClientOnMainThread( |
int routing_id, |
const std::string& uuid, |
const base::string16& message, |
- scoped_ptr<blink::WebMessagePortChannelArray> channels) { |
+ std::unique_ptr<blink::WebMessagePortChannelArray> channels) { |
sender->Send(new ServiceWorkerHostMsg_PostMessageToClient( |
routing_id, uuid, message, |
WebMessagePortChannelImpl::ExtractMessagePortIDs(std::move(channels)))); |
@@ -567,9 +567,9 @@ ServiceWorkerContextClient::createServiceWorkerNetworkProvider( |
// Create a content::ServiceWorkerNetworkProvider for this data source so |
// we can observe its requests. |
- scoped_ptr<ServiceWorkerNetworkProvider> provider( |
- new ServiceWorkerNetworkProvider( |
- MSG_ROUTING_NONE, SERVICE_WORKER_PROVIDER_FOR_CONTROLLER)); |
+ std::unique_ptr<ServiceWorkerNetworkProvider> provider( |
+ new ServiceWorkerNetworkProvider(MSG_ROUTING_NONE, |
+ SERVICE_WORKER_PROVIDER_FOR_CONTROLLER)); |
provider_context_ = provider->context(); |
// Tell the network provider about which version to load. |
@@ -604,7 +604,7 @@ void ServiceWorkerContextClient::postMessageToClient( |
// messages for MessagePort (e.g. QueueMessages) are sent from main thread |
// (with thread hopping), so we need to do the same thread hopping here not |
// to overtake those messages. |
- scoped_ptr<blink::WebMessagePortChannelArray> channel_array(channels); |
+ std::unique_ptr<blink::WebMessagePortChannelArray> channel_array(channels); |
main_thread_task_runner_->PostTask( |
FROM_HERE, base::Bind(&SendPostMessageToClientOnMainThread, |
base::RetainedRef(sender_), GetRoutingID(), |
@@ -731,7 +731,7 @@ void ServiceWorkerContextClient::OnExtendableMessageEvent( |
} |
DCHECK(params.source.service_worker_info.IsValid()); |
- scoped_ptr<ServiceWorkerHandleReference> handle = |
+ std::unique_ptr<ServiceWorkerHandleReference> handle = |
ServiceWorkerHandleReference::Adopt(params.source.service_worker_info, |
sender_.get()); |
ServiceWorkerDispatcher* dispatcher = |
@@ -867,7 +867,7 @@ void ServiceWorkerContextClient::OnDidGetClient( |
NOTREACHED() << "Got stray response: " << request_id; |
return; |
} |
- scoped_ptr<blink::WebServiceWorkerClientInfo> web_client; |
+ std::unique_ptr<blink::WebServiceWorkerClientInfo> web_client; |
if (!client.IsEmpty()) { |
DCHECK(client.IsValid()); |
web_client.reset(new blink::WebServiceWorkerClientInfo( |
@@ -908,7 +908,7 @@ void ServiceWorkerContextClient::OnOpenWindowResponse( |
NOTREACHED() << "Got stray response: " << request_id; |
return; |
} |
- scoped_ptr<blink::WebServiceWorkerClientInfo> web_client; |
+ std::unique_ptr<blink::WebServiceWorkerClientInfo> web_client; |
if (!client.IsEmpty()) { |
DCHECK(client.IsValid()); |
web_client.reset(new blink::WebServiceWorkerClientInfo( |
@@ -947,7 +947,7 @@ void ServiceWorkerContextClient::OnFocusClientResponse( |
} |
if (!client.IsEmpty()) { |
DCHECK(client.IsValid()); |
- scoped_ptr<blink::WebServiceWorkerClientInfo> web_client ( |
+ std::unique_ptr<blink::WebServiceWorkerClientInfo> web_client( |
new blink::WebServiceWorkerClientInfo( |
ToWebServiceWorkerClientInfo(client))); |
callback->onSuccess(std::move(web_client)); |
@@ -971,7 +971,7 @@ void ServiceWorkerContextClient::OnNavigateClientResponse( |
NOTREACHED() << "Got stray response: " << request_id; |
return; |
} |
- scoped_ptr<blink::WebServiceWorkerClientInfo> web_client; |
+ std::unique_ptr<blink::WebServiceWorkerClientInfo> web_client; |
if (!client.IsEmpty()) { |
DCHECK(client.IsValid()); |
web_client.reset(new blink::WebServiceWorkerClientInfo( |