Replace scoped_ptr with std::unique_ptr in //ui

ui/compositor/callback_layer_animation_observer_unittest.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/compositor/callback_layer_animation_observer.h"
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
+#include "base/memory/ptr_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/test/layer_animation_observer_test_api.h"
 
 namespace ui {
 namespace test {
 
 // Simple class that tracks whether callbacks were invoked and when.
 class TestCallbacks {
  public:
@@ skipping 191 matching lines @@
 class CallbackLayerAnimationObserverTest : public testing::Test {
  public:
   CallbackLayerAnimationObserverTest();
   ~CallbackLayerAnimationObserverTest() override;
 
  protected:
   // Creates a LayerAnimationSequence.  The lifetime of the sequence will be
   // managed by this.
   LayerAnimationSequence* CreateLayerAnimationSequence();
 
-  scoped_ptr<TestCallbacks> callbacks_;
+  std::unique_ptr<TestCallbacks> callbacks_;
 
-  scoped_ptr<CallbackLayerAnimationObserver> observer_;
+  std::unique_ptr<CallbackLayerAnimationObserver> observer_;
 
-  scoped_ptr<LayerAnimationObserverTestApi> observer_test_api_;
+  std::unique_ptr<LayerAnimationObserverTestApi> observer_test_api_;
 
   // List of managaged sequences created by CreateLayerAnimationSequence() that
   // need to be destroyed.
-  ScopedVector<LayerAnimationSequence> sequences_;
+  std::vector<std::unique_ptr<LayerAnimationSequence>> sequences_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackLayerAnimationObserverTest);
 };
 
 CallbackLayerAnimationObserverTest::CallbackLayerAnimationObserverTest()
     : callbacks_(new TestCallbacks()),
       observer_(new CallbackLayerAnimationObserver(
           base::Bind(&TestCallbacks::AnimationsStarted,
                      base::Unretained(callbacks_.get())),
           base::Bind(&TestCallbacks::AnimationsEnded,
                      base::Unretained(callbacks_.get())))),
       observer_test_api_(new LayerAnimationObserverTestApi(observer_.get())) {}
 
 CallbackLayerAnimationObserverTest::~CallbackLayerAnimationObserverTest() {
   observer_test_api_.reset();
   // The |observer_| will detach from all attached sequences upon destruction so
   // we need to explicitly delete the |observer_| before the |sequences_| and
   // |callbacks_|.
   observer_.reset();
 }
 
 LayerAnimationSequence*
 CallbackLayerAnimationObserverTest::CreateLayerAnimationSequence() {
-  LayerAnimationSequence* sequence = new LayerAnimationSequence();
-  sequences_.push_back(sequence);
-  return sequence;
+  sequences_.emplace_back(new LayerAnimationSequence);
+  return sequences_.back().get();
 }
 
 TEST(CallbackLayerAnimationObserverDestructionTest, VerifyFalseAutoDelete) {
   TestCallbacks callbacks;
   callbacks.set_should_delete_observer_on_animations_ended(false);
 
   bool is_destroyed = false;
 
   TestCallbackLayerAnimationObserver* observer =
       new TestCallbackLayerAnimationObserver(
@@ skipping 311 matching lines @@
   observer_->OnLayerAnimationEnded(sequence_4);
 
   EXPECT_FALSE(observer_->active());
   EXPECT_TRUE(callbacks_->animations_started());
   EXPECT_TRUE(callbacks_->animations_ended());
   EXPECT_EQ(4, observer_->successful_count());
 }
 
 }  // namespace test
 }  // namespace ui