Adding ExtraRequest info and exposing request to PLM observers

chrome/browser/page_load_metrics/page_load_tracker.cc

Index: chrome/browser/page_load_metrics/page_load_tracker.cc
diff --git a/chrome/browser/page_load_metrics/page_load_tracker.cc b/chrome/browser/page_load_metrics/page_load_tracker.cc
index 55a2dbf4868137759defe1043f6224c037049ae1..c96fb434f711fc5305f7d6a182e8efbcc0c0d7f6 100644
--- a/chrome/browser/page_load_metrics/page_load_tracker.cc
+++ b/chrome/browser/page_load_metrics/page_load_tracker.cc
@@ -298,10 +298,6 @@ PageLoadTracker::PageLoadTracker(
       abort_user_initiated_info_(UserInitiatedInfo::NotUserInitiated()),
       started_in_foreground_(in_foreground),
       page_transition_(navigation_handle->GetPageTransition()),
-      num_cache_requests_(0),
-      num_network_requests_(0),
-      cache_bytes_(0),
-      network_bytes_(0),
       user_initiated_info_(user_initiated_info),
       aborted_chain_size_(aborted_chain_size),
       aborted_chain_size_same_url_(aborted_chain_size_same_url),
@@ -522,14 +518,10 @@ bool PageLoadTracker::UpdateTiming(const PageLoadTiming& new_timing,
   return false;
 }
 
-void PageLoadTracker::OnLoadedResource(bool was_cached,
-                                       int64_t raw_body_bytes) {
-  if (was_cached) {
-    ++num_cache_requests_;
-    cache_bytes_ += raw_body_bytes;
-  } else {
-    ++num_network_requests_;
-    network_bytes_ += raw_body_bytes;
+void PageLoadTracker::OnLoadedResource(
+    const ExtraRequestInfo& extra_request_info) {
+  for (const auto& observer : observers_) {
+    observer->OnLoadedResource(extra_request_info);
   }
 }
 
@@ -601,8 +593,7 @@ PageLoadExtraInfo PageLoadTracker::ComputePageLoadExtraInfo() {
   return PageLoadExtraInfo(
       first_background_time, first_foreground_time, started_in_foreground_,
       user_initiated_info_, committed_url_, start_url_, abort_type_,
-      abort_user_initiated_info_, time_to_abort, num_cache_requests_,
-      num_network_requests_, cache_bytes_, network_bytes_, metadata_);
+      abort_user_initiated_info_, time_to_abort, metadata_);
 }
 
 void PageLoadTracker::NotifyAbort(UserAbortType abort_type,