Remove stl_util's deletion function use from cocoa content_settings.

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include <map>
 #include <memory>
 
 #include "base/macros.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #include "content/public/common/media_stream_request.h"
 
 class ContentSettingBubbleModel;
 class ContentSettingBubbleWebContentsObserverBridge;
 class ContentSettingMediaMenuModel;
 @class InfoBubbleView;
 
 namespace content {
 class WebContents;
 }
 
 namespace content_setting_bubble {
 // For every "show popup" button, remember the index of the popup tab contents
 // it should open when clicked.
-typedef std::map<NSButton*, int> PopupLinks;
+using PopupLinks = std::map<NSButton*, int>;
 
-// For every media menu button, remember the components assosiated with the
+// For every media menu button, remember the components associated with the
 // menu button.
 struct MediaMenuParts {
   MediaMenuParts(content::MediaStreamType type, NSTextField* label);
   ~MediaMenuParts();
 
   content::MediaStreamType type;
   NSTextField* label;  // Weak.
   std::unique_ptr<ContentSettingMediaMenuModel> model;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaMenuParts);
 };
 
 // Comparator used by MediaMenuPartsMap to order its keys.
 struct compare_button {
   bool operator()(NSPopUpButton *const a, NSPopUpButton *const b) const {
     return [a tag] < [b tag];
   }
 };
-typedef std::map<NSPopUpButton*, MediaMenuParts*, compare_button>
-  MediaMenuPartsMap;
+using MediaMenuPartsMap =
+    std::map<NSPopUpButton*, std::unique_ptr<MediaMenuParts>, compare_button>;
 }  // namespace content_setting_bubble
 
 // Manages a "content blocked" bubble.
 @interface ContentSettingBubbleController : BaseBubbleController {
  @private
   IBOutlet NSTextField* titleLabel_;
   IBOutlet NSTextField* messageLabel_;
   IBOutlet NSMatrix* allowBlockRadioGroup_;
 
   IBOutlet NSButton* manageButton_;
@@ skipping 42 matching lines @@
 - (IBAction)mediaMenuChanged:(id)sender;
 
 @end
 
 @interface ContentSettingBubbleController (TestingAPI)
 
 // Returns the weak reference to the |mediaMenus_|.
 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus;
 
 @end