Replace scoped_ptr with std::unique_ptr in //ui

ui/base/x/x11_util.cc

 // Copyright (c) 2012 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.
 
 // This file defines utility functions for X11 (Linux only). This code has been
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
 #include "ui/base/x/x11_util.h"
 
+#include <X11/Xcursor/Xcursor.h>
+#include <X11/extensions/XInput2.h>
+#include <X11/extensions/shape.h>
 #include <ctype.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
 #include <list>
 #include <map>
+#include <memory>
 #include <utility>
 #include <vector>
 
-#include <X11/extensions/shape.h>
-#include <X11/extensions/XInput2.h>
-#include <X11/Xcursor/Xcursor.h>
-
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_byteorder.h"
 #include "base/threading/thread.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 829 matching lines @@
 
 bool SetIntArrayProperty(XID window,
                          const std::string& name,
                          const std::string& type,
                          const std::vector<int>& value) {
   DCHECK(!value.empty());
   XAtom name_atom = GetAtom(name.c_str());
   XAtom type_atom = GetAtom(type.c_str());
 
   // XChangeProperty() expects values of type 32 to be longs.
-  scoped_ptr<long[]> data(new long[value.size()]);
+  std::unique_ptr<long[]> data(new long[value.size()]);
   for (size_t i = 0; i < value.size(); ++i)
     data[i] = value[i];
 
   gfx::X11ErrorTracker err_tracker;
   XChangeProperty(gfx::GetXDisplay(),
                   window,
                   name_atom,
                   type_atom,
                   32,  // size in bits of items in 'value'
                   PropModeReplace,
@@ skipping 12 matching lines @@
 
 bool SetAtomArrayProperty(XID window,
                           const std::string& name,
                           const std::string& type,
                           const std::vector<XAtom>& value) {
   DCHECK(!value.empty());
   XAtom name_atom = GetAtom(name.c_str());
   XAtom type_atom = GetAtom(type.c_str());
 
   // XChangeProperty() expects values of type 32 to be longs.
-  scoped_ptr<XAtom[]> data(new XAtom[value.size()]);
+  std::unique_ptr<XAtom[]> data(new XAtom[value.size()]);
   for (size_t i = 0; i < value.size(); ++i)
     data[i] = value[i];
 
   gfx::X11ErrorTracker err_tracker;
   XChangeProperty(gfx::GetXDisplay(),
                   window,
                   name_atom,
                   type_atom,
                   32,  // size in bits of items in 'value'
                   PropModeReplace,
@@ skipping 201 matching lines @@
       windows->push_back(stack[i]);
   }
 
   return result;
 }
 
 bool CopyAreaToCanvas(XID drawable,
                       gfx::Rect source_bounds,
                       gfx::Point dest_offset,
                       gfx::Canvas* canvas) {
-  scoped_ptr<XImage, XImageDeleter> image(XGetImage(
+  std::unique_ptr<XImage, XImageDeleter> image(XGetImage(
       gfx::GetXDisplay(), drawable, source_bounds.x(), source_bounds.y(),
       source_bounds.width(), source_bounds.height(), AllPlanes, ZPixmap));
   if (!image) {
     LOG(ERROR) << "XGetImage failed";
     return false;
   }
 
   if (image->bits_per_pixel == 32) {
     if ((0xff << SK_R32_SHIFT) != image->red_mask ||
         (0xff << SK_G32_SHIFT) != image->green_mask ||
@@ skipping 327 matching lines @@
   if (depth)
     *depth = s_depth;
 }
 #endif
 
 // ----------------------------------------------------------------------------
 // End of x11_util_internal.h
 
 
 }  // namespace ui