| Index: components/webdata/common/web_data_request_manager.cc
|
| diff --git a/components/webdata/common/web_data_request_manager.cc b/components/webdata/common/web_data_request_manager.cc
|
| index dcaa3201da544282f0e6ee92f2a8e251b3d4f37f..2900590cf4041c37066188de2f12ac98beb22bef 100644
|
| --- a/components/webdata/common/web_data_request_manager.cc
|
| +++ b/components/webdata/common/web_data_request_manager.cc
|
| @@ -64,11 +64,11 @@ void WebDataRequest::OnComplete() {
|
| manager_= NULL;
|
| }
|
|
|
| -void WebDataRequest::SetResult(scoped_ptr<WDTypedResult> r) {
|
| +void WebDataRequest::SetResult(std::unique_ptr<WDTypedResult> r) {
|
| result_ = std::move(r);
|
| }
|
|
|
| -scoped_ptr<WDTypedResult> WebDataRequest::GetResult(){
|
| +std::unique_ptr<WDTypedResult> WebDataRequest::GetResult() {
|
| return std::move(result_);
|
| }
|
|
|
| @@ -113,7 +113,7 @@ void WebDataRequestManager::CancelRequest(WebDataServiceBase::Handle h) {
|
| }
|
|
|
| void WebDataRequestManager::RequestCompleted(
|
| - scoped_ptr<WebDataRequest> request) {
|
| + std::unique_ptr<WebDataRequest> request) {
|
| base::MessageLoop* loop = request->GetMessageLoop();
|
| loop->task_runner()->PostTask(
|
| FROM_HERE, base::Bind(&WebDataRequestManager::RequestCompletedOnThread,
|
| @@ -121,7 +121,7 @@ void WebDataRequestManager::RequestCompleted(
|
| }
|
|
|
| void WebDataRequestManager::RequestCompletedOnThread(
|
| - scoped_ptr<WebDataRequest> request) {
|
| + std::unique_ptr<WebDataRequest> request) {
|
| if (request->IsCancelled())
|
| return;
|
|
|
| @@ -154,7 +154,7 @@ void WebDataRequestManager::RequestCompletedOnThread(
|
| WebDataServiceConsumer* consumer = request->GetConsumer();
|
| request->OnComplete();
|
| if (consumer) {
|
| - scoped_ptr<WDTypedResult> r = request->GetResult();
|
| + std::unique_ptr<WDTypedResult> r = request->GetResult();
|
| consumer->OnWebDataServiceRequestDone(request->GetHandle(), r.get());
|
| }
|
| }
|
|
|