Remove stl_util's STLDeleteContainerPairSecondPointers from extensions.

chrome/browser/extensions/api/messaging/message_service.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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_MESSAGING_MESSAGE_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_MESSAGING_MESSAGE_SERVICE_H_
 
 #include <map>
 #include <memory>
 #include <set>
@@ skipping 167 matching lines @@
   // Enqueues a message on a pending channel, or sends a message to the given
   // port if the channel isn't pending.
   void PostMessage(int port_id, const Message& message);
 
  private:
   friend class MockMessageService;
   friend class BrowserContextKeyedAPIFactory<MessageService>;
   struct OpenChannelParams;
 
   // A map of channel ID to its channel object.
-  typedef std::map<int, MessageChannel*> MessageChannelMap;
+  using MessageChannelMap = std::map<int, std::unique_ptr<MessageChannel>>;
 
-  typedef std::pair<int, Message> PendingMessage;
-  typedef std::vector<PendingMessage> PendingMessagesQueue;
+  using PendingMessage = std::pair<int, Message>;
+  using PendingMessagesQueue = std::vector<PendingMessage>;
   // A set of channel IDs waiting to complete opening, and any pending messages
   // queued to be sent on those channels.
-  typedef std::map<int, PendingMessagesQueue> PendingChannelMap;
+  using PendingChannelMap = std::map<int, PendingMessagesQueue>;
 
   // A map of channel ID to information about the extension that is waiting
   // for that channel to open. Used for lazy background pages.
-  typedef std::string ExtensionID;
-  typedef std::pair<content::BrowserContext*, ExtensionID>
-      PendingLazyBackgroundPageChannel;
-  typedef std::map<int, PendingLazyBackgroundPageChannel>
-      PendingLazyBackgroundPageChannelMap;
+  using ExtensionID = std::string;
+  using PendingLazyBackgroundPageChannel =
+      std::pair<content::BrowserContext*, ExtensionID>;
+  using PendingLazyBackgroundPageChannelMap =
+      std::map<int, PendingLazyBackgroundPageChannel>;
 
   // Common implementation for opening a channel configured by |params|.
   //
   // |target_extension| will be non-null if |params->target_extension_id| is
   // non-empty, that is, if the target is an extension, it must exist.
   //
   // |did_enqueue| will be true if the channel opening was delayed while
   // waiting for an event page to start, false otherwise.
   void OpenChannelImpl(content::BrowserContext* browser_context,
                        std::unique_ptr<OpenChannelParams> params,
                        const Extension* target_extension,
                        bool did_enqueue);
 
   void ClosePortImpl(int port_id,
                      int process_id,
                      int routing_id,
                      bool force_close,
                      const std::string& error_message);
 
   void CloseChannelImpl(MessageChannelMap::iterator channel_iter,
                         int port_id,
                         const std::string& error_message,
                         bool notify_other_port);
 
   // Have MessageService take ownership of |channel|, and remove any pending
   // channels with the same id.
-  void AddChannel(MessageChannel* channel, int receiver_port_id);
+  void AddChannel(std::unique_ptr<MessageChannel> channel,
+                  int receiver_port_id);
 
   // If the channel is being opened from an incognito tab the user must allow
   // the connection.
   void OnOpenChannelAllowed(std::unique_ptr<OpenChannelParams> params,
                             bool allowed);
   void GotChannelID(std::unique_ptr<OpenChannelParams> params,
                     const std::string& tls_channel_id);
 
   // Enqueues a message on a pending channel.
   void EnqueuePendingMessage(int port_id, int channel_id,
@@ skipping 75 matching lines @@
   LazyBackgroundTaskQueue* lazy_background_task_queue_;
 
   base::WeakPtrFactory<MessageService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageService);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_MESSAGING_MESSAGE_SERVICE_H_