Remove deprecated ScopedObservation::RemoveObservation.
Tbr: [email protected]
Bug: 1145565
Change-Id: I7c49818461f66214f9cbcc082c74490da8beba74
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2577705
Reviewed-by: Sigurður Ásgeirsson <[email protected]>
Reviewed-by: François Doray <[email protected]>
Commit-Queue: Sigurður Ásgeirsson <[email protected]>
Cr-Commit-Position: refs/heads/master@{#835160}
diff --git a/base/scoped_observation_unittest.cc b/base/scoped_observation_unittest.cc
index 882b173..69b1088a9 100644
--- a/base/scoped_observation_unittest.cc
+++ b/base/scoped_observation_unittest.cc
@@ -62,21 +62,6 @@
EXPECT_EQ(0u, s1.num_observers());
}
-TEST(ScopedObservationTest, RemoveObservation) {
- TestSource s1;
- TestSourceObserver o1;
- TestScopedObservation obs(&o1);
- EXPECT_EQ(0u, s1.num_observers());
- EXPECT_FALSE(s1.HasObserver(&o1));
-
- obs.Observe(&s1);
- EXPECT_EQ(1u, s1.num_observers());
- EXPECT_TRUE(s1.HasObserver(&o1));
-
- obs.RemoveObservation();
- EXPECT_EQ(0u, s1.num_observers());
-}
-
TEST(ScopedObservationTest, Reset) {
TestSource s1;
TestSourceObserver o1;
@@ -105,7 +90,7 @@
obs.Observe(&s1);
EXPECT_TRUE(obs.IsObserving());
- obs.RemoveObservation();
+ obs.Reset();
EXPECT_FALSE(obs.IsObserving());
}
@@ -121,7 +106,7 @@
EXPECT_TRUE(obs.IsObservingSource(&s1));
EXPECT_FALSE(obs.IsObservingSource(&s2));
- obs.RemoveObservation();
+ obs.Reset();
EXPECT_FALSE(obs.IsObservingSource(&s1));
EXPECT_FALSE(obs.IsObservingSource(&s2));
}
