Index: components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc |
diff --git a/components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc b/components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc |
index 2aca12557a891b3379d53c7a7c29b0103d1f6e02..3e2a2ced704fe0d827a75f632e09b9602a5e5de3 100644 |
--- a/components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc |
+++ b/components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc |
@@ -7,7 +7,7 @@ |
#include "base/time/time.h" |
#include "base/timer/mock_timer.h" |
#include "components/page_load_metrics/common/page_load_timing.h" |
-#include "components/page_load_metrics/renderer/fake_page_timing_metrics_ipc_sender.h" |
+#include "components/page_load_metrics/renderer/fake_page_load_metrics.h" |
#include "ipc/ipc_message.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -17,11 +17,11 @@ namespace page_load_metrics { |
// MockTimer instance. |
class TestPageTimingMetricsSender : public PageTimingMetricsSender { |
public: |
- explicit TestPageTimingMetricsSender(IPC::Sender* ipc_sender, |
- const PageLoadTiming& initial_timing) |
+ explicit TestPageTimingMetricsSender( |
+ mojom::PageLoadMetrics* page_load_metrics, |
+ const PageLoadTiming& initial_timing) |
: PageTimingMetricsSender( |
- ipc_sender, |
- MSG_ROUTING_NONE, |
+ page_load_metrics, |
std::unique_ptr<base::Timer>(new base::MockTimer(false, false)), |
initial_timing) {} |
@@ -33,11 +33,12 @@ class TestPageTimingMetricsSender : public PageTimingMetricsSender { |
class PageTimingMetricsSenderTest : public testing::Test { |
public: |
PageTimingMetricsSenderTest() |
- : metrics_sender_(new TestPageTimingMetricsSender(&fake_ipc_sender_, |
- PageLoadTiming())) {} |
+ : metrics_sender_( |
+ new TestPageTimingMetricsSender(&fake_page_load_metrics_, |
+ PageLoadTiming())) {} |
protected: |
- FakePageTimingMetricsIPCSender fake_ipc_sender_; |
+ FakePageLoadMetrics fake_page_load_metrics_; |
std::unique_ptr<TestPageTimingMetricsSender> metrics_sender_; |
}; |
@@ -52,13 +53,13 @@ TEST_F(PageTimingMetricsSenderTest, Basic) { |
metrics_sender_->Send(timing); |
// Firing the timer should trigger sending of an OnTimingUpdated IPC. |
- fake_ipc_sender_.ExpectPageLoadTiming(timing); |
+ fake_page_load_metrics_.ExpectPageLoadTiming(timing); |
ASSERT_TRUE(metrics_sender_->mock_timer()->IsRunning()); |
metrics_sender_->mock_timer()->Fire(); |
EXPECT_FALSE(metrics_sender_->mock_timer()->IsRunning()); |
// At this point, we should have triggered the send of the PageLoadTiming IPC. |
- fake_ipc_sender_.VerifyExpectedTimings(); |
+ fake_page_load_metrics_.VerifyExpectedTimings(); |
// Attempt to send the same timing instance again. The send should be |
// suppressed, since the timing instance hasn't changed since the last send. |
@@ -85,7 +86,7 @@ TEST_F(PageTimingMetricsSenderTest, CoalesceMultipleIPCs) { |
// Firing the timer should trigger sending of the OnTimingUpdated IPC with |
// the most recently provided PageLoadTiming instance. |
- fake_ipc_sender_.ExpectPageLoadTiming(timing); |
+ fake_page_load_metrics_.ExpectPageLoadTiming(timing); |
metrics_sender_->mock_timer()->Fire(); |
EXPECT_FALSE(metrics_sender_->mock_timer()->IsRunning()); |
} |
@@ -101,17 +102,17 @@ TEST_F(PageTimingMetricsSenderTest, MultipleIPCs) { |
metrics_sender_->Send(timing); |
ASSERT_TRUE(metrics_sender_->mock_timer()->IsRunning()); |
- fake_ipc_sender_.ExpectPageLoadTiming(timing); |
+ fake_page_load_metrics_.ExpectPageLoadTiming(timing); |
metrics_sender_->mock_timer()->Fire(); |
EXPECT_FALSE(metrics_sender_->mock_timer()->IsRunning()); |
- fake_ipc_sender_.VerifyExpectedTimings(); |
+ fake_page_load_metrics_.VerifyExpectedTimings(); |
// Send an updated PageLoadTiming after the timer for the first send request |
// has fired, and verify that a second IPC is sent. |
timing.load_event_start = load_event; |
metrics_sender_->Send(timing); |
ASSERT_TRUE(metrics_sender_->mock_timer()->IsRunning()); |
- fake_ipc_sender_.ExpectPageLoadTiming(timing); |
+ fake_page_load_metrics_.ExpectPageLoadTiming(timing); |
metrics_sender_->mock_timer()->Fire(); |
EXPECT_FALSE(metrics_sender_->mock_timer()->IsRunning()); |
} |
@@ -125,7 +126,7 @@ TEST_F(PageTimingMetricsSenderTest, SendIPCOnDestructor) { |
// destructor. The EXPECT_CALL will be satisfied when the |metrics_sender_| |
// is destroyed below. |
metrics_sender_->Send(timing); |
- fake_ipc_sender_.ExpectPageLoadTiming(timing); |
+ fake_page_load_metrics_.ExpectPageLoadTiming(timing); |
ASSERT_TRUE(metrics_sender_->mock_timer()->IsRunning()); |
// Destroy |metrics_sender_|, in order to force its destructor to run. |