Remove stl_util's STLDeleteContainerPairSecondPointers from ui/.

ui/display/chromeos/x11/native_display_delegate_x11.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/display/chromeos/x11/native_display_delegate_x11.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/extensions/XInput2.h>
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "ui/display/chromeos/x11/display_mode_x11.h"
 #include "ui/display/chromeos/x11/display_snapshot_x11.h"
 #include "ui/display/chromeos/x11/display_util_x11.h"
 #include "ui/display/chromeos/x11/native_display_event_dispatcher_x11.h"
 #include "ui/display/types/native_display_observer.h"
 #include "ui/display/util/x11/edid_parser_x11.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/x/x11_error_tracker.h"
 #include "ui/gfx/x/x11_types.h"
@@ skipping 79 matching lines @@
     : display_(gfx::GetXDisplay()),
       window_(DefaultRootWindow(display_)),
       background_color_argb_(0) {}
 
 NativeDisplayDelegateX11::~NativeDisplayDelegateX11() {
   if (ui::PlatformEventSource::GetInstance() &&
       platform_event_dispatcher_.get()) {
     ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(
         platform_event_dispatcher_.get());
   }
-
-  base::STLDeleteContainerPairSecondPointers(modes_.begin(), modes_.end());
 }
 
 void NativeDisplayDelegateX11::Initialize() {
   int error_base_ignored = 0;
   int xrandr_event_base = 0;
   XRRQueryExtension(display_, &xrandr_event_base, &error_base_ignored);
 
   helper_delegate_.reset(new HelperDelegateX11(this));
   platform_event_dispatcher_.reset(new NativeDisplayEventDispatcherX11(
       helper_delegate_.get(), xrandr_event_base));
@@ skipping 149 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void NativeDisplayDelegateX11::RemoveObserver(NativeDisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void NativeDisplayDelegateX11::InitModes() {
   CHECK(screen_) << "Server not grabbed";
 
-  base::STLDeleteContainerPairSecondPointers(modes_.begin(), modes_.end());
   modes_.clear();
 
   for (int i = 0; i < screen_->nmode; ++i) {
     const XRRModeInfo& info = screen_->modes[i];
     float refresh_rate = 0.0f;
     if (info.hTotal && info.vTotal) {
       refresh_rate =
           static_cast<float>(info.dotClock) /
           (static_cast<float>(info.hTotal) * static_cast<float>(info.vTotal));
     }
 
-    modes_.insert(
-        std::make_pair(info.id,
-                       new DisplayModeX11(gfx::Size(info.width, info.height),
-                                          info.modeFlags & RR_Interlace,
-                                          refresh_rate,
-                                          info.id)));
+    modes_.insert(std::make_pair(
+        info.id, base::MakeUnique<DisplayModeX11>(
+                     gfx::Size(info.width, info.height),
+                     info.modeFlags & RR_Interlace, refresh_rate, info.id)));
   }
 }
 
 DisplaySnapshotX11* NativeDisplayDelegateX11::InitDisplaySnapshot(
     RROutput output,
     XRROutputInfo* info,
     std::set<RRCrtc>* last_used_crtcs,
     int index) {
   int64_t display_id = 0;
   display::EDIDParserX11 edid_parser(output);
@@ skipping 339 matching lines @@
   XSetForeground(display_, gc, color.pixel);
   XSetFillStyle(display_, gc, FillSolid);
   int width = DisplayWidth(display_, DefaultScreen(display_));
   int height = DisplayHeight(display_, DefaultScreen(display_));
   XFillRectangle(display_, window_, gc, 0, 0, width, height);
   XFreeGC(display_, gc);
   XFreeColors(display_, colormap, &color.pixel, 1, 0);
 }
 
 }  // namespace ui