Do not record startup metrics when non-browser UI was displayed

chrome/browser/metrics/first_web_contents_profiler.cc

Index: chrome/browser/metrics/first_web_contents_profiler.cc
diff --git a/chrome/browser/metrics/first_web_contents_profiler.cc b/chrome/browser/metrics/first_web_contents_profiler.cc
index 25a6b2a1f8fad0666a3309e068eecc9818089ac3..ec2a95e4e46aea2840c2d345b9fd33c901061885 100644
--- a/chrome/browser/metrics/first_web_contents_profiler.cc
+++ b/chrome/browser/metrics/first_web_contents_profiler.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "components/metrics/profiler/tracking_synchronizer.h"
 #include "components/metrics/proto/profiler_event.pb.h"
+#include "components/startup_metric_utils/startup_metric_utils.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
@@ -124,7 +125,8 @@ FirstWebContentsProfiler::FirstWebContentsProfiler(
 }
 
 void FirstWebContentsProfiler::DidFirstVisuallyNonEmptyPaint() {
-  if (collected_paint_metric_)
+  if (collected_paint_metric_ ||
+      startup_metric_utils::WasNonBrowserUIDisplayed())
     return;

[gab, 2015/06/09 15:52:28]

nit: Add {} when either conditional or body spans more than one line (here and
everywhere else this occurs).

 
   collected_paint_metric_ = true;
@@ -163,7 +165,8 @@ void FirstWebContentsProfiler::DidFirstVisuallyNonEmptyPaint() {
 }
 
 void FirstWebContentsProfiler::DocumentOnLoadCompletedInMainFrame() {
-  if (collected_load_metric_)
+  if (collected_paint_metric_ ||
+      startup_metric_utils::WasNonBrowserUIDisplayed())
     return;
 
   collected_load_metric_ = true;