Remove stl_util's deletion function use from message_center views.

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>
 
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/run_loop.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"
@@ skipping 91 matching lines @@
   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;
+  using Mode = MessageCenterView::Mode;
 
   MessageCenterViewTest();
   ~MessageCenterViewTest() override;
 
   void SetUp() override;
   void TearDown() override;
 
+  NotificationList::Notifications Notifications();
   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();
@@ skipping 20 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_;
+  // The ownership map of notifications; the key is the id.
+  std::map<std::string, std::unique_ptr<Notification>> 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(
+  std::unique_ptr<Notification> notification1 = base::MakeUnique<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);
+      message_center::RichNotificationData(), nullptr);
 
-  Notification* notification2 = new Notification(
+  std::unique_ptr<Notification> notification2 = base::MakeUnique<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);
+      message_center::RichNotificationData(), nullptr);
 
   // ...and a list for it.
-  notifications_.insert(notification1);
-  notifications_.insert(notification2);
-  message_center_->SetVisibleNotifications(notifications_);
+  notifications_[std::string(kNotificationId1)] = std::move(notification1);
+  notifications_[std::string(kNotificationId2)] = std::move(notification2);
+  NotificationList::Notifications notifications = Notifications();
+  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_->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::RunLoop().Run();
 }
 
 void MessageCenterViewTest::TearDown() {
   widget_->CloseNow();
   widget_.reset();
   message_center_view_.reset();
-  base::STLDeleteElements(&notifications_);
+  notifications_.clear();
   views::ViewsTestBase::TearDown();
 }
 
+NotificationList::Notifications MessageCenterViewTest::Notifications() {
+  NotificationList::Notifications result;
+  for (const auto& notification_pair : notifications_)
+    result.insert(notification_pair.second.get());
+
+  return result;
+}
+
 MessageCenterView* MessageCenterViewTest::GetMessageCenterView() {
   return message_center_view_.get();
 }
 
 MessageListView* MessageCenterViewTest::GetMessageListView() {
   return message_center_view_->message_list_view_.get();
 }
 
 FakeMessageCenterImpl* MessageCenterViewTest::GetMessageCenter() const {
   return message_center_.get();
@@ skipping 30 matching lines @@
 
 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());
-  message_center_->SetVisibleNotifications(notifications_);
+  notifications_[notification_id] = std::move(notification);
+  message_center_->SetVisibleNotifications(Notifications());
   message_center_view_->OnNotificationAdded(notification_id);
 }
 
 void MessageCenterViewTest::UpdateNotification(
     const std::string& notification_id,
     std::unique_ptr<Notification> notification) {
-  for (auto it = notifications_.begin(); it != notifications_.end(); it++) {
-    if ((*it)->id() == notification_id) {
-      delete *it;
-      notifications_.erase(it);
-      break;
-    }
-  }
-  // |notifications| is a "set" container so we don't need to be aware the
-  // order.
-  notifications_.insert(notification.release());
-  message_center_->SetVisibleNotifications(notifications_);
+  DCHECK_EQ(notification_id, notification->id());
+  notifications_[notification_id] = std::move(notification);
+
+  message_center_->SetVisibleNotifications(Notifications());
   message_center_view_->OnNotificationUpdated(notification_id);
 }
 
 void MessageCenterViewTest::RemoveNotification(
     const std::string& notification_id,
     bool by_user) {
-  for (auto it = notifications_.begin(); it != notifications_.end(); it++) {
-    if ((*it)->id() == notification_id) {
-      delete *it;
-      notifications_.erase(it);
-      break;
-    }
-  }
-  message_center_->SetVisibleNotifications(notifications_);
+  notifications_.erase(notification_id);
+
+  message_center_->SetVisibleNotifications(Notifications());
   message_center_view_->OnNotificationRemoved(notification_id, by_user);
 }
 
 std::unique_ptr<ui::MenuModel> MessageCenterViewTest::CreateMenuModel(
     const NotifierId& notifier_id,
     const base::string16& display_source) {
   // For this test, this method should not be invoked.
   NOTREACHED();
   return nullptr;
 }
@@ skipping 75 matching lines @@
           (kMarginBetweenItems - MessageView::GetShadowInsets().bottom()) +
           GetNotificationView(kNotificationId2)->GetHeightForWidth(width) +
           GetMessageListView()->GetInsets().height());
 }
 
 TEST_F(MessageCenterViewTest, SizeAfterUpdate) {
   EXPECT_EQ(2, GetMessageListView()->child_count());
   int width =
       GetMessageListView()->width() - GetMessageListView()->GetInsets().width();
 
-  std::unique_ptr<Notification> notification(new Notification(
+  std::unique_ptr<Notification> notification = base::MakeUnique<Notification>(
       NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId2),
       base::UTF8ToUTF16("title2"),
       base::UTF8ToUTF16("message\nwhich\nis\nvertically\nlong\n."),
       gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
-      message_center::RichNotificationData(), NULL));
+      message_center::RichNotificationData(), nullptr);
 
   EXPECT_EQ(
       GetMessageListView()->height(),
       GetNotificationView(kNotificationId1)->GetHeightForWidth(width) +
           (kMarginBetweenItems - MessageView::GetShadowInsets().bottom()) +
           GetNotificationView(kNotificationId2)->GetHeightForWidth(width) +
           GetMessageListView()->GetInsets().height());
 
   int previous_height = GetMessageListView()->height();
 
@@ skipping 41 matching lines @@
   // Make sure that the notification 2 is placed above the notification 1.
   EXPECT_LT(GetNotificationView(kNotificationId2)->bounds().y(),
             GetNotificationView(kNotificationId1)->bounds().y());
 
   int previous_vertical_pos_from_bottom =
       GetMessageListView()->height() -
       GetNotificationView(kNotificationId1)->bounds().y();
   GetMessageListView()->SetRepositionTargetForTest(
       GetNotificationView(kNotificationId1)->bounds());
 
-  std::unique_ptr<Notification> notification(new Notification(
+  std::unique_ptr<Notification> notification = base::MakeUnique<Notification>(
       NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId2),
       base::UTF8ToUTF16("title2"),
       base::UTF8ToUTF16("message\nwhich\nis\nvertically\nlong\n."),
       gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
-      message_center::RichNotificationData(), NULL));
+      message_center::RichNotificationData(), nullptr);
   UpdateNotification(kNotificationId2, std::move(notification));
 
   // Wait until the animation finishes if available.
   if (GetAnimator()->IsAnimating())
     base::RunLoop().Run();
 
   // The vertical position of the target from bottom should be kept over change.
   int current_vertical_pos_from_bottom =
       GetMessageListView()->height() -
       GetNotificationView(kNotificationId1)->bounds().y();
@@ skipping 99 matching lines @@
   // Pinned notification #2
   Notification pinned_notification2(
       NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId2),
       base::UTF8ToUTF16("title2"),
       base::UTF8ToUTF16("message\nwhich\nis\nvertically\nlong\n."),
       gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
       message_center::RichNotificationData(), NULL);
   pinned_notification2.set_pinned(true);
 
-  AddNotification(
-      std::unique_ptr<Notification>(new Notification(normal_notification1)));
+  AddNotification(base::MakeUnique<Notification>(normal_notification1));
 
   // There should be 1 non-pinned notification.
   EXPECT_EQ(1u, GetMessageCenter()->GetVisibleNotifications().size());
   EXPECT_TRUE(close_button->enabled());
 
-  UpdateNotification(
-      kNotificationId1,
-      std::unique_ptr<Notification>(new Notification(pinned_notification1)));
+  UpdateNotification(kNotificationId1,
+                     base::MakeUnique<Notification>(pinned_notification1));
 
   // There should be 1 pinned notification.
   EXPECT_EQ(1u, GetMessageCenter()->GetVisibleNotifications().size());
   EXPECT_FALSE(close_button->enabled());
 
   // Adds 1 pinned notification.
-  AddNotification(
-      std::unique_ptr<Notification>(new Notification(pinned_notification2)));
+  AddNotification(base::MakeUnique<Notification>(pinned_notification2));
 
   // There should be 1 pinned notification.
   EXPECT_EQ(2u, GetMessageCenter()->GetVisibleNotifications().size());
   EXPECT_FALSE(close_button->enabled());
 
-  UpdateNotification(
-      kNotificationId1,
-      std::unique_ptr<Notification>(new Notification(normal_notification1)));
+  UpdateNotification(kNotificationId1,
+                     base::MakeUnique<Notification>(normal_notification1));
 
   // There should be 1 normal notification and 1 pinned notification.
   EXPECT_EQ(2u, GetMessageCenter()->GetVisibleNotifications().size());
   EXPECT_TRUE(close_button->enabled());
 
   RemoveNotification(kNotificationId1, false);
 
   // There should be 1 pinned notification.
   EXPECT_EQ(1u, GetMessageCenter()->GetVisibleNotifications().size());
   EXPECT_FALSE(close_button->enabled());
 
   RemoveNotification(kNotificationId2, false);
 
   // There should be no notification.
   EXPECT_EQ(0u, GetMessageCenter()->GetVisibleNotifications().size());
   EXPECT_FALSE(close_button->enabled());
 
-  AddNotification(
-      std::unique_ptr<Notification>(new Notification(pinned_notification2)));
+  AddNotification(base::MakeUnique<Notification>(pinned_notification2));
 
   // There should be 1 pinned notification.
   EXPECT_EQ(1u, GetMessageCenter()->GetVisibleNotifications().size());
   EXPECT_FALSE(close_button->enabled());
 #endif  // defined(OS_CHROMEOS)
 }
 
 TEST_F(MessageCenterViewTest, CheckModeWithSettingsVisibleAndHidden) {
   // Check the initial state.
   EXPECT_EQ(Mode::NOTIFICATIONS, GetMessageCenterViewInternalMode());
   // Show the settings.
   GetMessageCenterView()->SetSettingsVisible(true);
   EXPECT_EQ(Mode::SETTINGS, GetMessageCenterViewInternalMode());
   // Hide the settings.
   GetMessageCenterView()->SetSettingsVisible(false);
   EXPECT_EQ(Mode::NOTIFICATIONS, GetMessageCenterViewInternalMode());
 }
 
 TEST_F(MessageCenterViewTest, CheckModeWithRemovingAndAddingNotifications) {
   // Check the initial state.
   EXPECT_EQ(Mode::NOTIFICATIONS, GetMessageCenterViewInternalMode());
 
   // Remove notifications.
   RemoveDefaultNotifications();
   EXPECT_EQ(Mode::BUTTONS_ONLY, GetMessageCenterViewInternalMode());
 
   // Add a notification.
-  Notification normal_notification(
+  AddNotification(base::MakeUnique<Notification>(
       NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId1),
       base::UTF8ToUTF16("title2"),
       base::UTF8ToUTF16("message\nwhich\nis\nvertically\nlong\n."),
       gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
-      message_center::RichNotificationData(), NULL);
-  AddNotification(
-      std::unique_ptr<Notification>(new Notification(normal_notification)));
+      message_center::RichNotificationData(), nullptr));
   EXPECT_EQ(Mode::NOTIFICATIONS, GetMessageCenterViewInternalMode());
 }
 
 TEST_F(MessageCenterViewTest, CheckModeWithSettingsVisibleAndHiddenOnEmpty) {
   // Set up by removing all existing notifications.
   RemoveDefaultNotifications();
 
   // Check the initial state.
   EXPECT_EQ(Mode::BUTTONS_ONLY, GetMessageCenterViewInternalMode());
   // Show the settings.
@@ skipping 28 matching lines @@
   RemoveDefaultNotifications();
 
   // Check the initial state.
   EXPECT_EQ(Mode::BUTTONS_ONLY, GetMessageCenterViewInternalMode());
 
   // Show the settings.
   GetMessageCenterView()->SetSettingsVisible(true);
   EXPECT_EQ(Mode::SETTINGS, GetMessageCenterViewInternalMode());
 
   // Add a notification during settings is visible.
-  Notification normal_notification(
+  AddNotification(base::MakeUnique<Notification>(
       NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId1),
       base::UTF8ToUTF16("title2"),
       base::UTF8ToUTF16("message\nwhich\nis\nvertically\nlong\n."),
       gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
-      message_center::RichNotificationData(), NULL);
-  AddNotification(
-      std::unique_ptr<Notification>(new Notification(normal_notification)));
+      message_center::RichNotificationData(), nullptr));
   EXPECT_EQ(Mode::SETTINGS, GetMessageCenterViewInternalMode());
 
   // Hide the settings.
   GetMessageCenterView()->SetSettingsVisible(false);
   EXPECT_EQ(Mode::NOTIFICATIONS, GetMessageCenterViewInternalMode());
 }
 
 TEST_F(MessageCenterViewTest, LockScreen) {
   const int kLockedMessageCenterViewHeight = 50;
 
@@ skipping 12 matching lines @@
   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(
+  AddNotification(base::MakeUnique<Notification>(
       NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId1),
-      base::UTF8ToUTF16("title1"),
-      base::UTF8ToUTF16("message"),
-      gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
+      base::UTF8ToUTF16("title1"), base::UTF8ToUTF16("message"), gfx::Image(),
+      base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
-      message_center::RichNotificationData(), NULL)));
+      message_center::RichNotificationData(), nullptr));
   EXPECT_FALSE(GetNotificationView(kNotificationId1)->IsDrawn());
 
   GetMessageCenterView()->SizeToPreferredSize();
   EXPECT_EQ(kLockedMessageCenterViewHeight, GetMessageCenterView()->height());
 
   // Unlock!
   SetLockedState(false);
 
   EXPECT_TRUE(GetNotificationView(kNotificationId1)->IsDrawn());
 
@@ skipping 14 matching lines @@
 
   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(
+  AddNotification(base::MakeUnique<Notification>(
       NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId1),
-      base::UTF8ToUTF16("title1"),
-      base::UTF8ToUTF16("message"),
-      gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
+      base::UTF8ToUTF16("title1"), base::UTF8ToUTF16("message"), gfx::Image(),
+      base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
-      message_center::RichNotificationData(), NULL)));
+      message_center::RichNotificationData(), nullptr));
 
   GetMessageCenterView()->SizeToPreferredSize();
   EXPECT_NE(kEmptyMessageCenterViewHeight, GetMessageCenterView()->height());
 }
 
 }  // namespace message_center