Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(785)

Unified Diff: components/webdata/common/web_data_request_manager.cc

Issue 2403773002: Remove stl_util's STLDeleteContainerPointers from autofill. (Closed)
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d03d841bf64fde0c3eeab115e74003cdadb33cbf..c08ccc40ab28563351a14c01a5a234259080ac73 100644
--- a/components/webdata/common/web_data_request_manager.cc
+++ b/components/webdata/common/web_data_request_manager.cc
@@ -30,9 +30,6 @@ WebDataRequest::~WebDataRequest() {
if (manager_) {
manager_->CancelRequest(handle_);
}
- if (result_.get()) {
- result_->Destroy();
- }
}
WebDataServiceBase::Handle WebDataRequest::GetHandle() const {
@@ -84,8 +81,7 @@ WebDataRequestManager::WebDataRequestManager()
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();
@@ -103,7 +99,7 @@ int WebDataRequestManager::GetNextRequestHandle() {
void WebDataRequestManager::CancelRequest(WebDataServiceBase::Handle h) {
base::AutoLock l(pending_lock_);
- RequestMap::iterator i = pending_requests_.find(h);
+ auto i = pending_requests_.find(h);
if (i == pending_requests_.end()) {
NOTREACHED() << "Canceling a nonexistent web data service request";
return;
@@ -133,7 +129,7 @@ void WebDataRequestManager::RequestCompletedOnThread(
"422460 WebDataRequestManager::RequestCompletedOnThread::UpdateMap"));
{
base::AutoLock l(pending_lock_);
- RequestMap::iterator i = pending_requests_.find(request->GetHandle());
+ auto i = pending_requests_.find(request->GetHandle());
if (i == pending_requests_.end()) {
NOTREACHED() << "Request completed called for an unknown request";
return;
@@ -156,7 +152,7 @@ void WebDataRequestManager::RequestCompletedOnThread(
request->OnComplete();
if (consumer) {
std::unique_ptr<WDTypedResult> r = request->GetResult();
- consumer->OnWebDataServiceRequestDone(request->GetHandle(), r.get());
+ consumer->OnWebDataServiceRequestDone(request->GetHandle(), std::move(r));
}
}

Powered by Google App Engine
This is Rietveld 408576698