Replace scoped_ptr with std::unique_ptr in //ui

ui/message_center/cocoa/popup_collection_unittest.mm

 // 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.
 
 #import "ui/message_center/cocoa/popup_collection.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "ui/gfx/test/ui_cocoa_test_helper.h"
 #import "ui/message_center/cocoa/notification_controller.h"
 #import "ui/message_center/cocoa/popup_controller.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
@@ skipping 21 matching lines @@
     ui::CocoaTest::TearDown();
   }
 
   ~PopupCollectionTest() override { message_center::MessageCenter::Shutdown(); }
 
   message_center::NotifierId DummyNotifierId() {
     return message_center::NotifierId();
   }
 
   void AddThreeNotifications() {
-    scoped_ptr<message_center::Notification> notification;
+    std::unique_ptr<message_center::Notification> notification;
     notification.reset(new message_center::Notification(
         message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
         ASCIIToUTF16("This is the first notification to"
                      " be displayed"),
         gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
         message_center::RichNotificationData(), NULL));
     center_->AddNotification(std::move(notification));
 
     notification.reset(new message_center::Notification(
         message_center::NOTIFICATION_TYPE_SIMPLE, "2", ASCIIToUTF16("Two"),
@@ skipping 26 matching lines @@
 
   void WaitForAnimationEnded() {
     if (![collection_ isAnimating])
       return;
     nested_run_loop_.reset(new base::RunLoop());
     nested_run_loop_->Run();
     nested_run_loop_.reset();
   }
 
   base::MessageLoopForUI message_loop_;
-  scoped_ptr<base::RunLoop> nested_run_loop_;
+  std::unique_ptr<base::RunLoop> nested_run_loop_;
   message_center::MessageCenter* center_;
   base::scoped_nsobject<MCPopupCollection> collection_;
 };
 
 TEST_F(PopupCollectionTest, AddThreeCloseOne) {
   EXPECT_EQ(0u, [[collection_ popups] count]);
   AddThreeNotifications();
   EXPECT_EQ(3u, [[collection_ popups] count]);
 
   center_->RemoveNotification("2", true);
   WaitForAnimationEnded();
   EXPECT_EQ(2u, [[collection_ popups] count]);
 }
 
 TEST_F(PopupCollectionTest, AttemptFourOneOffscreen) {
   [collection_ setScreenFrame:NSMakeRect(0, 0, 800, 300)];
 
   EXPECT_EQ(0u, [[collection_ popups] count]);
   AddThreeNotifications();
   EXPECT_EQ(2u, [[collection_ popups] count]);  // "3" does not fit on screen.
 
-  scoped_ptr<message_center::Notification> notification;
+  std::unique_ptr<message_center::Notification> notification;
 
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, "4", ASCIIToUTF16("Four"),
       ASCIIToUTF16("This is the fourth notification."), gfx::Image(),
       base::string16(), GURL(), DummyNotifierId(),
       message_center::RichNotificationData(), NULL));
   center_->AddNotification(std::move(notification));
   WaitForAnimationEnded();
 
   // Remove "1" and "3" should fit on screen.
@@ skipping 24 matching lines @@
             kScreenSize - NSMaxY([[[popups objectAtIndex:0] window] frame]));
 
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:0],
                                   [popups objectAtIndex:1]));
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:1],
                                   [popups objectAtIndex:2]));
 
   // Set priority so that kMaxVisiblePopupNotifications does not hide it.
   message_center::RichNotificationData optional;
   optional.priority = message_center::HIGH_PRIORITY;
-  scoped_ptr<message_center::Notification> notification;
+  std::unique_ptr<message_center::Notification> notification;
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, "4", ASCIIToUTF16("Four"),
       ASCIIToUTF16("This is the fourth notification."), gfx::Image(),
       base::string16(), GURL(), DummyNotifierId(), optional, NULL));
   center_->AddNotification(std::move(notification));
   WaitForAnimationEnded();
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:2],
                                   [popups objectAtIndex:3]));
 
   // Remove "2".
@@ skipping 10 matching lines @@
   EXPECT_EQ(message_center::kMarginBetweenItems,
             kScreenSize - NSMaxY([[[popups objectAtIndex:0] window] frame]));
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:0],
                                   [popups objectAtIndex:1]));
 }
 
 TEST_F(PopupCollectionTest, TinyScreen) {
   [collection_ setScreenFrame:NSMakeRect(0, 0, 800, 100)];
 
   EXPECT_EQ(0u, [[collection_ popups] count]);
-  scoped_ptr<message_center::Notification> notification;
+  std::unique_ptr<message_center::Notification> notification;
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
       ASCIIToUTF16("This is the first notification to"
                    " be displayed"),
       gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
       message_center::RichNotificationData(), NULL));
   center_->AddNotification(std::move(notification));
   WaitForAnimationEnded();
   EXPECT_EQ(1u, [[collection_ popups] count]);
 
@@ skipping 32 matching lines @@
 
   EXPECT_EQ(3u, [popups count]);
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:0],
                                   [popups objectAtIndex:1]));
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:1],
                                   [popups objectAtIndex:2]));
 
   // Replace "1".
   controller = [[popups objectAtIndex:0] notificationController];
   NSRect old_frame = [[controller view] frame];
-  scoped_ptr<message_center::Notification> notification;
+  std::unique_ptr<message_center::Notification> notification;
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, "1",
       ASCIIToUTF16("One is going to get a much longer "
                    "title than it previously had."),
       ASCIIToUTF16("This is the first notification to "
                    "be displayed, but it will also be "
                    "updated to have a significantly "
                    "longer body"),
       gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
       message_center::RichNotificationData(), NULL));
   center_->AddNotification(std::move(notification));
   WaitForAnimationEnded();
   EXPECT_GT(NSHeight([[controller view] frame]), NSHeight(old_frame));
 
   // Test updated spacing.
   EXPECT_EQ(3u, [popups count]);
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:0],
                                   [popups objectAtIndex:1]));
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:1],
                                   [popups objectAtIndex:2]));
   EXPECT_EQ("1", [[popups objectAtIndex:0] notificationID]);
   EXPECT_EQ("2", [[popups objectAtIndex:1] notificationID]);
   EXPECT_EQ("3", [[popups objectAtIndex:2] notificationID]);
 }
 
 TEST_F(PopupCollectionTest, UpdatePriority) {
-  scoped_ptr<message_center::Notification> notification;
+  std::unique_ptr<message_center::Notification> notification;
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
       ASCIIToUTF16("This notification should not yet toast."), gfx::Image(),
       base::string16(), GURL(), DummyNotifierId(),
       message_center::RichNotificationData(), NULL));
   notification->set_priority(-1);
 
   center_->AddNotification(std::move(notification));
   WaitForAnimationEnded();
   NSArray* popups = [collection_ popups];
   EXPECT_EQ(0u, [popups count]);
 
   // Raise priority -1 to 1. Notification should display.
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
       ASCIIToUTF16("This notification should now toast"), gfx::Image(),
       base::string16(), GURL(), DummyNotifierId(),
       message_center::RichNotificationData(), NULL));
   notification->set_priority(1);
 
   center_->UpdateNotification("1", std::move(notification));
   WaitForAnimationEnded();
   EXPECT_EQ(1u, [popups count]);
 }
 
 TEST_F(PopupCollectionTest, CloseCollectionBeforeNewPopupAnimationEnds) {
   // Add a notification and don't wait for the animation to finish.
-  scoped_ptr<message_center::Notification> notification;
+  std::unique_ptr<message_center::Notification> notification;
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
       ASCIIToUTF16("This is the first notification to"
                    " be displayed"),
       gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
       message_center::RichNotificationData(), NULL));
   center_->AddNotification(std::move(notification));
 
   // Release the popup collection before the animation ends. No crash should
   // be expected.
   collection_.reset();
 }
 
 TEST_F(PopupCollectionTest, CloseCollectionBeforeClosePopupAnimationEnds) {
   AddThreeNotifications();
 
   // Remove a notification and don't wait for the animation to finish.
   center_->RemoveNotification("1", true);
 
   // Release the popup collection before the animation ends. No crash should
   // be expected.
   collection_.reset();
 }
 
 TEST_F(PopupCollectionTest, CloseCollectionBeforeUpdatePopupAnimationEnds) {
   AddThreeNotifications();
 
   // Update a notification and don't wait for the animation to finish.
-  scoped_ptr<message_center::Notification> notification;
+  std::unique_ptr<message_center::Notification> notification;
   notification.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
       ASCIIToUTF16("New message."), gfx::Image(), base::string16(), GURL(),
       DummyNotifierId(), message_center::RichNotificationData(), NULL));
   center_->UpdateNotification("1", std::move(notification));
 
   // Release the popup collection before the animation ends. No crash should
   // be expected.
   collection_.reset();
 }
 
 }  // namespace message_center