Replace scoped_ptr with std::unique_ptr in //ui

ui/gfx/image/image_skia.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.
 
 #include "ui/gfx/image/image_skia.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <memory>
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/threading/non_thread_safe.h"
 #include "build/build_config.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/switches.h"
 
@@ skipping 88 matching lines @@
       bool fetch_new_image) const;
 
  private:
   friend class base::RefCountedThreadSafe<ImageSkiaStorage>;
 
   virtual ~ImageSkiaStorage();
 
   // Vector of bitmaps and their associated scale.
   std::vector<gfx::ImageSkiaRep> image_reps_;
 
-  scoped_ptr<ImageSkiaSource> source_;
+  std::unique_ptr<ImageSkiaSource> source_;
 
   // Size of the image in DIP.
   gfx::Size size_;
 
   bool read_only_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageSkiaStorage);
 };
 
 ImageSkiaStorage::ImageSkiaStorage(ImageSkiaSource* source,
@@ skipping 192 matching lines @@
 // static
 float ImageSkia::GetMaxSupportedScale() {
   return g_supported_scales->back();
 }
 
 // static
 ImageSkia ImageSkia::CreateFrom1xBitmap(const SkBitmap& bitmap) {
   return ImageSkia(ImageSkiaRep(bitmap, 0.0f));
 }
 
-scoped_ptr<ImageSkia> ImageSkia::DeepCopy() const {
+std::unique_ptr<ImageSkia> ImageSkia::DeepCopy() const {
   ImageSkia* copy = new ImageSkia;
   if (isNull())
-    return make_scoped_ptr(copy);
+    return base::WrapUnique(copy);
 
   CHECK(CanRead());
 
   std::vector<gfx::ImageSkiaRep>& reps = storage_->image_reps();
   for (std::vector<gfx::ImageSkiaRep>::iterator iter = reps.begin();
        iter != reps.end(); ++iter) {
     copy->AddRepresentation(*iter);
   }
   // The copy has its own storage. Detach the copy from the current
   // thread so that other thread can use this.
   if (!copy->isNull())
     copy->storage_->DetachFromThread();
-  return make_scoped_ptr(copy);
+  return base::WrapUnique(copy);
 }
 
 bool ImageSkia::BackedBySameObjectAs(const gfx::ImageSkia& other) const {
   return storage_.get() == other.storage_.get();
 }
 
 void ImageSkia::AddRepresentation(const ImageSkiaRep& image_rep) {
   DCHECK(!image_rep.is_null());
 
   // TODO(oshima): This method should be called |SetRepresentation|
@@ skipping 153 matching lines @@
 bool ImageSkia::CanModify() const {
   return !storage_.get() || storage_->CanModify();
 }
 
 void ImageSkia::DetachStorageFromThread() {
   if (storage_.get())
     storage_->DetachFromThread();
 }
 
 }  // namespace gfx