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

ui/ozone/platform/drm/gpu/hardware_display_controller.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 "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
 
 #include <drm.h>
 #include <string.h>
 #include <xf86drm.h>
 
@@ skipping 29 matching lines @@
 HardwareDisplayController::~HardwareDisplayController() {
   // Reset the cursor.
   UnsetCursor();
 }
 
 bool HardwareDisplayController::Modeset(const OverlayPlane& primary,
                                         drmModeModeInfo mode) {
   TRACE_EVENT0("drm", "HDC::Modeset");
   DCHECK(primary.buffer.get());
   bool status = true;
-  for (size_t i = 0; i < crtc_controllers_.size(); ++i)
-    status &= crtc_controllers_[i]->Modeset(primary, mode);
+  for (const auto& controller : crtc_controllers_)
+    status &= controller->Modeset(primary, mode);
 
   is_disabled_ = false;
 
   return status;
 }
 
 bool HardwareDisplayController::Enable(const OverlayPlane& primary) {
   TRACE_EVENT0("drm", "HDC::Enable");
   DCHECK(primary.buffer.get());
   bool status = true;
-  for (size_t i = 0; i < crtc_controllers_.size(); ++i) {
-    status &=
-        crtc_controllers_[i]->Modeset(primary, crtc_controllers_[i]->mode());
-  }
+  for (const auto& controller : crtc_controllers_)
+    status &= controller->Modeset(primary, controller->mode());
 
   is_disabled_ = false;
 
   return status;
 }
 
 void HardwareDisplayController::Disable() {
   TRACE_EVENT0("drm", "HDC::Disable");
-  for (size_t i = 0; i < crtc_controllers_.size(); ++i)
-    crtc_controllers_[i]->Disable();
-
+  for (const auto& controller : crtc_controllers_)
+    controller->Disable();
 
   is_disabled_ = true;
 }
 
 void HardwareDisplayController::SchedulePageFlip(
     const OverlayPlaneList& plane_list,
     const PageFlipCallback& callback) {
   ActualSchedulePageFlip(plane_list, false /* test_only */, callback);
 }
 
@@ skipping 27 matching lines @@
             });
   if (pending_planes.front().z_order != 0) {
     callback.Run(gfx::SwapResult::SWAP_FAILED);
     return false;
   }
 
   for (const auto& planes : owned_hardware_planes_)
     planes.first->plane_manager()->BeginFrame(planes.second);
 
   bool status = true;
-  for (size_t i = 0; i < crtc_controllers_.size(); ++i) {
-    status &= crtc_controllers_[i]->SchedulePageFlip(
-        owned_hardware_planes_.get(crtc_controllers_[i]->drm().get()),
-        pending_planes, test_only, page_flip_request);
+  for (const auto& controller : crtc_controllers_) {
+    status &= controller->SchedulePageFlip(
+        owned_hardware_planes_.get(controller->drm().get()), pending_planes,
+        test_only, page_flip_request);
   }
 
   for (const auto& planes : owned_hardware_planes_) {
     if (!planes.first->plane_manager()->Commit(planes.second, test_only)) {
       status = false;
     }
   }
 
   return status;
 }
@@ skipping 18 matching lines @@
   return plane_ids;
 }
 
 bool HardwareDisplayController::SetCursor(
     const scoped_refptr<ScanoutBuffer>& buffer) {
   bool status = true;
 
   if (is_disabled_)
     return true;
 
-  for (size_t i = 0; i < crtc_controllers_.size(); ++i)
-    status &= crtc_controllers_[i]->SetCursor(buffer);
+  for (const auto& controller : crtc_controllers_)
+    status &= controller->SetCursor(buffer);
 
   return status;
 }
 
 bool HardwareDisplayController::UnsetCursor() {
   bool status = true;
-  for (size_t i = 0; i < crtc_controllers_.size(); ++i)
-    status &= crtc_controllers_[i]->SetCursor(nullptr);
+  for (const auto& controller : crtc_controllers_)
+    status &= controller->SetCursor(nullptr);
 
   return status;
 }
 
 bool HardwareDisplayController::MoveCursor(const gfx::Point& location) {
   if (is_disabled_)
     return true;
 
   bool status = true;
-  for (size_t i = 0; i < crtc_controllers_.size(); ++i)
-    status &= crtc_controllers_[i]->MoveCursor(location);
+  for (const auto& controller : crtc_controllers_)
+    status &= controller->MoveCursor(location);
 
   return status;
 }
 
 void HardwareDisplayController::AddCrtc(scoped_ptr<CrtcController> controller) {
   scoped_refptr<DrmDevice> drm = controller->drm();
   owned_hardware_planes_.add(drm.get(), scoped_ptr<HardwareDisplayPlaneList>(
                                             new HardwareDisplayPlaneList()));
 
   // Check if this controller owns any planes and ensure we keep track of them.
-  const ScopedVector<HardwareDisplayPlane>& all_planes =
+  const std::vector<scoped_ptr<HardwareDisplayPlane>>& all_planes =
       drm->plane_manager()->planes();
   HardwareDisplayPlaneList* crtc_plane_list =
       owned_hardware_planes_.get(drm.get());
   uint32_t crtc = controller->crtc();
-  for (auto* plane : all_planes) {
+  for (const auto& plane : all_planes) {
     if (plane->in_use() && (plane->owning_crtc() == crtc))
-      crtc_plane_list->old_plane_list.push_back(plane);
+      crtc_plane_list->old_plane_list.push_back(plane.get());
   }
 
   crtc_controllers_.push_back(controller.Pass());
 }
 
 scoped_ptr<CrtcController> HardwareDisplayController::RemoveCrtc(
     const scoped_refptr<DrmDevice>& drm,
     uint32_t crtc) {
-  for (ScopedVector<CrtcController>::iterator it = crtc_controllers_.begin();
-       it != crtc_controllers_.end(); ++it) {
+  for (auto it = crtc_controllers_.begin(); it != crtc_controllers_.end();
+       ++it) {
     if ((*it)->drm() == drm && (*it)->crtc() == crtc) {
-      scoped_ptr<CrtcController> controller(*it);
-      crtc_controllers_.weak_erase(it);
+      scoped_ptr<CrtcController> controller(std::move(*it));
+      crtc_controllers_.erase(it);
+
       // Remove entry from |owned_hardware_planes_| iff no other crtcs share it.
       bool found = false;
-      for (ScopedVector<CrtcController>::iterator it =
-               crtc_controllers_.begin();
-           it != crtc_controllers_.end(); ++it) {
+      for (auto it = crtc_controllers_.begin(); it != crtc_controllers_.end();
+           ++it) {
         if ((*it)->drm() == controller->drm()) {
           found = true;
           break;
         }
       }
       if (found) {
         std::vector<HardwareDisplayPlane*> all_planes;
         HardwareDisplayPlaneList* plane_list =
             owned_hardware_planes_.get(drm.get());
         all_planes.swap(plane_list->old_plane_list);
         for (auto* plane : all_planes) {
           if (plane->owning_crtc() != crtc)
             plane_list->old_plane_list.push_back(plane);
         }
       } else {
         owned_hardware_planes_.erase(controller->drm().get());
       }
 
       return controller.Pass();
     }
   }
 
   return nullptr;
 }
 
 bool HardwareDisplayController::HasCrtc(const scoped_refptr<DrmDevice>& drm,
                                         uint32_t crtc) const {
-  for (size_t i = 0; i < crtc_controllers_.size(); ++i)
-    if (crtc_controllers_[i]->drm() == drm &&
-        crtc_controllers_[i]->crtc() == crtc)
+  for (const auto& controller : crtc_controllers_) {
+    if (controller->drm() == drm && controller->crtc() == crtc)
       return true;
+  }
 
   return false;
 }
 
 bool HardwareDisplayController::IsMirrored() const {
   return crtc_controllers_.size() > 1;
 }
 
 bool HardwareDisplayController::IsDisabled() const {
   return is_disabled_;
 }
 
 gfx::Size HardwareDisplayController::GetModeSize() const {
   // If there are multiple CRTCs they should all have the same size.
   return gfx::Size(crtc_controllers_[0]->mode().hdisplay,
                    crtc_controllers_[0]->mode().vdisplay);
 }
 
 uint64_t HardwareDisplayController::GetTimeOfLastFlip() const {
   uint64_t time = 0;
-  for (size_t i = 0; i < crtc_controllers_.size(); ++i)
-    if (time < crtc_controllers_[i]->time_of_last_flip())
-      time = crtc_controllers_[i]->time_of_last_flip();
+  for (const auto& controller : crtc_controllers_) {
+    if (time < controller->time_of_last_flip())
+      time = controller->time_of_last_flip();
+  }
 
   return time;
 }
 
 scoped_refptr<DrmDevice> HardwareDisplayController::GetAllocationDrmDevice()
     const {
   DCHECK(!crtc_controllers_.empty());
   // TODO(dnicoara) When we support mirroring across DRM devices, figure out
   // which device should be used for allocations.
   return crtc_controllers_[0]->drm();
 }
 
 }  // namespace ui