Convert //components/[u-z]* from scoped_ptr to std::unique_ptr

components/webdata/common/web_data_request_manager.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/webdata/common/web_data_request_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 46 matching lines @@
   base::AutoLock l(cancel_lock_);
   cancelled_ = true;
   consumer_ = NULL;
   manager_ = NULL;
 }
 
 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_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataRequestManager implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDataRequestManager::WebDataRequestManager()
@@ skipping 24 matching lines @@
   RequestMap::iterator i = pending_requests_.find(h);
   if (i == pending_requests_.end()) {
     NOTREACHED() << "Canceling a nonexistent web data service request";
     return;
   }
   i->second->Cancel();
   pending_requests_.erase(i);
 }
 
 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,
                             this, base::Passed(&request)));
 }
 
 void WebDataRequestManager::RequestCompletedOnThread(
-    scoped_ptr<WebDataRequest> request) {
+    std::unique_ptr<WebDataRequest> request) {
   if (request->IsCancelled())
     return;
 
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 WebDataRequestManager::RequestCompletedOnThread::UpdateMap"));
   {
     base::AutoLock l(pending_lock_);
@@ skipping 12 matching lines @@
   tracked_objects::ScopedTracker tracking_profile2(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 "
           "WebDataRequestManager::RequestCompletedOnThread::NotifyConsumer"));
 
   // Notify the consumer if needed.
   if (!request->IsCancelled()) {
     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());
     }
   }
 
 }