Revert of Makes MaterialDesignController initialization explicit

ui/message_center/views/message_center_view_unittest.cc

 // Copyright 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.
 
 #include "ui/message_center/views/message_center_view.h"
 
 #include <map>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/fake_message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/message_center_button_bar.h"
 #include "ui/message_center/views/message_center_controller.h"
 #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 {
 
 static const char* kNotificationId1 = "notification id 1";
 static const char* kNotificationId2 = "notification id 2";
 
 /* Types **********************************************************************/
 
 enum CallType {
   GET_PREFERRED_SIZE,
@@ skipping 70 matching lines @@
   void RemoveAllNotifications(bool by_user, RemoveType type) override {
     if (type == RemoveType::NON_PINNED)
       remove_all_closable_notification_called_ = true;
   }
   bool remove_all_closable_notification_called_ = false;
   NotificationList::Notifications visible_notifications_;
 };
 
 /* Test fixture ***************************************************************/
 
-class MessageCenterViewTest : public views::ViewsTestBase,
+class MessageCenterViewTest : public testing::Test,
                               public MockNotificationView::Test,
                               public MessageCenterController {
  public:
   MessageCenterViewTest();
   ~MessageCenterViewTest() override;
 
   void SetUp() override;
   void TearDown() override;
 
   MessageCenterView* GetMessageCenterView();
@@ skipping 25 matching lines @@
 
   void FireOnMouseExitedEvent();
 
   void LogBounds(int depth, views::View* view);
 
   MessageCenterButtonBar* GetButtonBar() const;
 
  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_;
   std::map<CallType,int> callCounts_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageCenterViewTest);
 };
 
 MessageCenterViewTest::MessageCenterViewTest() {
 }
 
 MessageCenterViewTest::~MessageCenterViewTest() {
 }
 
 void MessageCenterViewTest::SetUp() {
-  views::ViewsTestBase::SetUp();
   message_center_.reset(new FakeMessageCenterImpl());
 
   // Create a dummy notification.
   Notification* notification1 = new Notification(
       NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId1),
       base::UTF8ToUTF16("title"), base::UTF8ToUTF16("message1"), gfx::Image(),
       base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
       message_center::RichNotificationData(), NULL);
 
@@ skipping 18 matching lines @@
   message_center_view_->SetNotifications(notifications_);
 
   // Wait until the animation finishes if available.
   if (GetAnimator()->IsAnimating())
     base::MessageLoop::current()->Run();
 }
 
 void MessageCenterViewTest::TearDown() {
   message_center_view_.reset();
   STLDeleteElements(&notifications_);
-  views::ViewsTestBase::TearDown();
 }
 
 MessageCenterView* MessageCenterViewTest::GetMessageCenterView() {
   return message_center_view_.get();
 }
 
 MessageListView* MessageCenterViewTest::GetMessageListView() {
   return message_center_view_->message_list_view_.get();
 }
 
@@ skipping 367 matching lines @@
   AddNotification(
       scoped_ptr<Notification>(new Notification(pinned_notification)));
 
   // There should be 1 pinned notification.
   EXPECT_EQ(1u, GetMessageCenter()->GetVisibleNotifications().size());
   EXPECT_FALSE(close_button->enabled());
 #endif  // defined(OS_CHROMEOS)
 }
 
 }  // namespace message_center