Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(293)

Unified Diff: components/metrics/metrics_service_unittest.cc

Issue 532623003: Remove MetricsServiceObserver in favor of MetricsProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix GN build. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/metrics/metrics_service_unittest.cc
diff --git a/components/metrics/metrics_service_unittest.cc b/components/metrics/metrics_service_unittest.cc
index 2ee7e1d753dcd01454f19a9a4137801594998322..e85f35121e089087c6a222869abccea9e53a0796 100644
--- a/components/metrics/metrics_service_unittest.cc
+++ b/components/metrics/metrics_service_unittest.cc
@@ -15,7 +15,6 @@
#include "components/metrics/compression_utils.h"
#include "components/metrics/metrics_log.h"
#include "components/metrics/metrics_pref_names.h"
-#include "components/metrics/metrics_service_observer.h"
#include "components/metrics/metrics_state_manager.h"
#include "components/metrics/test_metrics_service_client.h"
#include "components/variations/metrics_util.h"
@@ -130,22 +129,6 @@ class MetricsServiceTest : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(MetricsServiceTest);
};
-class TestMetricsServiceObserver : public MetricsServiceObserver {
- public:
- TestMetricsServiceObserver(): observed_(0) {}
- virtual ~TestMetricsServiceObserver() {}
-
- virtual void OnDidCreateMetricsLog() OVERRIDE {
- ++observed_;
- }
- int observed() const { return observed_; }
-
- private:
- int observed_;
-
- DISALLOW_COPY_AND_ASSIGN(TestMetricsServiceObserver);
-};
-
} // namespace
TEST_F(MetricsServiceTest, InitialStabilityLogAfterCleanShutDown) {
@@ -283,36 +266,4 @@ TEST_F(MetricsServiceTest, RegisterSyntheticTrial) {
service.log_manager_.FinishCurrentLog();
}
-TEST_F(MetricsServiceTest, MetricsServiceObserver) {
- metrics::TestMetricsServiceClient client;
- MetricsService service(GetMetricsStateManager(), &client, GetLocalState());
- TestMetricsServiceObserver observer1;
- TestMetricsServiceObserver observer2;
-
- service.AddObserver(&observer1);
- EXPECT_EQ(0, observer1.observed());
- EXPECT_EQ(0, observer2.observed());
-
- service.OpenNewLog();
- EXPECT_EQ(1, observer1.observed());
- EXPECT_EQ(0, observer2.observed());
- service.log_manager_.FinishCurrentLog();
-
- service.AddObserver(&observer2);
-
- service.OpenNewLog();
- EXPECT_EQ(2, observer1.observed());
- EXPECT_EQ(1, observer2.observed());
- service.log_manager_.FinishCurrentLog();
-
- service.RemoveObserver(&observer1);
-
- service.OpenNewLog();
- EXPECT_EQ(2, observer1.observed());
- EXPECT_EQ(2, observer2.observed());
- service.log_manager_.FinishCurrentLog();
-
- service.RemoveObserver(&observer2);
-}
-
} // namespace metrics
« components/metrics/metrics_service.cc ('K') | « components/metrics/metrics_service_observer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698