RunAllPendingEvents -> ui_test_utils::RunAllPendingInMessageLoop

chrome/browser/chromeos/notifications/notification_browsertest.cc

 // Copyright (c) 2010 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 "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h"
 #include "chrome/browser/chromeos/notifications/notification_panel.h"
@@ skipping 60 matching lines @@
   EXPECT_EQ(0, tester->GetStickyNotificationCount());
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   collection->Add(NewMockNotification("2"), browser()->profile());
 
   EXPECT_EQ(2, tester->GetNewNotificationCount());
   EXPECT_EQ(2, tester->GetNotificationCount());
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   collection->Remove(NewMockNotification("1"));
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
 
   EXPECT_EQ(1, tester->GetNewNotificationCount());
   EXPECT_EQ(1, tester->GetNotificationCount());
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   collection->Remove(NewMockNotification("2"));
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(0, tester->GetNewNotificationCount());
   EXPECT_EQ(0, tester->GetNotificationCount());
   EXPECT_EQ(NotificationPanel::CLOSED, tester->state());
 }
 
 // [CLOSED] -add->[STICKY_AND_NEW] -mouse-> [KEEP_SIZE] -remove->
 // [CLOSED] -add-> [STICKY_AND_NEW] -remove-> [CLOSED]
 IN_PROC_BROWSER_TEST_F(NotificationTest, TestKeepSizeState) {
   BalloonCollectionImpl* collection = GetBalloonCollectionImpl();
   NotificationPanel* panel = GetNotificationPanel();
   NotificationPanelTester* tester = panel->GetTester();
 
   EXPECT_EQ(NotificationPanel::CLOSED, tester->state());
 
   // Using system notification as regular notification.
   collection->Add(NewMockNotification("1"), browser()->profile());
   collection->Add(NewMockNotification("2"), browser()->profile());
 
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   panel->OnMouseMotion();
   EXPECT_EQ(NotificationPanel::KEEP_SIZE, tester->state());
 
   collection->Remove(NewMockNotification("1"));
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, tester->GetNewNotificationCount());
   EXPECT_EQ(1, tester->GetNotificationCount());
   EXPECT_EQ(NotificationPanel::KEEP_SIZE, tester->state());
 
   collection->Remove(NewMockNotification("2"));
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(0, tester->GetNotificationCount());
   EXPECT_EQ(NotificationPanel::CLOSED, tester->state());
 
   collection->Add(NewMockNotification("3"), browser()->profile());
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
   collection->Remove(NewMockNotification("3"));
 
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(0, tester->GetNotificationCount());
   EXPECT_EQ(NotificationPanel::CLOSED, tester->state());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationTest, TestSystemNotification) {
   BalloonCollectionImpl* collection = GetBalloonCollectionImpl();
   NotificationPanel* panel = GetNotificationPanel();
   scoped_refptr<MockNotificationDelegate> delegate(
       new MockNotificationDelegate("power"));
   NotificationPanelTester* tester = panel->GetTester();
 
   Notification notify = NewMockNotification(delegate.get());
   collection->AddSystemNotification(notify, browser()->profile(), true, false);
 
   EXPECT_EQ(1, tester->GetNewNotificationCount());
   EXPECT_EQ(1, tester->GetStickyNotificationCount());
 
   Notification update = SystemNotificationFactory::Create(
       GURL(), ASCIIToUTF16("Title"), ASCIIToUTF16("updated"), delegate.get());
   collection->UpdateNotification(update);
 
   EXPECT_EQ(1, tester->GetStickyNotificationCount());
 
   // Dismiss the notification.
   // TODO(oshima): Consider updating API to Remove(NotificationDelegate)
   // or Remove(std::string id);
   collection->Remove(Notification(GURL(), GURL(),
                                   std::wstring(), delegate.get()));
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
 
   EXPECT_EQ(0, tester->GetStickyNotificationCount());
   EXPECT_EQ(0, tester->GetNewNotificationCount());
   // TODO(oshima): check content, etc..
 }
 
 // [CLOSED] -add,add->[STICKY_AND_NEW] -stale-> [MINIMIZED] -remove->
 // [MINIMIZED] -remove-> [CLOSED]
 IN_PROC_BROWSER_TEST_F(NotificationTest, TestStateTransition1) {
   BalloonCollectionImpl* collection = GetBalloonCollectionImpl();
   NotificationPanel* panel = GetNotificationPanel();
   NotificationPanelTester* tester = panel->GetTester();
 
   tester->SetStaleTimeout(0);
   EXPECT_EQ(NotificationPanel::CLOSED, tester->state());
 
   collection->Add(NewMockNotification("1"), browser()->profile());
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   collection->Add(NewMockNotification("2"), browser()->profile());
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(NotificationPanel::MINIMIZED, tester->state());
 
   collection->Remove(NewMockNotification("2"));
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(NotificationPanel::MINIMIZED, tester->state());
 
   collection->Remove(NewMockNotification("1"));
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(0, tester->GetNotificationCount());
   EXPECT_EQ(NotificationPanel::CLOSED, tester->state());
 }
 
 // [CLOSED] -add->[STICKY_AND_NEW] -stale-> [MINIMIZED] -add->
 // [STICKY_AND_NEW] -stale-> [MINIMIZED] -add sys-> [STICKY_NEW]
 // -stale-> [STICKY_NEW] -remove-> [STICKY_NEW] -remove sys->
 // [MINIMIZED] -remove-> [CLOSED]
 IN_PROC_BROWSER_TEST_F(NotificationTest, TestStateTransition2) {
   BalloonCollectionImpl* collection = GetBalloonCollectionImpl();
   NotificationPanel* panel = GetNotificationPanel();
   NotificationPanelTester* tester = panel->GetTester();
 
   tester->SetStaleTimeout(0);
 
   EXPECT_EQ(NotificationPanel::CLOSED, tester->state());
 
   collection->Add(NewMockNotification("1"), browser()->profile());
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(NotificationPanel::MINIMIZED, tester->state());
 
   collection->Add(NewMockNotification("2"), browser()->profile());
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(NotificationPanel::MINIMIZED, tester->state());
 
   collection->AddSystemNotification(
       NewMockNotification("3"), browser()->profile(), true, false);
   EXPECT_EQ(3, tester->GetNotificationCount());
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   collection->Remove(NewMockNotification("1"));
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   collection->Remove(NewMockNotification("3"));
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, tester->GetNotificationCount());
   EXPECT_EQ(NotificationPanel::MINIMIZED, tester->state());
 
   collection->Remove(NewMockNotification("2"));
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(0, tester->GetNotificationCount());
   EXPECT_EQ(NotificationPanel::CLOSED, tester->state());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationTest, TestStateTransition3) {
 }
 
 }  // namespace chromeos