Remove stl_util's deletion function use from chrome/.

chrome/browser/ui/webui/extensions/extension_icon_source.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/ui/webui/extensions/extension_icon_source.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
@@ skipping 115 matching lines @@
       request->extension.get(), request->size, request->match);
 
   if (icon.relative_path().empty()) {
     LoadIconFailed(next_id);
   } else {
     LoadExtensionImage(icon, next_id);
   }
 }
 
 ExtensionIconSource::~ExtensionIconSource() {
-  // Clean up all the temporary data we're holding for requests.
-  base::STLDeleteValues(&request_map_);
 }
 
 const SkBitmap* ExtensionIconSource::GetDefaultAppImage() {
   if (!default_app_data_.get())
     default_app_data_.reset(LoadImageByResourceId(IDR_APP_DEFAULT_ICON));
 
   return default_app_data_.get();
 }
 
 const SkBitmap* ExtensionIconSource::GetDefaultExtensionImage() {
@@ skipping 157 matching lines @@
   return true;
 }
 
 void ExtensionIconSource::SetData(
     int request_id,
     const content::URLDataSource::GotDataCallback& callback,
     const Extension* extension,
     bool grayscale,
     int size,
     ExtensionIconSet::MatchType match) {
-  ExtensionIconRequest* request = new ExtensionIconRequest();
+  std::unique_ptr<ExtensionIconRequest> request =
+      base::MakeUnique<ExtensionIconRequest>();
   request->callback = callback;
   request->extension = extension;
   request->grayscale = grayscale;
   request->size = size;
   request->match = match;
-  request_map_[request_id] = request;
+  request_map_[request_id] = std::move(request);
 }
 
 ExtensionIconSource::ExtensionIconRequest* ExtensionIconSource::GetData(
     int request_id) {
-  return request_map_[request_id];
+  return request_map_[request_id].get();
 }
 
 void ExtensionIconSource::ClearData(int request_id) {
-  std::map<int, ExtensionIconRequest*>::iterator i =
-      request_map_.find(request_id);
-  if (i == request_map_.end())
-    return;
-
-  delete i->second;
-  request_map_.erase(i);
+  request_map_.erase(request_id);
 }
 
 }  // namespace extensions