Remove stl_util's STLDeleteContainerPointers from autofill.

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 12 matching lines @@
     : manager_(manager), cancelled_(false), consumer_(consumer) {
   handle_ = manager_->GetNextRequestHandle();
   task_runner_ = base::ThreadTaskRunnerHandle::Get();
   manager_->RegisterRequest(this);
 }
 
 WebDataRequest::~WebDataRequest() {
   if (manager_) {
     manager_->CancelRequest(handle_);
   }
-  if (result_.get()) {
-    result_->Destroy();
-  }
 }
 
 WebDataServiceBase::Handle WebDataRequest::GetHandle() const {
   return handle_;
 }
 
 WebDataServiceConsumer* WebDataRequest::GetConsumer() const {
   return consumer_;
 }
 
@@ skipping 31 matching lines @@
 // WebDataRequestManager implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDataRequestManager::WebDataRequestManager()
     : next_request_handle_(1) {
 }
 
 WebDataRequestManager::~WebDataRequestManager() {
   base::AutoLock l(pending_lock_);
-  for (RequestMap::iterator i = pending_requests_.begin();
-       i != pending_requests_.end(); ++i) {
+  for (auto i = pending_requests_.begin(); i != pending_requests_.end(); ++i)
     i->second->Cancel();
-  }
   pending_requests_.clear();
 }
 
 void WebDataRequestManager::RegisterRequest(WebDataRequest* request) {
   base::AutoLock l(pending_lock_);
   pending_requests_[request->GetHandle()] = request;
 }
 
 int WebDataRequestManager::GetNextRequestHandle() {
   base::AutoLock l(pending_lock_);
   return ++next_request_handle_;
 }
 
 void WebDataRequestManager::CancelRequest(WebDataServiceBase::Handle h) {
   base::AutoLock l(pending_lock_);
-  RequestMap::iterator i = pending_requests_.find(h);
+  auto i = pending_requests_.find(h);
   DCHECK(i != pending_requests_.end());
   i->second->Cancel();
   pending_requests_.erase(i);
 }
 
 void WebDataRequestManager::RequestCompleted(
     std::unique_ptr<WebDataRequest> request) {
   scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       request->GetTaskRunner();
   task_runner->PostTask(
       FROM_HERE, base::Bind(&WebDataRequestManager::RequestCompletedOnThread,
                             this, base::Passed(&request)));
 }
 
 void WebDataRequestManager::RequestCompletedOnThread(
     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_);
-    RequestMap::iterator i = pending_requests_.find(request->GetHandle());
+    auto i = pending_requests_.find(request->GetHandle());
     DCHECK(i != pending_requests_.end());
 
     // Take ownership of the request object and remove it from the map.
     pending_requests_.erase(i);
   }
 
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   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) {
-      std::unique_ptr<WDTypedResult> r = request->GetResult();
-      consumer->OnWebDataServiceRequestDone(request->GetHandle(), r.get());
+      consumer->OnWebDataServiceRequestDone(request->GetHandle(),
+                                            request->GetResult());
     }
   }
 
 }