unique_ptr_migration: clean up references to scoped_ptr as of r389721

ui/wm/core/cursor_manager_unittest.cc

 // Copyright (c) 2013 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/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"
 
 namespace {
 
 class TestingCursorManager : public wm::NativeCursorManager {
  public:
   // Overridden from wm::NativeCursorManager:
   void SetDisplay(const gfx::Display& display,
@@ skipping 20 matching lines @@
     delegate->CommitCursorSet(cursor_set);
   }
 };
 
 }  // namespace
 
 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_;
 };
 
 class TestingCursorClientObserver : public aura::client::CursorClientObserver {
  public:
   TestingCursorClientObserver()
       : cursor_visibility_(false),
         did_visibility_change_(false) {}
@@ skipping 265 matching lines @@
   EXPECT_TRUE(observer_a.is_cursor_visible());
 }
 
 // This test validates that the cursor visiblity state is restored when a
 // CursorManager instance is destroyed and recreated.
 TEST(CursorManagerCreateDestroyTest, VisibilityTest) {
   // This block ensures that the cursor is hidden when the CursorManager
   // 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();
     EXPECT_FALSE(cursor_manager1.IsCursorVisible());
   }
 
   // This block validates that the cursor is hidden initially. It ensures that
   // 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());
   }
 
   // This block validates that the cursor is visible initially. It then
   // 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());
   }
 }