Remove ScopedVector from content/.

content/common/input/input_param_traits_unittest.cc

 // Copyright 2013 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/common/input/input_param_traits.h"
 
 #include <stddef.h>
+
+#include <memory>
 #include <utility>
+#include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "content/common/input/input_event.h"
 #include "content/common/input/synthetic_gesture_params.h"
 #include "content/common/input/synthetic_pinch_gesture_params.h"
 #include "content/common/input/synthetic_pointer_action_list_params.h"
 #include "content/common/input/synthetic_pointer_action_params.h"
 #include "content/common/input/synthetic_smooth_drag_gesture_params.h"
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
 #include "content/common/input_messages.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebGestureEvent.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/WebKit/public/platform/WebKeyboardEvent.h"
 #include "third_party/WebKit/public/platform/WebMouseWheelEvent.h"
 #include "third_party/WebKit/public/platform/WebTouchEvent.h"
 
 namespace content {
 namespace {
 
-typedef ScopedVector<InputEvent> InputEvents;
+typedef std::vector<std::unique_ptr<InputEvent>> InputEvents;
 
 class InputParamTraitsTest : public testing::Test {
  protected:
   static void Compare(const InputEvent* a, const InputEvent* b) {
     EXPECT_EQ(!!a->web_event, !!b->web_event);
     if (a->web_event && b->web_event) {
       const size_t a_size = a->web_event->size();
       ASSERT_EQ(a_size, b->web_event->size());
       EXPECT_EQ(0, memcmp(a->web_event.get(), b->web_event.get(), a_size));
     }
     EXPECT_EQ(a->latency_info.latency_components().size(),
               b->latency_info.latency_components().size());
   }
 
   static void Compare(const InputEvents* a, const InputEvents* b) {
     for (size_t i = 0; i < a->size(); ++i)
-      Compare((*a)[i], (*b)[i]);
+      Compare((*a)[i].get(), (*b)[i].get());
   }
 
   static void Compare(const SyntheticSmoothScrollGestureParams* a,
                       const SyntheticSmoothScrollGestureParams* b) {
     EXPECT_EQ(a->gesture_source_type, b->gesture_source_type);
     EXPECT_EQ(a->anchor, b->anchor);
     EXPECT_EQ(a->distances.size(), b->distances.size());
     for (size_t i = 0; i < a->distances.size(); i++)
       EXPECT_EQ(a->distances[i], b->distances[i]);
     EXPECT_EQ(a->prevent_fling, b->prevent_fling);
@@ skipping 136 matching lines @@
 
 TEST_F(InputParamTraitsTest, InitializedEvents) {
   InputEvents events;
 
   ui::LatencyInfo latency;
 
   blink::WebKeyboardEvent key_event(blink::WebInputEvent::RawKeyDown,
                                     blink::WebInputEvent::NoModifiers,
                                     blink::WebInputEvent::TimeStampForTesting);
   key_event.nativeKeyCode = 5;
-  events.push_back(new InputEvent(key_event, latency));
+  events.push_back(base::MakeUnique<InputEvent>(key_event, latency));
 
   blink::WebMouseWheelEvent wheel_event(
       blink::WebInputEvent::MouseWheel, blink::WebInputEvent::NoModifiers,
       blink::WebInputEvent::TimeStampForTesting);
   wheel_event.deltaX = 10;
   latency.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT, 1, 1);
-  events.push_back(new InputEvent(wheel_event, latency));
+  events.push_back(base::MakeUnique<InputEvent>(wheel_event, latency));
 
   blink::WebMouseEvent mouse_event(blink::WebInputEvent::MouseDown,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
   mouse_event.x = 10;
   latency.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 2, 2);
-  events.push_back(new InputEvent(mouse_event, latency));
+  events.push_back(base::MakeUnique<InputEvent>(mouse_event, latency));
 
   blink::WebGestureEvent gesture_event(
       blink::WebInputEvent::GestureScrollBegin,
       blink::WebInputEvent::NoModifiers,
       blink::WebInputEvent::TimeStampForTesting);
   gesture_event.x = -1;
-  events.push_back(new InputEvent(gesture_event, latency));
+  events.push_back(base::MakeUnique<InputEvent>(gesture_event, latency));
 
   blink::WebTouchEvent touch_event(blink::WebInputEvent::TouchStart,
                                    blink::WebInputEvent::NoModifiers,
                                    blink::WebInputEvent::TimeStampForTesting);
   touch_event.touchesLength = 1;
   touch_event.touches[0].radiusX = 1;
-  events.push_back(new InputEvent(touch_event, latency));
+  events.push_back(base::MakeUnique<InputEvent>(touch_event, latency));
 
   Verify(events);
 }
 
 TEST_F(InputParamTraitsTest, InvalidSyntheticGestureParams) {
   IPC::Message msg;
   // Write invalid value for SyntheticGestureParams::GestureType.
   WriteParam(&msg, -3);
 
   SyntheticGesturePacket packet_out;
@@ skipping 114 matching lines @@
 
   ASSERT_EQ(SyntheticGestureParams::POINTER_ACTION_LIST,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(std::move(gesture_params));
   Verify(packet_in);
 }
 
 }  // namespace
 }  // namespace content