Remove stl_util's STLDeleteContainerPairSecondPointers.

chrome/browser/background/background_application_list_model.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/background/background_application_list_model.h"
 
 #include <algorithm>
 #include <set>
 
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 119 matching lines @@
     extension_misc::ExtensionIcons size) {
   extensions::ExtensionResource resource =
       extensions::IconsInfo::GetIconResource(
           extension_, size, ExtensionIconSet::MATCH_BIGGER);
   extensions::ImageLoader::Get(model_->profile_)->LoadImageAsync(
       extension_, resource, gfx::Size(size, size),
       base::Bind(&Application::OnImageLoaded, AsWeakPtr()));
 }
 
 BackgroundApplicationListModel::~BackgroundApplicationListModel() {
-  base::STLDeleteContainerPairSecondPointers(applications_.begin(),
-                                             applications_.end());
 }
 
 BackgroundApplicationListModel::BackgroundApplicationListModel(Profile* profile)
     : profile_(profile),
       ready_(false) {
   DCHECK(profile_);
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
                  content::Source<Profile>(profile));
   registrar_.Add(this,
@@ skipping 25 matching lines @@
   DCHECK(IsBackgroundApp(*extension, profile_));
   Application* application = FindApplication(extension);
   if (!application) {
     // App position is used as a dynamic command and so must be less than any
     // predefined command id.
     if (applications_.size() >= IDC_MinimumLabelValue) {
       LOG(ERROR) << "Background application limit of " << IDC_MinimumLabelValue
                  << " exceeded.  Ignoring.";
       return;
     }
-    application = new Application(this, extension);
-    applications_[extension->id()] = application;
+    std::unique_ptr<Application> application_ptr =
+        base::MakeUnique<Application>(this, extension);
+    application = application_ptr.get();
+    applications_[extension->id()] = std::move(application_ptr);
     Update();
     application->RequestIcon(extension_misc::EXTENSION_ICON_BITTY);
   }
 }
 
 void BackgroundApplicationListModel::DissociateApplicationData(
     const Extension* extension) {
-  ApplicationMap::iterator found = applications_.find(extension->id());
-  if (found != applications_.end()) {
-    delete found->second;
-    applications_.erase(found);
-  }
+  applications_.erase(extension->id());
 }
 
 const Extension* BackgroundApplicationListModel::GetExtension(
     int position) const {
   DCHECK(position >= 0 && static_cast<size_t>(position) < extensions_.size());
   return extensions_[position].get();
 }
 
 const BackgroundApplicationListModel::Application*
 BackgroundApplicationListModel::FindApplication(
     const Extension* extension) const {
   const std::string& id = extension->id();
-  ApplicationMap::const_iterator found = applications_.find(id);
-  return (found == applications_.end()) ? NULL : found->second;
+  auto found = applications_.find(id);
+  return (found == applications_.end()) ? nullptr : found->second.get();
 }
 
 BackgroundApplicationListModel::Application*
 BackgroundApplicationListModel::FindApplication(
     const Extension* extension) {
   const std::string& id = extension->id();
-  ApplicationMap::iterator found = applications_.find(id);
-  return (found == applications_.end()) ? NULL : found->second;
+  auto found = applications_.find(id);
+  return (found == applications_.end()) ? nullptr : found->second.get();
 }
 
 const gfx::ImageSkia* BackgroundApplicationListModel::GetIcon(
     const Extension* extension) {
   const Application* application = FindApplication(extension);
   if (application)
     return application->icon_.get();
   AssociateApplicationData(extension);
-  return NULL;
+  return nullptr;
 }
 
 int BackgroundApplicationListModel::GetPosition(
     const Extension* extension) const {
   int position = 0;
   const std::string& id = extension->id();
   for (const auto& it : extensions_) {
     if (id == it->id())
       return position;
     ++position;
@@ skipping 146 matching lines @@
          (*old_cursor)->name() == (*new_cursor)->name() &&
          (*old_cursor)->id() == (*new_cursor)->id()) {
     ++old_cursor;
     ++new_cursor;
   }
   if (old_cursor != extensions_.end() || new_cursor != extensions.end()) {
     extensions_ = extensions;
     FOR_EACH_OBSERVER(Observer, observers_, OnApplicationListChanged(profile_));
   }
 }