Fixing reporting of AMP page load information

chrome/browser/page_load_metrics/observers/previews_page_load_metrics_observer.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/observers/previews_page_load_metrics_observer.h"
 
 #include "base/optional.h"
 #include "base/time/time.h"
 #include "chrome/browser/page_load_metrics/page_load_metrics_util.h"
 #include "chrome/common/page_load_metrics/page_load_timing.h"
@@ skipping 57 matching lines @@
     return;
   }
   PAGE_LOAD_HISTOGRAM(
       internal::kHistogramOfflinePreviewsDOMContentLoadedEventFired,
       timing.dom_content_loaded_event_start.value());
 }
 
 void PreviewsPageLoadMetricsObserver::OnLoadEventStart(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  if (!WasStartedInForegroundOptionalEventInForeground(
-          timing.dom_content_loaded_event_start, info)) {
+  if (!WasStartedInForegroundOptionalEventInForeground(timing.load_event_start,
+                                                       info)) {
     return;
   }
   PAGE_LOAD_HISTOGRAM(internal::kHistogramOfflinePreviewsLoadEventFired,
                       timing.load_event_start.value());
 }
 
 void PreviewsPageLoadMetricsObserver::OnFirstLayout(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  if (!WasStartedInForegroundOptionalEventInForeground(
-          timing.dom_content_loaded_event_start, info)) {
+  if (!WasStartedInForegroundOptionalEventInForeground(timing.first_layout,
+                                                       info)) {
     return;
   }
   PAGE_LOAD_HISTOGRAM(internal::kHistogramOfflinePreviewsFirstLayout,
                       timing.first_layout.value());
 }
 
 void PreviewsPageLoadMetricsObserver::OnFirstContentfulPaint(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   if (!WasStartedInForegroundOptionalEventInForeground(
-          timing.dom_content_loaded_event_start, info)) {
+          timing.first_contentful_paint, info)) {
     return;
   }
   PAGE_LOAD_HISTOGRAM(internal::kHistogramOfflinePreviewsFirstContentfulPaint,
                       timing.first_contentful_paint.value());
 }
 
 void PreviewsPageLoadMetricsObserver::OnParseStart(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  if (!WasStartedInForegroundOptionalEventInForeground(
-          timing.dom_content_loaded_event_start, info)) {
+  if (!WasStartedInForegroundOptionalEventInForeground(timing.parse_start,
+                                                       info)) {
     return;
   }
   PAGE_LOAD_HISTOGRAM(internal::kHistogramOfflinePreviewsParseStart,
                       timing.parse_start.value());
 }
 
 bool PreviewsPageLoadMetricsObserver::IsOfflinePreview(
     content::WebContents* web_contents) const {
 #if defined(OS_ANDROID)
   offline_pages::OfflinePageTabHelper* tab_helper =
       offline_pages::OfflinePageTabHelper::FromWebContents(web_contents);
   return tab_helper && tab_helper->IsShowingOfflinePreview();
 #else
   return false;
 #endif  // defined(OS_ANDROID)
 }
 
 }  // namespace previews