Index: chrome/renderer/page_load_metrics/metrics_render_frame_observer_unittest.cc |
diff --git a/chrome/renderer/page_load_metrics/metrics_render_frame_observer_unittest.cc b/chrome/renderer/page_load_metrics/metrics_render_frame_observer_unittest.cc |
index 90f0859832a3c1bd7155348bdc4b4a8a52c4ed76..5ad379d051e1237005e939f827479eda387f7b29 100644 |
--- a/chrome/renderer/page_load_metrics/metrics_render_frame_observer_unittest.cc |
+++ b/chrome/renderer/page_load_metrics/metrics_render_frame_observer_unittest.cc |
@@ -11,7 +11,7 @@ |
#include "base/time/time.h" |
#include "base/timer/mock_timer.h" |
#include "chrome/common/page_load_metrics/page_load_timing.h" |
-#include "chrome/renderer/page_load_metrics/fake_page_timing_sender.h" |
+#include "chrome/renderer/page_load_metrics/fake_page_timing_metrics_ipc_sender.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace page_load_metrics { |
@@ -29,9 +29,11 @@ |
return std::move(mock_timer_); |
} |
- std::unique_ptr<PageTimingSender> CreatePageTimingSender() override { |
- return base::WrapUnique<PageTimingSender>( |
- new FakePageTimingSender(&validator_)); |
+ // We intercept sent messages and dispatch them to our |
+ // FakePageTimingMetricsIPCSender, which we use to verify that the expected |
+ // IPC messages get sent. |
+ bool Send(IPC::Message* message) override { |
+ return fake_timing_ipc_sender_.Send(message); |
} |
void set_mock_timer(std::unique_ptr<base::Timer> timer) { |
@@ -41,7 +43,7 @@ |
void ExpectPageLoadTiming(const mojom::PageLoadTiming& timing) { |
SetFakePageLoadTiming(timing); |
- validator_.ExpectPageLoadTiming(timing); |
+ fake_timing_ipc_sender_.ExpectPageLoadTiming(timing); |
} |
void SetFakePageLoadTiming(const mojom::PageLoadTiming& timing) { |
@@ -56,14 +58,14 @@ |
void VerifyExpectedTimings() const { |
EXPECT_EQ(nullptr, fake_timing_.get()); |
- validator_.VerifyExpectedTimings(); |
+ fake_timing_ipc_sender_.VerifyExpectedTimings(); |
} |
bool ShouldSendMetrics() const override { return true; } |
bool HasNoRenderFrame() const override { return false; } |
private: |
- FakePageTimingSender::PageTimingValidator validator_; |
+ FakePageTimingMetricsIPCSender fake_timing_ipc_sender_; |
mutable mojom::PageLoadTimingPtr fake_timing_; |
mutable std::unique_ptr<base::Timer> mock_timer_; |
}; |