Revert of Show message center on lock screen

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 <memory>
 #include <utility>
 
@@ skipping 89 matching lines @@
   const NotificationList::Notifications& GetVisibleNotifications() override {
     return visible_notifications_;
   }
   void SetVisibleNotifications(NotificationList::Notifications notifications) {
     visible_notifications_ = notifications;
   }
   void RemoveAllNotifications(bool by_user, RemoveType type) override {
     if (type == RemoveType::NON_PINNED)
       remove_all_closable_notification_called_ = true;
   }
-  bool IsLockedState() const override { return locked_; }
   bool remove_all_closable_notification_called_ = false;
   NotificationList::Notifications visible_notifications_;
-  bool locked_ = false;
 };
 
 /* Test fixture ***************************************************************/
 
 class MessageCenterViewTest : public views::ViewsTestBase,
                               public MockNotificationView::Test,
                               public MessageCenterController {
  public:
   // Expose the private enum class MessageCenter::Mode for this test.
   typedef MessageCenterView::Mode Mode;
 
   MessageCenterViewTest();
   ~MessageCenterViewTest() override;
 
   void SetUp() override;
   void TearDown() override;
 
   MessageCenterView* GetMessageCenterView();
   MessageListView* GetMessageListView();
   FakeMessageCenterImpl* GetMessageCenter() const;
   MessageView* GetNotificationView(const std::string& id);
   views::BoundsAnimator* GetAnimator();
   int GetNotificationCount();
   int GetCallCount(CallType type);
   int GetCalculatedMessageListViewHeight();
-  void SetLockedState(bool locked);
   Mode GetMessageCenterViewInternalMode();
   void AddNotification(std::unique_ptr<Notification> notification);
   void UpdateNotification(const std::string& notification_id,
                           std::unique_ptr<Notification> notification);
 
   // Overridden from MessageCenterController:
   void ClickOnNotification(const std::string& notification_id) override;
   void RemoveNotification(const std::string& notification_id,
                           bool by_user) override;
   std::unique_ptr<ui::MenuModel> CreateMenuModel(
@@ skipping 12 matching lines @@
   void LogBounds(int depth, views::View* view);
 
   MessageCenterButtonBar* GetButtonBar() const;
 
   void RemoveDefaultNotifications();
 
  private:
   views::View* MakeParent(views::View* child1, views::View* child2);
 
   NotificationList::Notifications notifications_;
-  std::unique_ptr<views::Widget> widget_;
   std::unique_ptr<MessageCenterView> message_center_view_;
   std::unique_ptr<FakeMessageCenterImpl> message_center_;
   std::map<CallType,int> callCounts_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageCenterViewTest);
 };
 
 MessageCenterViewTest::MessageCenterViewTest() {
 }
 
 MessageCenterViewTest::~MessageCenterViewTest() {
 }
 
 void MessageCenterViewTest::SetUp() {
   views::ViewsTestBase::SetUp();
-  MessageCenterView::disable_animation_for_testing = true;
   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);
 
   Notification* notification2 = new Notification(
       NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId2),
       base::UTF8ToUTF16("title2"), base::UTF8ToUTF16("message2"), gfx::Image(),
       base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
       message_center::RichNotificationData(), NULL);
 
   // ...and a list for it.
   notifications_.insert(notification1);
   notifications_.insert(notification2);
   message_center_->SetVisibleNotifications(notifications_);
 
   // Then create a new MessageCenterView with that single notification.
   message_center_view_.reset(new MessageCenterView(
       message_center_.get(), NULL, 100, false, /*top_down =*/false));
   GetMessageListView()->quit_message_loop_after_animation_for_test_ = true;
   GetMessageCenterView()->SetBounds(0, 0, 380, 600);
   message_center_view_->SetNotifications(notifications_);
-  message_center_view_->set_owned_by_client();
-
-  widget_.reset(new views::Widget());
-  views::Widget::InitParams params =
-      CreateParams(views::Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.bounds = gfx::Rect(50, 50, 650, 650);
-  widget_->Init(params);
-  views::View* root = widget_->GetRootView();
-  root->AddChildView(message_center_view_.get());
-  widget_->Show();
-  widget_->Activate();
 
   // Wait until the animation finishes if available.
   if (GetAnimator()->IsAnimating())
     base::MessageLoop::current()->Run();
 }
 
 void MessageCenterViewTest::TearDown() {
-  widget_->CloseNow();
-  widget_.reset();
   message_center_view_.reset();
   STLDeleteElements(&notifications_);
   views::ViewsTestBase::TearDown();
 }
 
 MessageCenterView* MessageCenterViewTest::GetMessageCenterView() {
   return message_center_view_.get();
 }
 
 MessageListView* MessageCenterViewTest::GetMessageListView() {
@@ skipping 22 matching lines @@
 }
 
 int MessageCenterViewTest::GetNotificationCount() {
   return 2;
 }
 
 int MessageCenterViewTest::GetCallCount(CallType type) {
   return callCounts_[type];
 }
 
-void MessageCenterViewTest::SetLockedState(bool locked) {
-  GetMessageCenterView()->OnLockedStateChanged(locked);
-}
-
 void MessageCenterViewTest::ClickOnNotification(
     const std::string& notification_id) {
   // For this test, this method should not be invoked.
   NOTREACHED();
 }
 
 void MessageCenterViewTest::AddNotification(
     std::unique_ptr<Notification> notification) {
   std::string notification_id = notification->id();
   notifications_.insert(notification.release());
@@ skipping 429 matching lines @@
       message_center::RichNotificationData(), NULL);
   AddNotification(
       std::unique_ptr<Notification>(new Notification(normal_notification)));
   EXPECT_EQ(Mode::SETTINGS, GetMessageCenterViewInternalMode());
 
   // Hide the settings.
   GetMessageCenterView()->SetSettingsVisible(false);
   EXPECT_EQ(Mode::NOTIFICATIONS, GetMessageCenterViewInternalMode());
 }
 
-TEST_F(MessageCenterViewTest, LockScreen) {
-  const int kLockedMessageCenterViewHeight = 50;
-
-  EXPECT_TRUE(GetNotificationView(kNotificationId1)->IsDrawn());
-  EXPECT_TRUE(GetNotificationView(kNotificationId2)->IsDrawn());
-
-  // Lock!
-  SetLockedState(true);
-
-  EXPECT_FALSE(GetNotificationView(kNotificationId1)->IsDrawn());
-  EXPECT_FALSE(GetNotificationView(kNotificationId2)->IsDrawn());
-
-  GetMessageCenterView()->SizeToPreferredSize();
-  EXPECT_EQ(kLockedMessageCenterViewHeight, GetMessageCenterView()->height());
-
-  RemoveNotification(kNotificationId1, false);
-
-  GetMessageCenterView()->SizeToPreferredSize();
-  EXPECT_EQ(kLockedMessageCenterViewHeight, GetMessageCenterView()->height());
-
-  RemoveNotification(kNotificationId2, false);
-
-  GetMessageCenterView()->SizeToPreferredSize();
-  EXPECT_EQ(kLockedMessageCenterViewHeight, GetMessageCenterView()->height());
-
-  AddNotification(std::unique_ptr<Notification>(new Notification(
-      NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId1),
-      base::UTF8ToUTF16("title1"),
-      base::UTF8ToUTF16("message"),
-      gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
-      NotifierId(NotifierId::APPLICATION, "extension_id"),
-      message_center::RichNotificationData(), NULL)));
-  EXPECT_FALSE(GetNotificationView(kNotificationId1)->IsDrawn());
-
-  GetMessageCenterView()->SizeToPreferredSize();
-  EXPECT_EQ(kLockedMessageCenterViewHeight, GetMessageCenterView()->height());
-
-  // Unlock!
-  SetLockedState(false);
-
-  EXPECT_TRUE(GetNotificationView(kNotificationId1)->IsDrawn());
-
-  GetMessageCenterView()->SizeToPreferredSize();
-  EXPECT_NE(kLockedMessageCenterViewHeight, GetMessageCenterView()->height());
-
-  // Lock!
-  SetLockedState(true);
-
-  EXPECT_FALSE(GetNotificationView(kNotificationId1)->IsDrawn());
-
-  GetMessageCenterView()->SizeToPreferredSize();
-  EXPECT_EQ(kLockedMessageCenterViewHeight, GetMessageCenterView()->height());
-}
-
-TEST_F(MessageCenterViewTest, NoNotification) {
-  const int kEmptyMessageCenterViewHeight = 50;
-
-  GetMessageCenterView()->SizeToPreferredSize();
-  EXPECT_NE(kEmptyMessageCenterViewHeight, GetMessageCenterView()->height());
-  RemoveNotification(kNotificationId1, false);
-  GetMessageCenterView()->SizeToPreferredSize();
-  EXPECT_NE(kEmptyMessageCenterViewHeight, GetMessageCenterView()->height());
-  RemoveNotification(kNotificationId2, false);
-  GetMessageCenterView()->SizeToPreferredSize();
-  EXPECT_EQ(kEmptyMessageCenterViewHeight, GetMessageCenterView()->height());
-
-  AddNotification(std::unique_ptr<Notification>(new Notification(
-      NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId1),
-      base::UTF8ToUTF16("title1"),
-      base::UTF8ToUTF16("message"),
-      gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
-      NotifierId(NotifierId::APPLICATION, "extension_id"),
-      message_center::RichNotificationData(), NULL)));
-
-  GetMessageCenterView()->SizeToPreferredSize();
-  EXPECT_NE(kEmptyMessageCenterViewHeight, GetMessageCenterView()->height());
-}
-
 }  // namespace message_center