Adding ExtraRequest info and exposing request to PLM observers

chrome/browser/page_load_metrics/page_load_metrics_observer.cc

Index: chrome/browser/page_load_metrics/page_load_metrics_observer.cc
diff --git a/chrome/browser/page_load_metrics/page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/page_load_metrics_observer.cc
index 0135bc688f910a8e842ba816dc971487659d57e0..a27936877739c38686a1e84fe71353e113be172d 100644
--- a/chrome/browser/page_load_metrics/page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_observer.cc
@@ -16,10 +16,6 @@ PageLoadExtraInfo::PageLoadExtraInfo(
     UserAbortType abort_type,
     UserInitiatedInfo abort_user_initiated_info,
     const base::Optional<base::TimeDelta>& time_to_abort,
-    int num_cache_requests,
-    int num_network_requests,
-    int64_t cache_bytes,
-    int64_t network_bytes,
     const PageLoadMetadata& metadata)
     : first_background_time(first_background_time),
       first_foreground_time(first_foreground_time),
@@ -30,16 +26,25 @@ PageLoadExtraInfo::PageLoadExtraInfo(
       abort_type(abort_type),
       abort_user_initiated_info(abort_user_initiated_info),
       time_to_abort(time_to_abort),
-      num_cache_requests(num_cache_requests),
-      num_network_requests(num_network_requests),
-      cache_bytes(cache_bytes),
-      network_bytes(network_bytes),
       metadata(metadata) {}
 
 PageLoadExtraInfo::PageLoadExtraInfo(const PageLoadExtraInfo& other) = default;
 
 PageLoadExtraInfo::~PageLoadExtraInfo() {}
 
+ExtraRequestInfo::ExtraRequestInfo(bool was_cached,
+                                   int64_t raw_body_bytes,
+                                   bool data_reduction_proxy_used,
+                                   int64_t original_network_content_length)
+    : was_cached(was_cached),
+      raw_body_bytes(raw_body_bytes),
+      data_reduction_proxy_used(data_reduction_proxy_used),
+      original_network_content_length(original_network_content_length) {}
+
+ExtraRequestInfo::ExtraRequestInfo(const ExtraRequestInfo& other) = default;
+
+ExtraRequestInfo::~ExtraRequestInfo() {}
+
 FailedProvisionalLoadInfo::FailedProvisionalLoadInfo(base::TimeDelta interval,
                                                      net::Error error)
     : time_to_failed_provisional_load(interval), error(error) {}