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

Unified Diff: ui/message_center/views/message_popup_collection_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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/message_center/views/message_popup_collection.cc ('k') | ui/message_center/views/message_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/views/message_popup_collection_unittest.cc
diff --git a/ui/message_center/views/message_popup_collection_unittest.cc b/ui/message_center/views/message_popup_collection_unittest.cc
index a41ae016cc2fcf9a8020d458bbeed604f34d9e0b..75fc26968ed8a140247929e28844fb179dea5213 100644
--- a/ui/message_center/views/message_popup_collection_unittest.cc
+++ b/ui/message_center/views/message_popup_collection_unittest.cc
@@ -98,7 +98,7 @@ class MessagePopupCollectionTest : public views::ViewsTestBase {
std::string AddNotification() {
std::string id = base::IntToString(id_++);
- scoped_ptr<Notification> notification(new Notification(
+ std::unique_ptr<Notification> notification(new Notification(
NOTIFICATION_TYPE_BASE_FORMAT, id, base::UTF8ToUTF16("test title"),
base::UTF8ToUTF16("test message"), gfx::Image(),
base::string16() /* display_source */, GURL(), NotifierId(),
@@ -127,8 +127,8 @@ class MessagePopupCollectionTest : public views::ViewsTestBase {
}
private:
- scoped_ptr<MessagePopupCollection> collection_;
- scoped_ptr<DesktopPopupAlignmentDelegate> alignment_delegate_;
+ std::unique_ptr<MessagePopupCollection> collection_;
+ std::unique_ptr<DesktopPopupAlignmentDelegate> alignment_delegate_;
int id_;
};
@@ -486,7 +486,7 @@ TEST_F(MessagePopupCollectionTest, ManyPopupNotifications) {
TEST_F(MessagePopupCollectionTest, CloseNonClosableNotifications) {
const char* kNotificationId = "NOTIFICATION1";
- scoped_ptr<Notification> notification(new Notification(
+ std::unique_ptr<Notification> notification(new Notification(
NOTIFICATION_TYPE_BASE_FORMAT, kNotificationId,
base::UTF8ToUTF16("test title"), base::UTF8ToUTF16("test message"),
gfx::Image(), base::string16() /* display_source */, GURL(),
« no previous file with comments | « ui/message_center/views/message_popup_collection.cc ('k') | ui/message_center/views/message_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698