Add FMP to DataReductionProxy UMA and to Pingback Metrics

components/data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client_unittest.cc

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 173828d8d40240ddd96f15a30862723c954d7f9e..4c6f3395a94b8ed6db34a6859eec46c07cb6b3bb 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
@@ -87,20 +87,22 @@ class DataReductionProxyPingbackClientTest : public testing::Test {
             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(
+                2000)) /* experimental_first_meaningful_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_ =
@@ -160,20 +162,24 @@ 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().experimental_first_meaningful_paint.value(),
+      protobuf_parser::DurationToTimeDelta(
+          pageload_metrics.experimental_time_to_first_meaningful_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,
@@ -225,20 +231,24 @@ 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().experimental_first_meaningful_paint.value(),
+        protobuf_parser::DurationToTimeDelta(
+            pageload_metrics.experimental_time_to_first_meaningful_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,