Remove stl_util's deletion function use from content/.

content/browser/download/save_package.cc

Index: content/browser/download/save_package.cc
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index 09ec93883b6d0b0d17953975a359af113144c00c..d7a4094196410c783d79d33c5579827466b1dc48 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -13,6 +13,7 @@
 #include "base/i18n/file_util_icu.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_piece.h"
@@ -192,10 +193,10 @@ SavePackage::~SavePackage() {
                                        completed_count() + in_process_count());
 
   // Free all SaveItems.
-  base::STLDeleteElements(&waiting_item_queue_);
-  base::STLDeleteValues(&in_progress_items_);
-  base::STLDeleteValues(&saved_success_items_);
-  base::STLDeleteValues(&saved_failed_items_);
+  waiting_item_queue_.clear();
+  in_progress_items_.clear();
+  saved_success_items_.clear();
+  saved_failed_items_.clear();
   // Clear containers that contain (now dangling/invalid) pointers to the
   // save items freed above.  This is not strictly required (as the containers
   // will be destructed soon by ~SavePackage), but seems like good code hygiene.
@@ -301,10 +302,10 @@ void SavePackage::InitWithDownloadItem(
     DCHECK_EQ(SAVE_PAGE_TYPE_AS_ONLY_HTML, save_type_);
     wait_state_ = NET_FILES;
     // Add this item to waiting list.
-    waiting_item_queue_.push_back(new SaveItem(
+    waiting_item_queue_.push_back(base::WrapUnique(new SaveItem(
         page_url_, Referrer(), this, SaveFileCreateInfo::SAVE_FILE_FROM_NET,
         FrameTreeNode::kFrameTreeNodeInvalidId,
-        web_contents()->GetMainFrame()->GetFrameTreeNodeId()));
+        web_contents()->GetMainFrame()->GetFrameTreeNodeId())));
     all_save_items_count_ = 1;
     download_->SetTotalBytes(1);
 
@@ -488,13 +489,13 @@ void SavePackage::StartSave(const SaveFileCreateInfo* info) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(info);
 
-  SaveItemIdMap::iterator it = in_progress_items_.find(info->save_item_id);
+  auto it = in_progress_items_.find(info->save_item_id);
   if (it == in_progress_items_.end()) {
     // If not found, we must have cancel action.
     DCHECK(canceled());
     return;
   }
-  SaveItem* save_item = it->second;
+  SaveItem* save_item = it->second.get();
 
   DCHECK(!saved_main_file_path_.empty());
 
@@ -556,7 +557,7 @@ SaveItem* SavePackage::LookupInProgressSaveItem(SaveItemId save_item_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   auto it = in_progress_items_.find(save_item_id);
   if (it != in_progress_items_.end()) {
-    SaveItem* save_item = it->second;
+    SaveItem* save_item = it->second.get();
     DCHECK_EQ(SaveItem::IN_PROGRESS, save_item->state());
     return save_item;
   }
@@ -565,15 +566,16 @@ SaveItem* SavePackage::LookupInProgressSaveItem(SaveItemId save_item_id) {
 
 void SavePackage::PutInProgressItemToSavedMap(SaveItem* save_item) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  SaveItemIdMap::iterator it = in_progress_items_.find(save_item->id());
+  auto it = in_progress_items_.find(save_item->id());
   DCHECK(it != in_progress_items_.end());
-  DCHECK_EQ(save_item, it->second);
+  DCHECK_EQ(save_item, it->second.get());
+  std::unique_ptr<SaveItem> owned_item = std::move(it->second);
   in_progress_items_.erase(it);
 
   SaveItemIdMap& map = save_item->success() ?
       saved_success_items_ : saved_failed_items_;
   DCHECK(!base::ContainsKey(map, save_item->id()));
-  map[save_item->id()] = save_item;
+  map[save_item->id()] = std::move(owned_item);
 }
 
 // Called for updating saving state.
@@ -610,7 +612,7 @@ void SavePackage::Stop() {
   DCHECK(canceled());
   if (in_process_count()) {
     for (const auto& it : in_progress_items_) {
-      SaveItem* save_item = it.second;
+      SaveItem* save_item = it.second.get();
       DCHECK_EQ(SaveItem::IN_PROGRESS, save_item->state());
       save_item->Cancel();
     }
@@ -618,7 +620,7 @@ void SavePackage::Stop() {
     // be put into saved_failed_items_, for successful item, they will be put
     // into saved_success_items_.
     while (in_process_count())
-      PutInProgressItemToSavedMap(in_progress_items_.begin()->second);
+      PutInProgressItemToSavedMap(in_progress_items_.begin()->second.get());
   }
 
   // This vector contains the save ids of the save files which SaveFileManager
@@ -692,7 +694,7 @@ void SavePackage::Finish() {
   // needs to remove from its |save_file_map_|.
   std::vector<SaveItemId> list_of_failed_save_item_ids;
   for (const auto& it : saved_failed_items_) {
-    const SaveItem* save_item = it.second;
+    const SaveItem* save_item = it.second.get();
     DCHECK_EQ(it.first, save_item->id());
     list_of_failed_save_item_ids.push_back(save_item->id());
   }
@@ -778,37 +780,39 @@ void SavePackage::SaveNextFile(bool process_all_remaining_items) {
 
   do {
     // Pop SaveItem from waiting list.
-    SaveItem* save_item = waiting_item_queue_.front();
+    std::unique_ptr<SaveItem> save_item =
+        std::move(waiting_item_queue_.front());
+    SaveItem* save_item_ptr = save_item.get();
     waiting_item_queue_.pop_front();
 
     // Add the item to |in_progress_items_|.
     DCHECK(!base::ContainsKey(in_progress_items_, save_item->id()));
-    in_progress_items_[save_item->id()] = save_item;
-    save_item->Start();
+    in_progress_items_[save_item_ptr->id()] = std::move(save_item);
+    save_item_ptr->Start();
 
     // Find the frame responsible for making the network request below - it will
     // be used in security checks made later by ResourceDispatcherHostImpl.
     int requester_frame_tree_node_id =
-        save_item->save_source() == SaveFileCreateInfo::SAVE_FILE_FROM_NET
-            ? save_item->container_frame_tree_node_id()
-            : save_item->frame_tree_node_id();
+        save_item_ptr->save_source() == SaveFileCreateInfo::SAVE_FILE_FROM_NET
+            ? save_item_ptr->container_frame_tree_node_id()
+            : save_item_ptr->frame_tree_node_id();
     DCHECK_NE(FrameTreeNode::kFrameTreeNodeInvalidId,
               requester_frame_tree_node_id);
     FrameTreeNode* requester_frame_tree_node =
         FrameTreeNode::GloballyFindByID(requester_frame_tree_node_id);
     if (!requester_frame_tree_node) {
-      save_item->Finish(0, /* is_success = */ false);
+      save_item_ptr->Finish(0, /* is_success = */ false);
       continue;
     }
     RenderFrameHostImpl* requester_frame =
         requester_frame_tree_node->current_frame_host();
 
     file_manager_->SaveURL(
-        save_item->id(), save_item->url(), save_item->referrer(),
+        save_item_ptr->id(), save_item_ptr->url(), save_item_ptr->referrer(),
         requester_frame->GetProcess()->GetID(),
         requester_frame->render_view_host()->GetRoutingID(),
-        requester_frame->routing_id(), save_item->save_source(),
-        save_item->full_path(),
+        requester_frame->routing_id(), save_item_ptr->save_source(),
+        save_item_ptr->full_path(),
         web_contents()->GetBrowserContext()->GetResourceContext(), this);
   } while (process_all_remaining_items && !waiting_item_queue_.empty());
 }
@@ -841,7 +845,7 @@ void SavePackage::DoSavingProcess() {
     // Start a new SaveItem job if we still have job in waiting queue.
     if (waiting_item_queue_.size()) {
       DCHECK_EQ(NET_FILES, wait_state_);
-      const SaveItem* save_item = waiting_item_queue_.front();
+      const SaveItem* save_item = waiting_item_queue_.front().get();
       if (save_item->save_source() != SaveFileCreateInfo::SAVE_FILE_FROM_DOM) {
         SaveNextFile(false);
       } else if (!in_process_count()) {
@@ -1134,7 +1138,7 @@ SaveItem* SavePackage::CreatePendingSaveItem(
   SaveItem* save_item =
       new SaveItem(url, sanitized_referrer, this, save_source,
                    save_item_frame_tree_node_id, container_frame_tree_node_id);
-  waiting_item_queue_.push_back(save_item);
+  waiting_item_queue_.push_back(base::WrapUnique(save_item));
 
   frame_tree_node_id_to_contained_save_items_[container_frame_tree_node_id]
       .push_back(save_item);
@@ -1208,7 +1212,8 @@ void SavePackage::CompleteSavableResourceLinksResponse() {
   // SAVE_FILE_FROM_DOM in the comparison function below).
   std::stable_sort(
       waiting_item_queue_.begin(), waiting_item_queue_.end(),
-      [](SaveItem* x, SaveItem* y) {
+      [](const std::unique_ptr<SaveItem>& x,
+         const std::unique_ptr<SaveItem>& y) {
         DCHECK(x);
         DCHECK(y);
         return (x->save_source() != SaveFileCreateInfo::SAVE_FILE_FROM_DOM) &&