Remove stl_util's deletion function use from content/.

content/renderer/gpu/frame_swap_message_queue.cc

 // Copyright 2014 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 "content/renderer/gpu/frame_swap_message_queue.h"
 
 #include <algorithm>
 #include <limits>
+#include <memory>
 #include <utility>
 
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "ipc/ipc_message.h"
 
 using std::vector;
@@ skipping 23 matching lines @@
  public:
   SendMessageScopeImpl(base::Lock* lock) : auto_lock_(*lock) {}
   ~SendMessageScopeImpl() override {}
 
  private:
   base::AutoLock auto_lock_;
 };
 
 class VisualStateQueue : public FrameSwapMessageSubQueue {
  public:
-  VisualStateQueue() {}
+  VisualStateQueue() = default;
 
-  ~VisualStateQueue() override {
-    for (VisualStateQueueMap::iterator i = queue_.begin(); i != queue_.end();
-         i++) {
-      base::STLDeleteElements(&i->second);
-    }
-  }
+  ~VisualStateQueue() override = default;
 
   bool Empty() const override { return queue_.empty(); }
 
   void QueueMessage(int source_frame_number,
                     std::unique_ptr<IPC::Message> msg,
                     bool* is_first) override {
     if (is_first)
       *is_first = (queue_.count(source_frame_number) == 0);
 
-    queue_[source_frame_number].push_back(msg.release());
+    queue_[source_frame_number].push_back(std::move(msg));
   }
 
   void DrainMessages(
       int source_frame_number,
       std::vector<std::unique_ptr<IPC::Message>>* messages) override {
     auto end = queue_.upper_bound(source_frame_number);
     for (auto i = queue_.begin(); i != end; i++) {
       DCHECK(i->first <= source_frame_number);
-      for (IPC::Message* msg : i->second) {
-        messages->push_back(base::WrapUnique(msg));
-      }
-      i->second.clear();
+      std::move(i->second.begin(), i->second.end(),
+                std::back_inserter(*messages));
     }
     queue_.erase(queue_.begin(), end);
   }
 
  private:
-  typedef std::map<int, std::vector<IPC::Message*> > VisualStateQueueMap;
-  VisualStateQueueMap queue_;
+  std::map<int, std::vector<std::unique_ptr<IPC::Message>>> queue_;
 
   DISALLOW_COPY_AND_ASSIGN(VisualStateQueue);
 };
 
 // Queue specific to MESSAGE_DELIVERY_POLICY_WITH_NEXT_SWAP.
 class SwapQueue : public FrameSwapMessageSubQueue {
  public:
   SwapQueue() {}
   bool Empty() const override { return queue_.empty(); }
 
@@ skipping 108 matching lines @@
 void FrameSwapMessageQueue::TransferMessages(
     std::vector<std::unique_ptr<IPC::Message>>* source,
     vector<IPC::Message>* dest) {
   for (const auto& msg : *source) {
     dest->push_back(*msg.get());
   }
   source->clear();
 }
 
 }  // namespace content