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

Unified Diff: content/browser/web_contents/aura/overscroll_window_animation_unittest.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: content/browser/web_contents/aura/overscroll_window_animation_unittest.cc
diff --git a/content/browser/web_contents/aura/overscroll_window_animation_unittest.cc b/content/browser/web_contents/aura/overscroll_window_animation_unittest.cc
index a34c41b81556742b40f352b8c14be619acc24735..c8006b126c22e680fb20a77253f9679f64c1b858 100644
--- a/content/browser/web_contents/aura/overscroll_window_animation_unittest.cc
+++ b/content/browser/web_contents/aura/overscroll_window_animation_unittest.cc
@@ -66,11 +66,13 @@ class OverscrollWindowAnimationTest
}
// OverscrollWindowAnimation::Delegate:
- scoped_ptr<aura::Window> CreateFrontWindow(const gfx::Rect& bounds) override {
+ std::unique_ptr<aura::Window> CreateFrontWindow(
+ const gfx::Rect& bounds) override {
return CreateSlideWindow(bounds);
}
- scoped_ptr<aura::Window> CreateBackWindow(const gfx::Rect& bounds) override {
+ std::unique_ptr<aura::Window> CreateBackWindow(
+ const gfx::Rect& bounds) override {
return CreateSlideWindow(bounds);
}
@@ -78,7 +80,7 @@ class OverscrollWindowAnimationTest
void OnOverscrollCompleting() override { overscroll_completing_ = true; }
- void OnOverscrollCompleted(scoped_ptr<aura::Window> window) override {
+ void OnOverscrollCompleted(std::unique_ptr<aura::Window> window) override {
overscroll_completed_ = true;
}
@@ -86,12 +88,12 @@ class OverscrollWindowAnimationTest
private:
// The overscroll window animation under test.
- scoped_ptr<OverscrollWindowAnimation> owa_;
+ std::unique_ptr<OverscrollWindowAnimation> owa_;
- scoped_ptr<aura::Window> CreateSlideWindow(const gfx::Rect& bounds) {
+ std::unique_ptr<aura::Window> CreateSlideWindow(const gfx::Rect& bounds) {
overscroll_started_ = true;
if (create_window_) {
- scoped_ptr<aura::Window> window(
+ std::unique_ptr<aura::Window> window(
CreateNormalWindow(++last_window_id_, root_window(), nullptr));
window->SetBounds(bounds);
return window;
@@ -111,7 +113,7 @@ class OverscrollWindowAnimationTest
int last_window_id_;
// The dummy target window we provide.
- scoped_ptr<aura::Window> main_window_;
+ std::unique_ptr<aura::Window> main_window_;
DISALLOW_COPY_AND_ASSIGN(OverscrollWindowAnimationTest);
};

Powered by Google App Engine
This is Rietveld 408576698