Make PageLoadMetricsWaiter more resilient

chrome/browser/page_load_metrics/page_load_tracker.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/page_load_metrics/page_load_tracker.h"
 
 #include <algorithm>
 #include <ostream>
 #include <string>
 #include <utility>
@@ skipping 99 matching lines @@
   UMA_HISTOGRAM_BOOLEAN(internal::kPageLoadCompletedAfterAppBackground,
                         completed_after_background);
 }
 
 void DispatchObserverTimingCallbacks(
     PageLoadMetricsObserver* observer,
     const mojom::PageLoadTiming& last_timing,
     const mojom::PageLoadTiming& new_timing,
     const PageLoadExtraInfo& extra_info) {
   if (!last_timing.Equals(new_timing))
-    observer->OnTimingUpdate(new_timing, extra_info);
+    observer->OnTimingUpdate(false /* is_subframe */, new_timing, extra_info);
   if (new_timing.document_timing->dom_content_loaded_event_start &&
       !last_timing.document_timing->dom_content_loaded_event_start)
     observer->OnDomContentLoadedEventStart(new_timing, extra_info);
   if (new_timing.document_timing->load_event_start &&
       !last_timing.document_timing->load_event_start)
     observer->OnLoadEventStart(new_timing, extra_info);
   if (new_timing.document_timing->first_layout &&
       !last_timing.document_timing->first_layout)
     observer->OnFirstLayout(new_timing, extra_info);
   if (new_timing.paint_timing->first_paint &&
@@ skipping 465 matching lines @@
   PageLoadExtraInfo extra_info(ComputePageLoadExtraInfo());
   for (const auto& observer : observers_) {
     DispatchObserverTimingCallbacks(
         observer.get(), *last_dispatched_merged_page_timing_,
         metrics_update_dispatcher_.timing(), extra_info);
   }
   last_dispatched_merged_page_timing_ =
       metrics_update_dispatcher_.timing().Clone();
 }
 
+void PageLoadTracker::OnSubFrameTimingChanged(
+    const mojom::PageLoadTiming& timing) {
+  PageLoadExtraInfo extra_info(ComputePageLoadExtraInfo());
+  for (const auto& observer : observers_) {
+    observer->OnTimingUpdate(true /* is_subframe*/, timing, extra_info);
+  }
+}
+
 void PageLoadTracker::OnMainFrameMetadataChanged() {
   PageLoadExtraInfo extra_info(ComputePageLoadExtraInfo());
   for (const auto& observer : observers_) {
     observer->OnLoadingBehaviorObserved(extra_info);
   }
 }
 
 void PageLoadTracker::OnSubframeMetadataChanged() {
   PageLoadExtraInfo extra_info(ComputePageLoadExtraInfo());
   for (const auto& observer : observers_) {
     observer->OnLoadingBehaviorObserved(extra_info);
   }
 }
 
 }  // namespace page_load_metrics