Convert //content/browser from scoped_ptr to std::unique_ptr

content/browser/android/overscroll_controller_android.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 "content/browser/android/overscroll_controller_android.h"
 
 #include "base/android/build_info.h"
 #include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "cc/layers/layer.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/common/input/did_overscroll_params.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/android/edge_effect.h"
 #include "ui/android/edge_effect_l.h"
@@ skipping 36 matching lines @@
   // Android releases can be quite faint, depending on the OEM-supplied
   // overscroll resources, and lasts nearly twice as long.
   if (IsAndroidLOrNewer())
     return kMinGlowAlphaToDisableRefreshOnL;
 
   // Any value greater than 1 effectively prevents the glow effect from ever
   // suppressing the refresh effect.
   return 1.01f;
 }
 
-scoped_ptr<EdgeEffectBase> CreateGlowEdgeEffect(
+std::unique_ptr<EdgeEffectBase> CreateGlowEdgeEffect(
     ui::ResourceManager* resource_manager,
     float dpi_scale) {
   DCHECK(resource_manager);
   if (IsAndroidLOrNewer())
-    return scoped_ptr<EdgeEffectBase>(new EdgeEffectL(resource_manager));
+    return std::unique_ptr<EdgeEffectBase>(new EdgeEffectL(resource_manager));
 
-  return scoped_ptr<EdgeEffectBase>(
+  return std::unique_ptr<EdgeEffectBase>(
       new EdgeEffect(resource_manager, dpi_scale));
 }
 
-scoped_ptr<OverscrollGlow> CreateGlowEffect(OverscrollGlowClient* client,
-                                            float dpi_scale) {
+std::unique_ptr<OverscrollGlow> CreateGlowEffect(OverscrollGlowClient* client,
+                                                 float dpi_scale) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableOverscrollEdgeEffect)) {
     return nullptr;
   }
 
-  return make_scoped_ptr(new OverscrollGlow(client));
+  return base::WrapUnique(new OverscrollGlow(client));
 }
 
-scoped_ptr<OverscrollRefresh> CreateRefreshEffect(
+std::unique_ptr<OverscrollRefresh> CreateRefreshEffect(
     OverscrollRefreshHandler* handler) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisablePullToRefreshEffect)) {
     return nullptr;
   }
 
-  return make_scoped_ptr(new OverscrollRefresh(handler));
+  return base::WrapUnique(new OverscrollRefresh(handler));
 }
 
 }  // namespace
 
 OverscrollControllerAndroid::OverscrollControllerAndroid(
     ContentViewCoreImpl* content_view_core)
     : compositor_(content_view_core->GetWindowAndroid()->GetCompositor()),
       dpi_scale_(content_view_core->GetDpiScale()),
       enabled_(true),
       glow_effect_(CreateGlowEffect(this, dpi_scale_)),
@@ skipping 157 matching lines @@
     return;
   enabled_ = false;
   if (!enabled_) {
     if (refresh_effect_)
       refresh_effect_->Reset();
     if (glow_effect_)
       glow_effect_->Reset();
   }
 }
 
-scoped_ptr<EdgeEffectBase> OverscrollControllerAndroid::CreateEdgeEffect() {
+std::unique_ptr<EdgeEffectBase>
+OverscrollControllerAndroid::CreateEdgeEffect() {
   return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_);
 }
 
 void OverscrollControllerAndroid::SetNeedsAnimate() {
   compositor_->SetNeedsAnimate();
 }
 
 }  // namespace content