Replace scoped_ptr with std::unique_ptr in //ui

ui/gl/gl_context.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/gl/gl_context.h"
+
 #include <string>
 
 #include "base/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_local.h"
 #include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_context.h"
 #include "ui/gl/gl_gl_api_implementation.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gl_version_info.h"
 #include "ui/gl/gpu_timing.h"
 
 namespace gfx {
 
 namespace {
@@ skipping 95 matching lines @@
   std::string delimited_name(name);
   delimited_name += " ";
 
   return extensions.find(delimited_name) != std::string::npos;
 }
 
 const GLVersionInfo* GLContext::GetVersionInfo() {
   if(!version_info_) {
     std::string version = GetGLVersion();
     std::string renderer = GetGLRenderer();
-    version_info_ =
-        make_scoped_ptr(new GLVersionInfo(
-            version.c_str(), renderer.c_str(),
-            GetExtensions().c_str()));
+    version_info_ = base::WrapUnique(new GLVersionInfo(
+        version.c_str(), renderer.c_str(), GetExtensions().c_str()));
   }
   return version_info_.get();
 }
 
 GLShareGroup* GLContext::share_group() {
   return share_group_.get();
 }
 
 bool GLContext::LosesAllContextsOnContextLost() {
   switch (GetGLImplementation()) {
@@ skipping 29 matching lines @@
   if (!surface && GetGLImplementation() != kGLImplementationMockGL) {
     SetGLApiToNoContext();
   }
 }
 
 GLStateRestorer* GLContext::GetGLStateRestorer() {
   return state_restorer_.get();
 }
 
 void GLContext::SetGLStateRestorer(GLStateRestorer* state_restorer) {
-  state_restorer_ = make_scoped_ptr(state_restorer);
+  state_restorer_ = base::WrapUnique(state_restorer);
 }
 
 void GLContext::SetSwapInterval(int interval) {
   swap_interval_ = interval;
   OnSetSwapInterval(force_swap_interval_zero_ ? 0 : swap_interval_);
 }
 
 void GLContext::ForceSwapIntervalZero(bool force) {
   force_swap_interval_zero_ = force;
   OnSetSwapInterval(force_swap_interval_zero_ ? 0 : swap_interval_);
@@ skipping 46 matching lines @@
 }
 
 GLContextReal::~GLContextReal() {}
 
 void GLContextReal::SetCurrent(GLSurface* surface) {
   GLContext::SetCurrent(surface);
   current_real_context_.Pointer()->Set(surface ? this : nullptr);
 }
 
 }  // namespace gfx