| Index: base/observer_list_unittest.cc
|
| diff --git a/base/observer_list_unittest.cc b/base/observer_list_unittest.cc
|
| index 65ef934ad8a5278b4f344e58c7b782dd2d7b4306..636aa83fb9dcc22f9b1b1360d7609e6dfcd7c513 100644
|
| --- a/base/observer_list_unittest.cc
|
| +++ b/base/observer_list_unittest.cc
|
| @@ -134,7 +134,7 @@ class AddRemoveThread : public PlatformThread::Delegate,
|
| }
|
|
|
| if (do_notifies_) {
|
| - list_->Notify(&Foo::Observe, 10);
|
| + list_->Notify(FROM_HERE, &Foo::Observe, 10);
|
| }
|
|
|
| loop_->PostTask(
|
| @@ -217,14 +217,14 @@ TEST(ObserverListThreadSafeTest, BasicTest) {
|
| observer_list->AddObserver(&a);
|
| observer_list->AddObserver(&b);
|
|
|
| - observer_list->Notify(&Foo::Observe, 10);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 10);
|
| RunLoop().RunUntilIdle();
|
|
|
| observer_list->AddObserver(&evil);
|
| observer_list->AddObserver(&c);
|
| observer_list->AddObserver(&d);
|
|
|
| - observer_list->Notify(&Foo::Observe, 10);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 10);
|
| RunLoop().RunUntilIdle();
|
|
|
| EXPECT_EQ(20, a.total);
|
| @@ -247,7 +247,7 @@ TEST(ObserverListThreadSafeTest, RemoveObserver) {
|
| observer_list->RemoveObserver(&a);
|
| observer_list->RemoveObserver(&b);
|
|
|
| - observer_list->Notify(&Foo::Observe, 10);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 10);
|
| RunLoop().RunUntilIdle();
|
|
|
| EXPECT_EQ(0, a.total);
|
| @@ -258,7 +258,7 @@ TEST(ObserverListThreadSafeTest, RemoveObserver) {
|
| // Should also do nothing.
|
| observer_list->RemoveObserver(&b);
|
|
|
| - observer_list->Notify(&Foo::Observe, 10);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 10);
|
| RunLoop().RunUntilIdle();
|
|
|
| EXPECT_EQ(10, a.total);
|
| @@ -280,7 +280,7 @@ TEST(ObserverListThreadSafeTest, WithoutMessageLoop) {
|
| MessageLoop loop;
|
| observer_list->AddObserver(&c);
|
|
|
| - observer_list->Notify(&Foo::Observe, 10);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 10);
|
| RunLoop().RunUntilIdle();
|
|
|
| EXPECT_EQ(0, a.total);
|
| @@ -294,7 +294,7 @@ TEST(ObserverListThreadSafeTest, WithoutMessageLoop) {
|
| observer_list->RemoveObserver(&c);
|
|
|
| // Notify again.
|
| - observer_list->Notify(&Foo::Observe, 20);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 20);
|
| RunLoop().RunUntilIdle();
|
|
|
| EXPECT_EQ(20, a.total);
|
| @@ -308,7 +308,7 @@ TEST(ObserverListThreadSafeTest, WithoutMessageLoop) {
|
| // Notifying should not fail but should also be a no-op.
|
| MessageLoop loop;
|
| observer_list->AddObserver(&b);
|
| - observer_list->Notify(&Foo::Observe, 30);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 30);
|
| RunLoop().RunUntilIdle();
|
|
|
| EXPECT_EQ(20, a.total);
|
| @@ -353,7 +353,7 @@ TEST(ObserverListThreadSafeTest, RemoveMultipleObservers) {
|
| a.AddFooToRemove(&a);
|
| a.AddFooToRemove(&b);
|
|
|
| - observer_list->Notify(&Foo::Observe, 1);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 1);
|
| RunLoop().RunUntilIdle();
|
| }
|
|
|
| @@ -392,7 +392,7 @@ static void ThreadSafeObserverHarness(int num_threads,
|
| if ((Time::Now() - start).InMilliseconds() > kThreadRunTime)
|
| break;
|
|
|
| - observer_list->Notify(&Foo::Observe, 10);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 10);
|
|
|
| RunLoop().RunUntilIdle();
|
| }
|
| @@ -424,7 +424,7 @@ TEST(ObserverListThreadSafeTest, OutlivesMessageLoop) {
|
| observer_list->AddObserver(&a);
|
| delete loop;
|
| // Test passes if we don't crash here.
|
| - observer_list->Notify(&Foo::Observe, 1);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 1);
|
| }
|
|
|
| TEST(ObserverListTest, Existing) {
|
| @@ -458,7 +458,7 @@ TEST(ObserverListThreadSafeTest, Existing) {
|
| observer_list->AddObserver(&a);
|
| observer_list->AddObserver(&b);
|
|
|
| - observer_list->Notify(&Foo::Observe, 1);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 1);
|
| RunLoop().RunUntilIdle();
|
|
|
| EXPECT_TRUE(b.added);
|
| @@ -467,7 +467,7 @@ TEST(ObserverListThreadSafeTest, Existing) {
|
| EXPECT_EQ(0, b.adder.total);
|
|
|
| // Notify again to make sure b's adder is notified.
|
| - observer_list->Notify(&Foo::Observe, 1);
|
| + observer_list->Notify(FROM_HERE, &Foo::Observe, 1);
|
| RunLoop().RunUntilIdle();
|
| EXPECT_EQ(1, b.adder.total);
|
| }
|
|
|