Remove deprecated ScopedVector usage from ui/ozone and ui/events/ozone

ui/ozone/platform/drm/common/drm_util.cc

Index: ui/ozone/platform/drm/common/drm_util.cc
diff --git a/ui/ozone/platform/drm/common/drm_util.cc b/ui/ozone/platform/drm/common/drm_util.cc
index 00d43337baa862c54daf040dca7ade2d647acc63..ed99a10d7c0f427e3a4862b334d793a3504ef67b 100644
--- a/ui/ozone/platform/drm/common/drm_util.cc
+++ b/ui/ozone/platform/drm/common/drm_util.cc
@@ -21,9 +21,9 @@ namespace ui {
 namespace {
 
 bool IsCrtcInUse(uint32_t crtc,
-                 const ScopedVector<HardwareDisplayControllerInfo>& displays) {
-  for (size_t i = 0; i < displays.size(); ++i) {
-    if (crtc == displays[i]->crtc()->crtc_id)
+                 const std::vector<HardwareDisplayControllerInfo>& displays) {
+  for (const auto& display : displays) {
+    if (crtc == display.crtc()->crtc_id)
       return true;
   }
 
@@ -33,7 +33,7 @@ bool IsCrtcInUse(uint32_t crtc,
 uint32_t GetCrtc(int fd,
                  drmModeConnector* connector,
                  drmModeRes* resources,
-                 const ScopedVector<HardwareDisplayControllerInfo>& displays) {
+                 const std::vector<HardwareDisplayControllerInfo>& displays) {
   // If the connector already has an encoder try to re-use.
   if (connector->encoder_id) {
     ScopedDrmEncoderPtr encoder(drmModeGetEncoder(fd, connector->encoder_id));
@@ -164,14 +164,11 @@ HardwareDisplayControllerInfo::HardwareDisplayControllerInfo(
     size_t index)
     : connector_(connector.Pass()), crtc_(crtc.Pass()), index_(index) {}
 
-HardwareDisplayControllerInfo::~HardwareDisplayControllerInfo() {
-}
-
-ScopedVector<HardwareDisplayControllerInfo> GetAvailableDisplayControllerInfos(
+std::vector<HardwareDisplayControllerInfo> GetAvailableDisplayControllerInfos(
     int fd) {
   ScopedDrmResourcesPtr resources(drmModeGetResources(fd));
   DCHECK(resources) << "Failed to get DRM resources";
-  ScopedVector<HardwareDisplayControllerInfo> displays;
+  std::vector<HardwareDisplayControllerInfo> displays;
 
   for (int i = 0; i < resources->count_connectors; ++i) {
     ScopedDrmConnectorPtr connector(
@@ -187,10 +184,10 @@ ScopedVector<HardwareDisplayControllerInfo> GetAvailableDisplayControllerInfos(
 
     ScopedDrmCrtcPtr crtc(drmModeGetCrtc(fd, crtc_id));
     displays.push_back(
-        new HardwareDisplayControllerInfo(connector.Pass(), crtc.Pass(), i));
+        HardwareDisplayControllerInfo(connector.Pass(), crtc.Pass(), i));
   }
 
-  return displays.Pass();
+  return displays;
 }
 
 bool SameMode(const drmModeModeInfo& lhs, const drmModeModeInfo& rhs) {
@@ -213,22 +210,22 @@ DisplayMode_Params CreateDisplayModeParams(const drmModeModeInfo& mode) {
 }
 
 DisplaySnapshot_Params CreateDisplaySnapshotParams(
-    HardwareDisplayControllerInfo* info,
+    const HardwareDisplayControllerInfo& info,
     int fd,
     size_t device_index,
     const gfx::Point& origin) {
   DisplaySnapshot_Params params;
-  int64 connector_index = ConnectorIndex(device_index, info->index());
+  int64 connector_index = ConnectorIndex(device_index, info.index());
   params.display_id = connector_index;
   params.origin = origin;
   params.physical_size =
-      gfx::Size(info->connector()->mmWidth, info->connector()->mmHeight);
-  params.type = GetDisplayType(info->connector());
+      gfx::Size(info.connector()->mmWidth, info.connector()->mmHeight);
+  params.type = GetDisplayType(info.connector());
   params.is_aspect_preserving_scaling =
-      IsAspectPreserving(fd, info->connector());
+      IsAspectPreserving(fd, info.connector());
 
   ScopedDrmPropertyBlobPtr edid_blob(
-      GetDrmPropertyBlob(fd, info->connector(), "EDID"));
+      GetDrmPropertyBlob(fd, info.connector(), "EDID"));
 
   if (edid_blob) {
     std::vector<uint8_t> edid(
@@ -243,14 +240,14 @@ DisplaySnapshot_Params CreateDisplaySnapshotParams(
     ParseOutputOverscanFlag(edid, &params.has_overscan);
   } else {
     VLOG(1) << "Failed to get EDID blob for connector "
-            << info->connector()->connector_id;
+            << info.connector()->connector_id;
   }
 
-  for (int i = 0; i < info->connector()->count_modes; ++i) {
-    const drmModeModeInfo& mode = info->connector()->modes[i];
+  for (int i = 0; i < info.connector()->count_modes; ++i) {
+    const drmModeModeInfo& mode = info.connector()->modes[i];
     params.modes.push_back(CreateDisplayModeParams(mode));
 
-    if (info->crtc()->mode_valid && SameMode(info->crtc()->mode, mode)) {
+    if (info.crtc()->mode_valid && SameMode(info.crtc()->mode, mode)) {
       params.has_current_mode = true;
       params.current_mode = params.modes.back();
     }