Remove ScopedVector from content/renderer/.

content/renderer/scheduler/resource_dispatch_throttler_unittest.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/scheduler/resource_dispatch_throttler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
+#include <memory>
+#include <vector>
+
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
+#include "base/memory/ptr_util.h"
 #include "content/common/resource_messages.h"
 #include "content/common/resource_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/scheduler/test/fake_renderer_scheduler.h"
 
 namespace content {
 namespace {
 
 const uint32_t kRequestsPerFlush = 4;
 const double kFlushPeriodSeconds = 1.f / 60;
 const int kRoutingId = 1;
 
-typedef ScopedVector<IPC::Message> ScopedMessages;
+typedef std::vector<std::unique_ptr<IPC::Message>> ScopedMessages;
 
 int GetRequestId(const IPC::Message& msg) {
   int request_id = -1;
   switch (msg.type()) {
     case ResourceHostMsg_RequestResource::ID: {
       base::PickleIterator iter(msg);
       int routing_id = -1;
       if (!iter.ReadInt(&routing_id) || !iter.ReadInt(&request_id))
         NOTREACHED() << "Invalid id for resource request message.";
     } break;
@@ skipping 71 matching lines @@
 
 class ResourceDispatchThrottlerTest : public testing::Test, public IPC::Sender {
  public:
   ResourceDispatchThrottlerTest() : last_request_id_(0) {
     throttler_.reset(new ResourceDispatchThrottlerForTest(this, &scheduler_));
   }
   ~ResourceDispatchThrottlerTest() override {}
 
   // IPC::Sender implementation:
   bool Send(IPC::Message* msg) override {
-    sent_messages_.push_back(msg);
+    sent_messages_.push_back(base::WrapUnique(msg));
     return true;
   }
 
  protected:
   void SetHighPriorityWorkAnticipated(bool anticipated) {
     scheduler_.set_high_priority_work_anticipated(anticipated);
   }
 
   void Advance(base::TimeDelta delta) { throttler_->Advance(delta); }
 
@@ skipping 36 matching lines @@
     return throttler_->Send(new ResourceHostMsg_CancelRequest(request_id));
   }
 
   size_t GetAndResetSentMessageCount() {
     size_t sent_message_count = sent_messages_.size();
     sent_messages_.clear();
     return sent_message_count;
   }
 
   const IPC::Message* LastSentMessage() const {
-    return sent_messages_.empty() ? nullptr : sent_messages_.back();
+    return sent_messages_.empty() ? nullptr : sent_messages_.back().get();
   }
 
   int LastSentRequestId() const {
     const IPC::Message* msg = LastSentMessage();
     if (!msg)
       return -1;
 
     int routing_id = -1;
     int request_id = -1;
     base::PickleIterator iter(*msg);
@@ skipping 223 matching lines @@
     EXPECT_EQ(priority_msg.type(), ResourceHostMsg_DidChangePriority::ID);
     EXPECT_EQ(cancel_msg.type(), ResourceHostMsg_CancelRequest::ID);
 
     EXPECT_EQ(GetRequestId(request_msg), GetRequestId(priority_msg));
     EXPECT_EQ(GetRequestId(request_msg) - 1, GetRequestId(cancel_msg));
   }
   EXPECT_FALSE(FlushScheduled());
 }
 
 }  // namespace content