Update FromGoogleSearch page load metrics to log immediately

chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h

Index: chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
index e2f5c9117d3090bdfde1b48ea02431f5eca41646..14765e2b86d321c86ba8957f52010fa1cac64136 100644
--- a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
@@ -11,7 +11,15 @@
 
 namespace internal {
 // Exposed for tests.
+extern const char kHistogramFromGWSDomContentLoaded[];
+extern const char kHistogramFromGWSLoad[];
+extern const char kHistogramFromGWSFirstPaint[];
 extern const char kHistogramFromGWSFirstTextPaint[];
+extern const char kHistogramFromGWSFirstImagePaint[];
+extern const char kHistogramFromGWSFirstContentfulPaint[];
+extern const char kHistogramFromGWSParseStartToFirstContentfulPaint[];
+extern const char kHistogramFromGWSParseDuration[];
+extern const char kHistogramFromGWSParseStart[];
 extern const char kHistogramFromGWSAbortStopBeforePaint[];
 extern const char kHistogramFromGWSAbortStopBeforeCommit[];
 extern const char kHistogramFromGWSAbortCloseBeforePaint[];
@@ -43,11 +51,34 @@ class FromGWSPageLoadMetricsLogger {
   void OnComplete(const page_load_metrics::PageLoadTiming& timing,
                   const page_load_metrics::PageLoadExtraInfo& extra_info);
 
+  void OnDomContentLoadedEventStart(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& extra_info);
+  void OnLoadEventStart(const page_load_metrics::PageLoadTiming& timing,
+                        const page_load_metrics::PageLoadExtraInfo& extra_info);
+  void OnFirstPaint(const page_load_metrics::PageLoadTiming& timing,
+                    const page_load_metrics::PageLoadExtraInfo& extra_info);
+  void OnFirstTextPaint(const page_load_metrics::PageLoadTiming& timing,
+                        const page_load_metrics::PageLoadExtraInfo& extra_info);
+  void OnFirstImagePaint(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& extra_info);
+  void OnFirstContentfulPaint(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& extra_info);
+  void OnParseStart(const page_load_metrics::PageLoadTiming& timing,
+                    const page_load_metrics::PageLoadExtraInfo& extra_info);
+  void OnParseStop(const page_load_metrics::PageLoadTiming& timing,
+                   const page_load_metrics::PageLoadExtraInfo& extra_info);
+
   // The methods below are public only for testing.
   static bool IsGoogleSearchHostname(base::StringPiece host);
   static bool IsGoogleSearchResultUrl(const GURL& url);
   static bool IsGoogleSearchRedirectorUrl(const GURL& url);
   bool ShouldLogMetrics(const GURL& url);
+  bool ShouldLogForegroundEventAfterCommit(
+      base::TimeDelta event,
+      const page_load_metrics::PageLoadExtraInfo& info);
 
   // Whether the given query string contains the given component. The query
   // parameter should contain the query string of a URL (the portion following
@@ -71,20 +102,11 @@ class FromGWSPageLoadMetricsLogger {
   bool provisional_url_has_search_hostname_ = false;
   bool provisional_url_is_non_http_or_https_ = false;
 
-  static bool IsUrlFromGWS(const GURL& url);
-
   // Common helper for QueryContainsComponent and QueryContainsComponentPrefix.
   static bool QueryContainsComponentHelper(const base::StringPiece query,
                                            const base::StringPiece component,
                                            bool component_is_prefix);
 
-  void LogCommittedMetrics(
-      const page_load_metrics::PageLoadTiming& timing,
-      const page_load_metrics::PageLoadExtraInfo& extra_info);
-  void LogProvisionalMetrics(
-      const page_load_metrics::PageLoadTiming& timing,
-      const page_load_metrics::PageLoadExtraInfo& extra_info);
-
   DISALLOW_COPY_AND_ASSIGN(FromGWSPageLoadMetricsLogger);
 };
 
@@ -96,6 +118,32 @@ class FromGWSPageLoadMetricsObserver
   void OnStart(content::NavigationHandle* navigation_handle,
                const GURL& currently_committed_url) override;
   void OnCommit(content::NavigationHandle* navigation_handle) override;
+
+  void OnDomContentLoadedEventStart(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& extra_info) override;
+  void OnLoadEventStart(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& extra_info) override;
+  void OnFirstPaint(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& extra_info) override;
+  void OnFirstTextPaint(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& extra_info) override;
+  void OnFirstImagePaint(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& extra_info) override;
+  void OnFirstContentfulPaint(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& extra_info) override;
+  void OnParseStart(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& extra_info) override;
+  void OnParseStop(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& extra_info) override;
+
   void OnComplete(
       const page_load_metrics::PageLoadTiming& timing,
       const page_load_metrics::PageLoadExtraInfo& extra_info) override;