Some first_run code cleanups (extracted from https://codereview.chromium.org/12670013 to keep that …

chrome/browser/chrome_browser_main.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/chrome_browser_main.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 885 matching lines @@
         // when this value will be updated.
         local_state_->SetInt64(prefs::kVariationsSeedDate,
                                base::Time::Now().ToInternalValue());
       }
 
       if (!master_prefs_->suppress_default_browser_prompt_for_version.empty()) {
         local_state_->SetString(
             prefs::kBrowserSuppressDefaultBrowserPrompt,
             master_prefs_->suppress_default_browser_prompt_for_version);
       }
-    } else if (parsed_command_line().HasSwitch(switches::kNoFirstRun)) {
-      // Create the First Run beacon anyways if --no-first-run was passed on the
-      // command line.
+    }
+
+    if (do_first_run_tasks_ ||
+        parsed_command_line().HasSwitch(switches::kNoFirstRun)) {
+      // Create the First Run sentinel whether first run tasks are executed
+      // or not.
       first_run::CreateSentinel();
     }
   }
 #endif
 
   // TODO(viettrungluu): why don't we run this earlier?
   if (!parsed_command_line().HasSwitch(switches::kNoErrorDialogs))
     WarnAboutMinimumSystemRequirements();
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
@@ skipping 827 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead_";
     uma_name += pre_read_percentage;
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }