Record first run startup metrics.

chrome/browser/first_run/first_run.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/first_run/first_run.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 724 matching lines @@
       ShellIntegration::CanSetAsDefaultBrowser() ==
           ShellIntegration::SET_DEFAULT_UNATTENDED) {
     ShellIntegration::SetAsDefaultBrowser();
   }
 
   base::FilePath local_state_path;
   PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
   bool local_state_file_exists = file_util::PathExists(local_state_path);
 
   // Launch the first run dialog only for certain builds, and only if the user
-  // has not already set preferences.
-  if (internal::IsOrganicFirstRun() && !local_state_file_exists) {
+  // has not already set preferences. If the dialog is shown, set state to avoid
+  // recording erroneous startup metrics.

[jeremy, 2013/05/05 12:35:56]

I don't think you need to update the comment - the original if wasn't clear but
the function call is self documenting IMHO.

[gab, 2013/05/06 16:19:54]

Done.

+  if (internal::IsOrganicFirstRun() && !local_state_file_exists &&
+      ShowFirstRunDialog(profile)) {

[jeremy, 2013/05/05 12:35:56]

Please phrase as a nested if rather than compound logic with side effects.

[gab, 2013/05/06 16:19:54]

Done.

     startup_metric_utils::SetNonBrowserUIDisplayed();
-    ShowFirstRunDialog(profile);
   }
   // Display the first run bubble if there is a default search provider.
   TemplateURLService* template_url =
       TemplateURLServiceFactory::GetForProfile(profile);
   if (template_url && template_url->GetDefaultSearchProvider())
     FirstRunBubbleLauncher::ShowFirstRunBubbleSoon();
   SetShouldShowWelcomePage();
   SetShouldDoPersonalDataManagerFirstRun();
 
   internal::DoPostImportPlatformSpecificTasks();
 }
 
 bool DidPerformProfileImport(bool* exited_successfully) {
   if (exited_successfully)
     *exited_successfully = profile_import_exited_successfully;
   return did_perform_profile_import;
 }
 
 }  // namespace first_run