Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2240)

Unified Diff: ash/rotator/screen_rotation_animation_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/rotator/screen_rotation_animation.cc ('k') | ash/rotator/screen_rotation_animator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/rotator/screen_rotation_animation_unittest.cc
diff --git a/ash/rotator/screen_rotation_animation_unittest.cc b/ash/rotator/screen_rotation_animation_unittest.cc
index 710892e746734514dae311f0f27fcc2282de397b..b4ce508f9dd7f531c35af5949f890f0c421de95d 100644
--- a/ash/rotator/screen_rotation_animation_unittest.cc
+++ b/ash/rotator/screen_rotation_animation_unittest.cc
@@ -3,9 +3,11 @@
// found in the LICENSE file.
#include "ash/rotator/screen_rotation_animation.h"
+
+#include <memory>
+
#include "ash/test/ash_test_base.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/window.h"
@@ -28,7 +30,7 @@ class ScreenRotationAnimationTest : public AshTestBase {
void SetUp() override;
private:
- scoped_ptr<ui::ScopedAnimationDurationScaleMode> non_zero_duration_mode_;
+ std::unique_ptr<ui::ScopedAnimationDurationScaleMode> non_zero_duration_mode_;
DISALLOW_COPY_AND_ASSIGN(ScreenRotationAnimationTest);
};
@@ -40,10 +42,10 @@ void ScreenRotationAnimationTest::SetUp() {
}
TEST_F(ScreenRotationAnimationTest, LayerTransformGetsSetToTargetWhenAborted) {
- scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(9));
+ std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithId(9));
ui::Layer* layer = window->layer();
- scoped_ptr<ScreenRotationAnimation> screen_rotation(
+ std::unique_ptr<ScreenRotationAnimation> screen_rotation(
new ScreenRotationAnimation(
layer, 45 /* start_degrees */, 0 /* end_degrees */,
0.5f /* initial_opacity */, 1.0f /* target_opacity */,
@@ -53,7 +55,7 @@ TEST_F(ScreenRotationAnimationTest, LayerTransformGetsSetToTargetWhenAborted) {
ui::LayerAnimator* animator = layer->GetAnimator();
animator->set_preemption_strategy(
ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
- scoped_ptr<ui::LayerAnimationSequence> animation_sequence(
+ std::unique_ptr<ui::LayerAnimationSequence> animation_sequence(
new ui::LayerAnimationSequence(screen_rotation.release()));
animator->StartAnimation(animation_sequence.release());
« no previous file with comments | « ash/rotator/screen_rotation_animation.cc ('k') | ash/rotator/screen_rotation_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698