Remove calls to deprecated MessageLoop methods on Windows and Linux.

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/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"
 #include "ui/message_center/views/message_list_view.h"
@@ skipping 199 matching lines @@
   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();
+    base::RunLoop().Run();
 }
 
 void MessageCenterViewTest::TearDown() {
   widget_->CloseNow();
   widget_.reset();
   message_center_view_.reset();
   base::STLDeleteElements(&notifications_);
   views::ViewsTestBase::TearDown();
 }
 
@@ skipping 189 matching lines @@
           (kMarginBetweenItems - MessageView::GetShadowInsets().bottom()) +
           GetNotificationView(kNotificationId2)->GetHeightForWidth(width) +
           GetMessageListView()->GetInsets().height());
 
   int previous_height = GetMessageListView()->height();
 
   UpdateNotification(kNotificationId2, std::move(notification));
 
   // Wait until the animation finishes if available.
   if (GetAnimator()->IsAnimating())
-    base::MessageLoop::current()->Run();
+    base::RunLoop().Run();
 
   EXPECT_EQ(2, GetMessageListView()->child_count());
   EXPECT_EQ(GetMessageListView()->height(),
             GetCalculatedMessageListViewHeight());
 
   // The size must be changed, since the new string is longer than the old one.
   EXPECT_NE(previous_height, GetMessageListView()->height());
 
   EXPECT_EQ(
       GetMessageListView()->height(),
       GetNotificationView(kNotificationId1)->GetHeightForWidth(width) +
           (kMarginBetweenItems - MessageView::GetShadowInsets().bottom()) +
           GetNotificationView(kNotificationId2)->GetHeightForWidth(width) +
           GetMessageListView()->GetInsets().height());
 }
 
 TEST_F(MessageCenterViewTest, SizeAfterRemove) {
   EXPECT_EQ(2, GetMessageListView()->child_count());
   RemoveNotification(kNotificationId1, false);
 
   // Wait until the animation finishes if available.
   if (GetAnimator()->IsAnimating())
-    base::MessageLoop::current()->Run();
+    base::RunLoop().Run();
 
   EXPECT_EQ(1, GetMessageListView()->child_count());
 
   int width =
       GetMessageListView()->width() - GetMessageListView()->GetInsets().width();
   EXPECT_FALSE(GetNotificationView(kNotificationId1));
   EXPECT_TRUE(GetNotificationView(kNotificationId2));
   EXPECT_EQ(GetMessageListView()->height(),
             GetNotificationView(kNotificationId2)->GetHeightForWidth(width) +
                 GetMessageListView()->GetInsets().height());
@@ skipping 14 matching lines @@
       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));
   UpdateNotification(kNotificationId2, std::move(notification));
 
   // Wait until the animation finishes if available.
   if (GetAnimator()->IsAnimating())
-    base::MessageLoop::current()->Run();
+    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();
   EXPECT_EQ(previous_vertical_pos_from_bottom,
             current_vertical_pos_from_bottom);
 }
 
 TEST_F(MessageCenterViewTest, PositionAfterRemove) {
   // Make sure that the notification 2 is placed above the notification 1.
   EXPECT_LT(GetNotificationView(kNotificationId2)->bounds().y(),
             GetNotificationView(kNotificationId1)->bounds().y());
 
   GetMessageListView()->SetRepositionTargetForTest(
       GetNotificationView(kNotificationId2)->bounds());
   int previous_height = GetMessageListView()->height();
   int previous_notification2_y =
       GetNotificationView(kNotificationId2)->bounds().y();
   int previous_notification2_height =
       GetNotificationView(kNotificationId2)->bounds().height();
 
   EXPECT_EQ(2, GetMessageListView()->child_count());
   RemoveNotification(kNotificationId2, false);
 
   // Wait until the animation finishes if available.
   if (GetAnimator()->IsAnimating())
-    base::MessageLoop::current()->Run();
+    base::RunLoop().Run();
 
   EXPECT_EQ(1, GetMessageListView()->child_count());
 
   // Confirm that notification 1 is moved up to the place on which the
   // notification 2 was.
   EXPECT_EQ(previous_notification2_y,
             GetNotificationView(kNotificationId1)->bounds().y());
   // The size should be kept.
   EXPECT_EQ(previous_height, GetMessageListView()->height());
 
@@ skipping 10 matching lines @@
                 (kMarginBetweenItems - MessageView::GetShadowInsets().bottom()),
             GetMessageListView()->height());
 }
 
 TEST_F(MessageCenterViewTest, CloseButton) {
   views::Button* close_button = GetButtonBar()->GetCloseAllButtonForTest();
   EXPECT_NE(nullptr, close_button);
 
   ((views::ButtonListener*)GetButtonBar())
       ->ButtonPressed(close_button, DummyEvent());
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
   EXPECT_TRUE(GetMessageCenter()->remove_all_closable_notification_called_);
 }
 
 TEST_F(MessageCenterViewTest, CloseButtonEnablity) {
   views::Button* close_button = GetButtonBar()->GetCloseAllButtonForTest();
   EXPECT_NE(nullptr, close_button);
 
   // There should be 2 non-pinned notifications.
   EXPECT_EQ(2u, GetMessageCenter()->GetVisibleNotifications().size());
   EXPECT_TRUE(close_button->enabled());
 
   RemoveNotification(kNotificationId1, false);
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
 
   // There should be 1 non-pinned notification.
   EXPECT_EQ(1u, GetMessageCenter()->GetVisibleNotifications().size());
   EXPECT_TRUE(close_button->enabled());
 
   RemoveNotification(kNotificationId2, false);
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
 
   // There should be no notification.
   EXPECT_EQ(0u, GetMessageCenter()->GetVisibleNotifications().size());
   EXPECT_FALSE(close_button->enabled());
 
   Notification normal_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(),
@@ skipping 210 matching lines @@
       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