diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 01:02:55 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 01:02:55 +0000 |
commit | 1f18bfe815cb85d18e42fdc80692828be710ad31 (patch) | |
tree | 6d9348d668a034238f327f28871256c5a5c88a33 /base/observer_list_unittest.cc | |
parent | 68f29a9c7310cf90808f8b6791a2c4c0217e8ab6 (diff) | |
download | chromium_src-1f18bfe815cb85d18e42fdc80692828be710ad31.zip chromium_src-1f18bfe815cb85d18e42fdc80692828be710ad31.tar.gz chromium_src-1f18bfe815cb85d18e42fdc80692828be710ad31.tar.bz2 |
base: Update calls froms RunAllPending() to RunUntilIdle().
BUG=131220
TEST=base_unittests
R=willchan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11339020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164802 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/observer_list_unittest.cc')
-rw-r--r-- | base/observer_list_unittest.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/base/observer_list_unittest.cc b/base/observer_list_unittest.cc index 53cc9c0..1650d3e 100644 --- a/base/observer_list_unittest.cc +++ b/base/observer_list_unittest.cc @@ -223,14 +223,14 @@ TEST(ObserverListThreadSafeTest, BasicTest) { observer_list->AddObserver(&b); observer_list->Notify(&Foo::Observe, 10); - loop.RunAllPending(); + loop.RunUntilIdle(); observer_list->AddObserver(&evil); observer_list->AddObserver(&c); observer_list->AddObserver(&d); observer_list->Notify(&Foo::Observe, 10); - loop.RunAllPending(); + loop.RunUntilIdle(); EXPECT_EQ(20, a.total); EXPECT_EQ(-20, b.total); @@ -253,7 +253,7 @@ TEST(ObserverListThreadSafeTest, RemoveObserver) { observer_list->RemoveObserver(&b); observer_list->Notify(&Foo::Observe, 10); - loop.RunAllPending(); + loop.RunUntilIdle(); EXPECT_EQ(0, a.total); EXPECT_EQ(0, b.total); @@ -264,7 +264,7 @@ TEST(ObserverListThreadSafeTest, RemoveObserver) { observer_list->RemoveObserver(&b); observer_list->Notify(&Foo::Observe, 10); - loop.RunAllPending(); + loop.RunUntilIdle(); EXPECT_EQ(10, a.total); EXPECT_EQ(0, b.total); @@ -286,7 +286,7 @@ TEST(ObserverListThreadSafeTest, WithoutMessageLoop) { observer_list->AddObserver(&c); observer_list->Notify(&Foo::Observe, 10); - loop.RunAllPending(); + loop.RunUntilIdle(); EXPECT_EQ(0, a.total); EXPECT_EQ(0, b.total); @@ -300,7 +300,7 @@ TEST(ObserverListThreadSafeTest, WithoutMessageLoop) { // Notify again. observer_list->Notify(&Foo::Observe, 20); - loop.RunAllPending(); + loop.RunUntilIdle(); EXPECT_EQ(20, a.total); EXPECT_EQ(0, b.total); @@ -314,7 +314,7 @@ TEST(ObserverListThreadSafeTest, WithoutMessageLoop) { MessageLoop loop; observer_list->AddObserver(&b); observer_list->Notify(&Foo::Observe, 30); - loop.RunAllPending(); + loop.RunUntilIdle(); EXPECT_EQ(20, a.total); EXPECT_EQ(30, b.total); @@ -359,7 +359,7 @@ TEST(ObserverListThreadSafeTest, RemoveMultipleObservers) { a.AddFooToRemove(&b); observer_list->Notify(&Foo::Observe, 1); - loop.RunAllPending(); + loop.RunUntilIdle(); } // A test driver for a multi-threaded notification loop. Runs a number @@ -399,7 +399,7 @@ static void ThreadSafeObserverHarness(int num_threads, observer_list->Notify(&Foo::Observe, 10); - loop.RunAllPending(); + loop.RunUntilIdle(); } for (int index = 0; index < num_threads; index++) { @@ -464,7 +464,7 @@ TEST(ObserverListThreadSafeTest, Existing) { observer_list->AddObserver(&b); observer_list->Notify(&Foo::Observe, 1); - loop.RunAllPending(); + loop.RunUntilIdle(); EXPECT_TRUE(b.added); // B's adder should not have been notified because it was added during @@ -473,7 +473,7 @@ TEST(ObserverListThreadSafeTest, Existing) { // Notify again to make sure b's adder is notified. observer_list->Notify(&Foo::Observe, 1); - loop.RunAllPending(); + loop.RunUntilIdle(); EXPECT_EQ(1, b.adder.total); } |