| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client_unittest.cc
|
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client_unittest.cc
|
| index 27623ac2d658f398b2d6901ac304684b2d74430a..21313e32fe9af452a1314e5e3187c2b69cf4fa57 100644
|
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client_unittest.cc
|
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client_unittest.cc
|
| @@ -76,29 +76,34 @@ class TestDataReductionProxyPingbackClient
|
| base::Time CurrentTime() const override { return current_time_; }
|
|
|
| bool should_override_random_;
|
| float override_value_;
|
| base::Time current_time_;
|
| };
|
|
|
| class DataReductionProxyPingbackClientTest : public testing::Test {
|
| public:
|
| DataReductionProxyPingbackClientTest()
|
| - : timing_(base::Time::FromJsTime(1500),
|
| - base::Optional<base::TimeDelta>(
|
| - base::TimeDelta::FromMilliseconds(1600)),
|
| - base::Optional<base::TimeDelta>(
|
| - base::TimeDelta::FromMilliseconds(1700)),
|
| - base::Optional<base::TimeDelta>(
|
| - base::TimeDelta::FromMilliseconds(1800)),
|
| - base::Optional<base::TimeDelta>(
|
| - base::TimeDelta::FromMilliseconds(1900))) {}
|
| + : timing_(
|
| + base::Time::FromJsTime(1500) /* navigation_start */,
|
| + base::Optional<base::TimeDelta>(
|
| + base::TimeDelta::FromMilliseconds(1600)) /* response_start */,
|
| + base::Optional<base::TimeDelta>(
|
| + base::TimeDelta::FromMilliseconds(1700)) /* load_event_start */,
|
| + base::Optional<base::TimeDelta>(base::TimeDelta::FromMilliseconds(
|
| + 1800)) /* first_image_paint */,
|
| + base::Optional<base::TimeDelta>(base::TimeDelta::FromMilliseconds(
|
| + 1900)) /* first_contentful_paint */,
|
| + base::Optional<base::TimeDelta>(base::TimeDelta::FromMilliseconds(
|
| + 100)) /* parse_blocked_on_script_load_duration */,
|
| + base::Optional<base::TimeDelta>(
|
| + base::TimeDelta::FromMilliseconds(2000)) /* parse_stop */) {}
|
|
|
| TestDataReductionProxyPingbackClient* pingback_client() const {
|
| return pingback_client_.get();
|
| }
|
|
|
| void Init() {
|
| request_context_getter_ =
|
| new net::TestURLRequestContextGetter(message_loop_.task_runner());
|
| pingback_client_ = base::WrapUnique<TestDataReductionProxyPingbackClient>(
|
| new TestDataReductionProxyPingbackClient(
|
| @@ -155,20 +160,25 @@ TEST_F(DataReductionProxyPingbackClientTest, VerifyPingbackContent) {
|
| pageload_metrics.time_to_first_byte()));
|
| EXPECT_EQ(
|
| timing().load_event_start.value(),
|
| protobuf_parser::DurationToTimeDelta(pageload_metrics.page_load_time()));
|
| EXPECT_EQ(timing().first_image_paint.value(),
|
| protobuf_parser::DurationToTimeDelta(
|
| pageload_metrics.time_to_first_image_paint()));
|
| EXPECT_EQ(timing().first_contentful_paint.value(),
|
| protobuf_parser::DurationToTimeDelta(
|
| pageload_metrics.time_to_first_contentful_paint()));
|
| + EXPECT_EQ(timing().parse_blocked_on_script_load_duration.value(),
|
| + protobuf_parser::DurationToTimeDelta(
|
| + pageload_metrics.parse_blocked_on_script_load_duration()));
|
| + EXPECT_EQ(timing().parse_stop.value(), protobuf_parser::DurationToTimeDelta(
|
| + pageload_metrics.parse_stop()));
|
|
|
| EXPECT_EQ(kSessionKey, pageload_metrics.session_key());
|
| EXPECT_EQ(kFakeURL, pageload_metrics.first_request_url());
|
| EXPECT_EQ(
|
| PageloadMetrics_EffectiveConnectionType_EFFECTIVE_CONNECTION_TYPE_OFFLINE,
|
| pageload_metrics.effective_connection_type());
|
| test_fetcher->delegate()->OnURLFetchComplete(test_fetcher);
|
| histogram_tester().ExpectUniqueSample(kHistogramSucceeded, true, 1);
|
| EXPECT_FALSE(factory()->GetFetcherByID(0));
|
| }
|
| @@ -215,20 +225,25 @@ TEST_F(DataReductionProxyPingbackClientTest, VerifyTwoPingbacksBatchedContent) {
|
| pageload_metrics.time_to_first_byte()));
|
| EXPECT_EQ(timing().load_event_start.value(),
|
| protobuf_parser::DurationToTimeDelta(
|
| pageload_metrics.page_load_time()));
|
| EXPECT_EQ(timing().first_image_paint.value(),
|
| protobuf_parser::DurationToTimeDelta(
|
| pageload_metrics.time_to_first_image_paint()));
|
| EXPECT_EQ(timing().first_contentful_paint.value(),
|
| protobuf_parser::DurationToTimeDelta(
|
| pageload_metrics.time_to_first_contentful_paint()));
|
| + EXPECT_EQ(timing().parse_blocked_on_script_load_duration.value(),
|
| + protobuf_parser::DurationToTimeDelta(
|
| + pageload_metrics.parse_blocked_on_script_load_duration()));
|
| + EXPECT_EQ(timing().parse_stop.value(), protobuf_parser::DurationToTimeDelta(
|
| + pageload_metrics.parse_stop()));
|
|
|
| EXPECT_EQ(kSessionKey, pageload_metrics.session_key());
|
| EXPECT_EQ(kFakeURL, pageload_metrics.first_request_url());
|
| EXPECT_EQ(
|
| PageloadMetrics_EffectiveConnectionType_EFFECTIVE_CONNECTION_TYPE_OFFLINE,
|
| pageload_metrics.effective_connection_type());
|
| }
|
|
|
| test_fetcher->delegate()->OnURLFetchComplete(test_fetcher);
|
| histogram_tester().ExpectUniqueSample(kHistogramSucceeded, true, 2);
|
|
|