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

chrome/browser/metrics/first_web_contents_profiler.cc

 // 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.
 
 #if !defined(OS_ANDROID)
 
+#include <string>
+
 #include "chrome/browser/metrics/first_web_contents_profiler.h"

[gab, 2015/06/16 19:55:34]

Keep this include first, then C/C++ includes, then other Chrome includes

 
 #include "base/location.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/process/process_info.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #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 {
 // The initial delay for responsiveness prober in milliseconds.
 const int kInitialDelayMs = 20;
 
 // The following is the multiplier is used to delay the probe for
 // responsiveness.
 const double kBackoffMultiplier = 1.5;
 
@@ skipping 91 matching lines @@
       unresponsiveness_histogram_(NULL),
       unresponsiveness_1sec_histogram_(NULL),
       unresponsiveness_10sec_histogram_(NULL) {
   process_creation_time_ = base::CurrentProcessInfo::CreationTime();
   InitHistograms();
 }
 
 void FirstWebContentsProfiler::DidFirstVisuallyNonEmptyPaint() {
   if (collected_paint_metric_)
     return;
+  if (startup_metric_utils::WasNonBrowserUIDisplayed()) {
+    FinishedCollectingMetrics();
+    return;
+  }
 
   collected_paint_metric_ = true;
   if (!process_creation_time_.is_null()) {
     base::TimeDelta elapsed = base::Time::Now() - process_creation_time_;
 
     UMA_HISTOGRAM_LONG_TIMES_100("Startup.FirstWebContents.NonEmptyPaint",
                                  elapsed);
   }
 
   metrics::TrackingSynchronizer::OnProfilingPhaseCompleted(
@@ skipping 19 matching lines @@
                  unresponsiveness_10sec_histogram_),
       base::TimeDelta::FromSeconds(10));
 
   if (IsFinishedCollectingMetrics())
     FinishedCollectingMetrics();
 }
 
 void FirstWebContentsProfiler::DocumentOnLoadCompletedInMainFrame() {
   if (collected_load_metric_)
     return;
+  if (startup_metric_utils::WasNonBrowserUIDisplayed()) {
+    FinishedCollectingMetrics();
+    return;
+  }
 
   collected_load_metric_ = true;
   if (!process_creation_time_.is_null()) {
     base::TimeDelta elapsed = base::Time::Now() - process_creation_time_;
 
     UMA_HISTOGRAM_LONG_TIMES_100("Startup.FirstWebContents.MainFrameLoad",
                                  elapsed);
   }
 
   if (IsFinishedCollectingMetrics())
@@ skipping 49 matching lines @@
       100, base::Histogram::kUmaTargetedHistogramFlag);
 
   const std::string unresponsiveness_10sec_histogram_name =
       "Startup.FirstWebContents.UINotResponsive_10sec";
   unresponsiveness_10sec_histogram_ = base::Histogram::FactoryTimeGet(
       unresponsiveness_10sec_histogram_name,
       base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromSeconds(60),
       100, base::Histogram::kUmaTargetedHistogramFlag);
 }
 #endif  // !defined(OS_ANDROID)