Remove base::ScopedPtrHashMap from ozone.

ui/ozone/platform/drm/gpu/screen_manager.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/screen_manager.h"
 
 #include <xf86drmMode.h>
 
 #include <utility>
 
@@ skipping 201 matching lines @@
       FindActiveDisplayControllerByLocation(bounds);
   if (it != controllers_.end())
     return it->get();
 
   return nullptr;
 }
 
 void ScreenManager::AddWindow(gfx::AcceleratedWidget widget,
                               std::unique_ptr<DrmWindow> window) {
   std::pair<WidgetToWindowMap::iterator, bool> result =
-      window_map_.add(widget, std::move(window));
+      window_map_.insert(std::make_pair(widget, std::move(window)));
   DCHECK(result.second) << "Window already added.";
   UpdateControllerToWindowMapping();
 }
 
 std::unique_ptr<DrmWindow> ScreenManager::RemoveWindow(
     gfx::AcceleratedWidget widget) {
-  std::unique_ptr<DrmWindow> window = window_map_.take_and_erase(widget);
+  std::unique_ptr<DrmWindow> window = std::move(window_map_[widget]);
+  window_map_.erase(widget);
   DCHECK(window) << "Attempting to remove non-existing window for " << widget;
   UpdateControllerToWindowMapping();
   return window;
 }
 
 DrmWindow* ScreenManager::GetWindow(gfx::AcceleratedWidget widget) {
   WidgetToWindowMap::iterator it = window_map_.find(widget);
   if (it != window_map_.end())
-    return it->second;
+    return it->second.get();
 
   return nullptr;
 }
 
 ScreenManager::HardwareDisplayControllers::iterator
 ScreenManager::FindDisplayController(const scoped_refptr<DrmDevice>& drm,
                                      uint32_t crtc) {
   for (auto it = controllers_.begin(); it != controllers_.end(); ++it) {
     if ((*it)->HasCrtc(drm, crtc))
       return it;
@@ skipping 55 matching lines @@
 
     DrmWindow* window = FindWindowAt(
         gfx::Rect(controller->origin(), controller->GetModeSize()));
     if (!window)
       continue;
 
     window_to_controller_map[window] = controller.get();
   }
 
   // Apply the new mapping to all windows.
-  for (auto pair : window_map_) {
-    auto it = window_to_controller_map.find(pair.second);
+  for (auto& pair : window_map_) {
+    auto it = window_to_controller_map.find(pair.second.get());
     HardwareDisplayController* controller = nullptr;
     if (it != window_to_controller_map.end())
       controller = it->second;
 
     bool should_enable =
         controller && pair.second->GetController() != controller;
     pair.second->SetController(controller);
 
     // If we're moving windows between controllers modeset the controller
     // otherwise the controller may be waiting for a page flip while the window
@@ skipping 53 matching lines @@
   OverlayPlane plane = GetModesetBuffer(controller, rect);
   if (!plane.buffer || !controller->Modeset(plane, mode)) {
     LOG(ERROR) << "Failed to modeset controller";
     return false;
   }
 
   return true;
 }
 
 DrmWindow* ScreenManager::FindWindowAt(const gfx::Rect& bounds) const {
-  for (auto pair : window_map_) {
+  for (auto& pair : window_map_) {
     if (pair.second->bounds() == bounds)
-      return pair.second;
+      return pair.second.get();
   }
 
   return nullptr;
 }
 
 }  // namespace ui