| Index: ui/message_center/views/message_center_view_unittest.cc
|
| diff --git a/ui/message_center/views/message_center_view_unittest.cc b/ui/message_center/views/message_center_view_unittest.cc
|
| index 1d592a3312c9f6911fb6616f1f91310f46f30d7e..e61cf7733b6b6bda90d269be0f8f997b8ecf7af2 100644
|
| --- a/ui/message_center/views/message_center_view_unittest.cc
|
| +++ b/ui/message_center/views/message_center_view_unittest.cc
|
| @@ -22,6 +22,7 @@
|
| #include "ui/message_center/views/message_list_view.h"
|
| #include "ui/message_center/views/notification_view.h"
|
| #include "ui/views/controls/slide_out_view.h"
|
| +#include "ui/views/test/views_test_base.h"
|
|
|
| namespace message_center {
|
|
|
| @@ -112,7 +113,7 @@ class FakeMessageCenterImpl : public FakeMessageCenter {
|
|
|
| /* Test fixture ***************************************************************/
|
|
|
| -class MessageCenterViewTest : public testing::Test,
|
| +class MessageCenterViewTest : public views::ViewsTestBase,
|
| public MockNotificationView::Test,
|
| public MessageCenterController {
|
| public:
|
| @@ -158,8 +159,6 @@ class MessageCenterViewTest : public testing::Test,
|
| private:
|
| views::View* MakeParent(views::View* child1, views::View* child2);
|
|
|
| - base::MessageLoopForUI message_loop_;
|
| -
|
| NotificationList::Notifications notifications_;
|
| scoped_ptr<MessageCenterView> message_center_view_;
|
| scoped_ptr<FakeMessageCenterImpl> message_center_;
|
| @@ -175,6 +174,7 @@ MessageCenterViewTest::~MessageCenterViewTest() {
|
| }
|
|
|
| void MessageCenterViewTest::SetUp() {
|
| + views::ViewsTestBase::SetUp();
|
| message_center_.reset(new FakeMessageCenterImpl());
|
|
|
| // Create a dummy notification.
|
| @@ -213,6 +213,7 @@ void MessageCenterViewTest::SetUp() {
|
| void MessageCenterViewTest::TearDown() {
|
| message_center_view_.reset();
|
| STLDeleteElements(¬ifications_);
|
| + views::ViewsTestBase::TearDown();
|
| }
|
|
|
| MessageCenterView* MessageCenterViewTest::GetMessageCenterView() {
|
|
|