| 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 e61cf7733b6b6bda90d269be0f8f997b8ecf7af2..1d592a3312c9f6911fb6616f1f91310f46f30d7e 100644
|
| --- a/ui/message_center/views/message_center_view_unittest.cc
|
| +++ b/ui/message_center/views/message_center_view_unittest.cc
|
| @@ -22,7 +22,6 @@
|
| #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 {
|
|
|
| @@ -113,7 +112,7 @@
|
|
|
| /* Test fixture ***************************************************************/
|
|
|
| -class MessageCenterViewTest : public views::ViewsTestBase,
|
| +class MessageCenterViewTest : public testing::Test,
|
| public MockNotificationView::Test,
|
| public MessageCenterController {
|
| public:
|
| @@ -159,6 +158,8 @@
|
| 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_;
|
| @@ -174,7 +175,6 @@
|
| }
|
|
|
| void MessageCenterViewTest::SetUp() {
|
| - views::ViewsTestBase::SetUp();
|
| message_center_.reset(new FakeMessageCenterImpl());
|
|
|
| // Create a dummy notification.
|
| @@ -213,7 +213,6 @@
|
| void MessageCenterViewTest::TearDown() {
|
| message_center_view_.reset();
|
| STLDeleteElements(¬ifications_);
|
| - views::ViewsTestBase::TearDown();
|
| }
|
|
|
| MessageCenterView* MessageCenterViewTest::GetMessageCenterView() {
|
|
|