OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #import "ui/message_center/cocoa/popup_controller.h" | 5 #import "ui/message_center/cocoa/popup_controller.h" |
6 | 6 |
| 7 #include <memory> |
| 8 |
7 #include "base/mac/scoped_nsobject.h" | 9 #include "base/mac/scoped_nsobject.h" |
8 #include "base/memory/scoped_ptr.h" | |
9 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
10 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
11 #import "ui/gfx/test/ui_cocoa_test_helper.h" | 12 #import "ui/gfx/test/ui_cocoa_test_helper.h" |
12 #include "ui/message_center/notification.h" | 13 #include "ui/message_center/notification.h" |
13 | 14 |
14 using base::ASCIIToUTF16; | 15 using base::ASCIIToUTF16; |
15 | 16 |
16 namespace message_center { | 17 namespace message_center { |
17 | 18 |
18 class PopupControllerTest : public ui::CocoaTest { | 19 class PopupControllerTest : public ui::CocoaTest { |
19 }; | 20 }; |
20 | 21 |
21 TEST_F(PopupControllerTest, Creation) { | 22 TEST_F(PopupControllerTest, Creation) { |
22 scoped_ptr<message_center::Notification> notification( | 23 std::unique_ptr<message_center::Notification> notification( |
23 new message_center::Notification( | 24 new message_center::Notification( |
24 message_center::NOTIFICATION_TYPE_SIMPLE, "", | 25 message_center::NOTIFICATION_TYPE_SIMPLE, "", |
25 ASCIIToUTF16("Added to circles"), | 26 ASCIIToUTF16("Added to circles"), |
26 ASCIIToUTF16("Jonathan and 5 others"), gfx::Image(), base::string16(), | 27 ASCIIToUTF16("Jonathan and 5 others"), gfx::Image(), base::string16(), |
27 GURL(), message_center::NotifierId(), | 28 GURL(), message_center::NotifierId(), |
28 message_center::RichNotificationData(), NULL)); | 29 message_center::RichNotificationData(), NULL)); |
29 | 30 |
30 base::scoped_nsobject<MCPopupController> controller( | 31 base::scoped_nsobject<MCPopupController> controller( |
31 [[MCPopupController alloc] initWithNotification:notification.get() | 32 [[MCPopupController alloc] initWithNotification:notification.get() |
32 messageCenter:nil | 33 messageCenter:nil |
33 popupCollection:nil]); | 34 popupCollection:nil]); |
34 // Add an extra ref count for scoped_nsobject since MCPopupController will | 35 // Add an extra ref count for scoped_nsobject since MCPopupController will |
35 // release itself when it is being closed. | 36 // release itself when it is being closed. |
36 [controller retain]; | 37 [controller retain]; |
37 | 38 |
38 EXPECT_TRUE([controller window]); | 39 EXPECT_TRUE([controller window]); |
39 EXPECT_EQ(notification.get(), [controller notification]); | 40 EXPECT_EQ(notification.get(), [controller notification]); |
40 | 41 |
41 [controller showWindow:nil]; | 42 [controller showWindow:nil]; |
42 [controller close]; | 43 [controller close]; |
43 } | 44 } |
44 | 45 |
45 } // namespace message_center | 46 } // namespace message_center |
OLD | NEW |