Delete the controllers when ScreenManager is deleted

ui/ozone/platform/dri/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/dri/screen_manager.h"
 
 #include <xf86drmMode.h>
 
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/ozone/platform/dri/dri_util.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/scanout_surface.h"
 
 namespace ui {
 
 ScreenManager::ScreenManager(
     DriWrapper* dri, ScanoutSurfaceGenerator* surface_generator)
     : dri_(dri), surface_generator_(surface_generator), last_added_widget_(0) {
 }
 
 ScreenManager::~ScreenManager() {
+  STLDeleteContainerPairSecondPointers(
+      controllers_.begin(), controllers_.end());
 }
 
 void ScreenManager::RemoveDisplayController(uint32_t crtc, uint32_t connector) {
   HardwareDisplayControllerMap::iterator it =
       FindDisplayController(crtc, connector);
   if (it != controllers_.end()) {
     delete it->second;
     controllers_.erase(it);
   }
 }
@@ skipping 92 matching lines @@
     dri_->SetProperty(displays[0]->connector()->connector_id,
                       dpms->prop_id,
                       DRM_MODE_DPMS_ON);
 
   ConfigureDisplayController(displays[0]->crtc()->crtc_id,
                              displays[0]->connector()->connector_id,
                              displays[0]->connector()->modes[0]);
 }
 
 }  // namespace ui