Remove base::ScopedPtrHashMap from 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>
 #include <utility>
 
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/swap_result.h"
 #include "ui/ozone/platform/drm/gpu/crtc_controller.h"
 #include "ui/ozone/platform/drm/gpu/drm_buffer.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/page_flip_request.h"
 #include "ui/ozone/public/native_pixmap.h"
@@ skipping 84 matching lines @@
   std::sort(pending_planes.begin(), pending_planes.end(),
             [](const OverlayPlane& l, const OverlayPlane& r) {
               return l.z_order < r.z_order;
             });
   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);
+    planes.first->plane_manager()->BeginFrame(planes.second.get());
 
   bool status = true;
   for (const auto& controller : crtc_controllers_) {
     status &= controller->SchedulePageFlip(
-        owned_hardware_planes_.get(controller->drm().get()), pending_planes,
+        owned_hardware_planes_[controller->drm().get()].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)) {
+    if (!planes.first->plane_manager()->Commit(planes.second.get(),
+                                               test_only)) {
       status = false;
     }
   }
 
   return status;
 }
 
 bool HardwareDisplayController::IsFormatSupported(uint32_t fourcc_format,
                                                   uint32_t z_order) const {
   for (size_t i = 0; i < crtc_controllers_.size(); ++i) {
@@ skipping 33 matching lines @@
   bool status = true;
   for (const auto& controller : crtc_controllers_)
     status &= controller->MoveCursor(location);
 
   return status;
 }
 
 void HardwareDisplayController::AddCrtc(
     std::unique_ptr<CrtcController> controller) {
   scoped_refptr<DrmDevice> drm = controller->drm();
-  owned_hardware_planes_.add(drm.get(),
-                             std::unique_ptr<HardwareDisplayPlaneList>(
-                                 new HardwareDisplayPlaneList()));
+  owned_hardware_planes_[drm.get()] =
+      base::MakeUnique<HardwareDisplayPlaneList>();
 
   // Check if this controller owns any planes and ensure we keep track of them.
   const std::vector<std::unique_ptr<HardwareDisplayPlane>>& all_planes =
       drm->plane_manager()->planes();
   HardwareDisplayPlaneList* crtc_plane_list =
-      owned_hardware_planes_.get(drm.get());
+      owned_hardware_planes_[drm.get()].get();
   uint32_t crtc = controller->crtc();
   for (const auto& plane : all_planes) {
     if (plane->in_use() && (plane->owning_crtc() == crtc))
       crtc_plane_list->old_plane_list.push_back(plane.get());
   }
 
   crtc_controllers_.push_back(std::move(controller));
 }
 
 std::unique_ptr<CrtcController> HardwareDisplayController::RemoveCrtc(
@@ skipping 10 matching lines @@
       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());
+            owned_hardware_planes_[drm.get()].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;
@@ skipping 39 matching lines @@
 
 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