Add start/finish navigation to startup metrics.

chrome/browser/metrics/first_web_contents_profiler.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_METRICS_FIRST_WEB_CONTENTS_PROFILER_H_
 #define CHROME_BROWSER_METRICS_FIRST_WEB_CONTENTS_PROFILER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "content/public/browser/web_contents_observer.h"
@@ skipping 28 matching lines @@
   enum FinishReason {
     // All metrics were successfully gathered.
     DONE = 0,
     // Abandon if blocking UI was shown during startup.
     ABANDON_BLOCKING_UI = 1,
     // Abandon if the content is hidden (lowers scheduling priority).
     ABANDON_CONTENT_HIDDEN = 2,
     // Abandon if the content is destroyed.
     ABANDON_CONTENT_DESTROYED = 3,
     // Abandon if the WebContents navigates away from its initial page.
-    ABANDON_NAVIGATION = 4,
+    ABANDON_NEW_NAVIGATION = 4,
+    // Abandon if the WebContents fails to load (e.g. network error, etc.).
+    ABANDON_NAVIGATION_ERROR = 5,
     ENUM_MAX
   };
 
   FirstWebContentsProfiler(content::WebContents* web_contents,
                            Delegate* delegate);
 
   // content::WebContentsObserver:
   void DidFirstVisuallyNonEmptyPaint() override;
   void DocumentOnLoadCompletedInMainFrame() override;
-  void NavigationEntryCommitted(
-      const content::LoadCommittedDetails& load_details) override;
+  void DidStartNavigation(
+      content::NavigationHandle* navigation_handle) override;
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override;
   void WasHidden() override;
   void WebContentsDestroyed() override;
 
-  // Whether this instance has finished collecting all of its metrics.
+  // Whether this instance has finished collecting first-paint and main-frame-
+  // load metrics (navigation metrics are recorded on a best effort but don't
+  // prevent the FirstWebContentsProfiler from calling it).
   bool IsFinishedCollectingMetrics();
 
   // Informs the delegate that this instance has finished collecting all of its
   // metrics. Logs |finish_reason| to UMA.
   void FinishedCollectingMetrics(FinishReason finish_reason);
 
   // Initialize histograms for unresponsiveness metrics.
   void InitHistograms();
 
-  // Becomes true on the first invocation of NavigationEntryCommitted() for the
-  // main frame. Any follow-up navigation to a different page will result in
-  // aborting first WebContents profiling.
-  bool initial_entry_committed_;
-
   // Whether an attempt was made to collect the "NonEmptyPaint" metric.
   bool collected_paint_metric_;
 
   // Whether an attempt was made to collect the "MainFrameLoad" metric.
   bool collected_load_metric_;
 
+  // Whether an attempt was made to collect the "MainNavigationStart" metric.
+  bool collected_main_navigation_start_metric_;
+
+  // Whether an attempt was made to collect the "MainNavigationFinished" metric.
+  bool collected_main_navigation_finished_metric_;
+
   // |delegate_| owns |this|.
   Delegate* delegate_;
 
   // Histogram that keeps track of response times for the watched thread.
   base::HistogramBase* responsiveness_histogram_;
 
   // Histogram that keeps track of response times for the watched thread.
   base::HistogramBase* responsiveness_1sec_histogram_;
 
   // Histogram that keeps track of response times for the watched thread.
   base::HistogramBase* responsiveness_10sec_histogram_;
 
   // Histogram that keeps track of response times for the watched thread.
   base::HistogramBase* unresponsiveness_histogram_;
 
   // Histogram that keeps track of response times for the watched thread.
   base::HistogramBase* unresponsiveness_1sec_histogram_;
 
   // Histogram that keeps track of response times for the watched thread.
   base::HistogramBase* unresponsiveness_10sec_histogram_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstWebContentsProfiler);
 };
 
 #endif  // CHROME_BROWSER_METRICS_FIRST_WEB_CONTENTS_PROFILER_H_