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

Unified Diff: ui/wm/core/cursor_manager_unittest.cc

Issue 1917053003: unique_ptr_migration: clean up references to scoped_ptr as of r389721 (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
« no previous file with comments | « ui/views/controls/webview/webview_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/cursor_manager_unittest.cc
diff --git a/ui/wm/core/cursor_manager_unittest.cc b/ui/wm/core/cursor_manager_unittest.cc
index c20cd31ccad3b4f8b55bf3961d964c8a4af5d40d..5efd705c87b313ba8adff2ec27d1a1a7047cc964 100644
--- a/ui/wm/core/cursor_manager_unittest.cc
+++ b/ui/wm/core/cursor_manager_unittest.cc
@@ -5,7 +5,7 @@
#include "ui/wm/core/cursor_manager.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "ui/aura/client/cursor_client_observer.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/wm/core/native_cursor_manager.h"
@@ -46,7 +46,7 @@ class CursorManagerTest : public aura::test::AuraTestBase {
protected:
CursorManagerTest()
: delegate_(new TestingCursorManager),
- cursor_manager_(std::unique_ptr<wm::NativeCursorManager>(delegate_)) {}
+ cursor_manager_(base::WrapUnique(delegate_)) {}
TestingCursorManager* delegate_;
wm::CursorManager cursor_manager_;
@@ -332,7 +332,7 @@ TEST(CursorManagerCreateDestroyTest, VisibilityTest) {
// instance is destroyed.
{
wm::CursorManager cursor_manager1(
- scoped_ptr<wm::NativeCursorManager>(new TestingCursorManager));
+ base::WrapUnique(new TestingCursorManager));
cursor_manager1.ShowCursor();
EXPECT_TRUE(cursor_manager1.IsCursorVisible());
cursor_manager1.HideCursor();
@@ -343,7 +343,7 @@ TEST(CursorManagerCreateDestroyTest, VisibilityTest) {
// the cursor is visible when the CursorManager instance is destroyed.
{
wm::CursorManager cursor_manager2(
- scoped_ptr<wm::NativeCursorManager>(new TestingCursorManager));
+ base::WrapUnique(new TestingCursorManager));
EXPECT_FALSE(cursor_manager2.IsCursorVisible());
cursor_manager2.ShowCursor();
EXPECT_TRUE(cursor_manager2.IsCursorVisible());
@@ -353,7 +353,7 @@ TEST(CursorManagerCreateDestroyTest, VisibilityTest) {
// performs normal cursor visibility operations.
{
wm::CursorManager cursor_manager3(
- scoped_ptr<wm::NativeCursorManager>(new TestingCursorManager));
+ base::WrapUnique(new TestingCursorManager));
EXPECT_TRUE(cursor_manager3.IsCursorVisible());
cursor_manager3.HideCursor();
EXPECT_FALSE(cursor_manager3.IsCursorVisible());
« no previous file with comments | « ui/views/controls/webview/webview_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698