Replace scoped_ptr with std::unique_ptr in //ui

ui/views/mus/surface_binding.cc

 // Copyright 2015 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/views/mus/surface_binding.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/threading/thread_local.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/software_output_device.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "components/mus/public/cpp/context_provider.h"
 #include "components/mus/public/cpp/output_surface.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
@@ skipping 12 matching lines @@
 // CreateOutputSurface. SurfaceBinding obtains a pointer to the
 // PerConnectionState appropriate for the ViewManager. PerConnectionState is
 // stored in a thread local map. When no more refereces to a PerConnectionState
 // remain the PerConnectionState is deleted and the underlying map cleaned up.
 class SurfaceBinding::PerConnectionState
     : public base::RefCounted<PerConnectionState> {
  public:
   static PerConnectionState* Get(mojo::Connector* connector,
                                  mus::WindowTreeConnection* connection);
 
-  scoped_ptr<cc::OutputSurface> CreateOutputSurface(
+  std::unique_ptr<cc::OutputSurface> CreateOutputSurface(
       mus::Window* window,
       mus::mojom::SurfaceType type);
 
  private:
   typedef std::map<mus::WindowTreeConnection*, PerConnectionState*>
       ConnectionToStateMap;
 
   friend class base::RefCounted<PerConnectionState>;
 
   PerConnectionState(mojo::Connector* connector,
@@ skipping 28 matching lines @@
     window_map = new ConnectionToStateMap;
     window_states.Pointer()->Set(window_map);
   }
   if (!(*window_map)[connection]) {
     (*window_map)[connection] = new PerConnectionState(connector, connection);
     (*window_map)[connection]->Init();
   }
   return (*window_map)[connection];
 }
 
-scoped_ptr<cc::OutputSurface>
+std::unique_ptr<cc::OutputSurface>
 SurfaceBinding::PerConnectionState::CreateOutputSurface(
     mus::Window* window,
     mus::mojom::SurfaceType surface_type) {
   // TODO(sky): figure out lifetime here. Do I need to worry about the return
   // value outliving this?
   mus::mojom::CommandBufferPtr cb;
   gpu_->CreateOffscreenGLES2Context(GetProxy(&cb));
 
   scoped_refptr<cc::ContextProvider> context_provider(
       new mus::ContextProvider(cb.PassInterface().PassHandle()));
-  return make_scoped_ptr(new mus::OutputSurface(
+  return base::WrapUnique(new mus::OutputSurface(
       context_provider, window->RequestSurface(surface_type)));
 }
 
 SurfaceBinding::PerConnectionState::PerConnectionState(
     mojo::Connector* connector,
     mus::WindowTreeConnection* connection)
     : connector_(connector), connection_(connection) {}
 
 SurfaceBinding::PerConnectionState::~PerConnectionState() {
   ConnectionToStateMap* window_map = window_states.Pointer()->Get();
@@ skipping 14 matching lines @@
 
 SurfaceBinding::SurfaceBinding(mojo::Connector* connector,
                                mus::Window* window,
                                mus::mojom::SurfaceType surface_type)
     : window_(window),
       surface_type_(surface_type),
       state_(PerConnectionState::Get(connector, window->connection())) {}
 
 SurfaceBinding::~SurfaceBinding() {}
 
-scoped_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
+std::unique_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
   return state_->CreateOutputSurface(window_, surface_type_);
 }
 
 }  // namespace views