Record first run startup metrics.

Also fixing first run code to only call startup_metric_utils::SetNonBrowserUIDisplayed() if the dialog is actually displayed (which it isn't in many situations).

NOTRY=True (patchset 6 already passed all the try bots, simply updating a string in patchset 7)
BUG=237933, 219419

Review URL: https://chromiumcodereview.appspot.com/14946003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198707 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 45814a5..829d730 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1625,7 +1625,7 @@ bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // These should be invoked as close to the start of the browser's
   // UI thread message loop as possible to get a stable measurement
   // across versions.
-  RecordBrowserStartupTime();
+  RecordBrowserStartupTime(do_first_run_tasks_);
   startup_timer_->SignalStartupComplete(
       performance_monitor::StartupTimer::STARTUP_NORMAL);
 
@@ -1746,7 +1746,7 @@ void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
 
 // Misc ------------------------------------------------------------------------
 
-void RecordBrowserStartupTime() {
+void RecordBrowserStartupTime(bool is_first_run) {
   // Don't record any metrics if UI was displayed before this point e.g.
   // warning dialogs.
   if (startup_metric_utils::WasNonBrowserUIDisplayed())
@@ -1758,13 +1758,14 @@ void RecordBrowserStartupTime() {
   const base::Time* process_creation_time =
       base::CurrentProcessInfo::CreationTime();
 
-  if (process_creation_time)
+  if (!is_first_run && process_creation_time) {
     RecordPreReadExperimentTime("Startup.BrowserMessageLoopStartTime",
         base::Time::Now() - *process_creation_time);
+  }
 #endif  // defined(OS_MACOSX) || defined(OS_WIN)
 
   // Record collected startup metrics.
-  startup_metric_utils::OnBrowserStartupComplete();
+  startup_metric_utils::OnBrowserStartupComplete(is_first_run);
 
   // Deletes self.
   new LoadCompleteListener();