Remove stl_util's deletion function use and ScopedVector from chrome/browser/download/.

chrome/browser/download/download_status_updater.cc

 // Copyright (c) 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 "chrome/browser/download/download_status_updater.h"
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
 namespace {
 
 // DownloadStatusUpdater::UpdateAppIconDownloadProgress() expects to only be
 // called once when a DownloadItem completes, then not again (except perhaps
@@ skipping 25 matching lines @@
 
 const char WasInProgressData::kKey[] =
   "DownloadItem DownloadStatusUpdater WasInProgressData";
 
 }  // anonymous namespace
 
 DownloadStatusUpdater::DownloadStatusUpdater() {
 }
 
 DownloadStatusUpdater::~DownloadStatusUpdater() {
-  base::STLDeleteElements(&notifiers_);
 }
 
 bool DownloadStatusUpdater::GetProgress(float* progress,
                                         int* download_count) const {
   *progress = 0;
   *download_count = 0;
   bool progress_certain = true;
   int64_t received_bytes = 0;
   int64_t total_bytes = 0;
 
-  for (std::vector<AllDownloadItemNotifier*>::const_iterator it =
-       notifiers_.begin(); it != notifiers_.end(); ++it) {
-    if ((*it)->GetManager()) {
+  for (const auto& notifier : notifiers_) {
+    if (notifier->GetManager()) {
       content::DownloadManager::DownloadVector items;
-      (*it)->GetManager()->GetAllDownloads(&items);
-      for (content::DownloadManager::DownloadVector::const_iterator it =
-          items.begin(); it != items.end(); ++it) {
-        if ((*it)->GetState() == content::DownloadItem::IN_PROGRESS) {
+      notifier->GetManager()->GetAllDownloads(&items);
+      for (auto* item : items) {
+        if (item->GetState() == content::DownloadItem::IN_PROGRESS) {
           ++*download_count;
-          if ((*it)->GetTotalBytes() <= 0) {
+          if (item->GetTotalBytes() <= 0) {
             // There may or may not be more data coming down this pipe.
             progress_certain = false;
           } else {
-            received_bytes += (*it)->GetReceivedBytes();
-            total_bytes += (*it)->GetTotalBytes();
+            received_bytes += item->GetReceivedBytes();
+            total_bytes += item->GetTotalBytes();
           }
         }
       }
     }
   }
 
   if (total_bytes > 0)
     *progress = static_cast<float>(received_bytes) / total_bytes;
   return progress_certain;
 }
 
 void DownloadStatusUpdater::AddManager(content::DownloadManager* manager) {
-  notifiers_.push_back(new AllDownloadItemNotifier(manager, this));
+  notifiers_.push_back(
+      base::MakeUnique<AllDownloadItemNotifier>(manager, this));
   content::DownloadManager::DownloadVector items;
   manager->GetAllDownloads(&items);
-  for (content::DownloadManager::DownloadVector::const_iterator
-       it = items.begin(); it != items.end(); ++it) {
-    OnDownloadCreated(manager, *it);
-  }
+  for (auto* item : items)
+    OnDownloadCreated(manager, item);
 }
 
 void DownloadStatusUpdater::OnDownloadCreated(
     content::DownloadManager* manager, content::DownloadItem* item) {
   // Ignore downloads loaded from history, which are in a terminal state.
   // TODO(benjhayden): Use the Observer interface to distinguish between
   // historical and started downloads.
   if (item->GetState() == content::DownloadItem::IN_PROGRESS) {
     UpdateAppIconDownloadProgress(item);
     new WasInProgressData(item);
@@ skipping 32 matching lines @@
     float progress = 0;
     int download_count = 0;
     GetProgress(&progress, &download_count);
     linux_ui->SetDownloadCount(download_count);
     linux_ui->SetProgressFraction(progress);
   }
 #endif
   // TODO(avi): Implement for Android?
 }
 #endif