[Fixit Dec-2012] Refactor first_run, very few things should depend on whether the First Run senti...

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 2f63435aa5d4942688c346687fed2073dda3fb14..505bd91bd8937073522197fd00cb64f99fb42331 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -700,11 +700,8 @@ const char kFeedbackServer[]                = "feedback-server";
 const char kFileDescriptorLimit[]           = "file-descriptor-limit";
 
 // Displays the First Run experience when the browser is started, regardless of
-// whether or not it's actually the first run.
-const char kFirstRun[]                      = "first-run";
-
-// Force a profile auto-import that would occur on a first run.
-const char kFirstRunForceImport[]           = "first-run-force-import";
+// whether or not it's actually the First Run (this overrides kNoFirstRun).
+const char kForceFirstRun[]                      = "force-first-run";
 
 // Enables using GAIA information to populate profile name and icon.
 const char kGaiaProfileInfo[]               = "gaia-profile-info";
@@ -884,8 +881,10 @@ const char kNoEvents[]                      = "no-events";
 // then restart chrome without this switch again.
 const char kNoExperiments[]                 = "no-experiments";
 
-// Whether or not it's actually the first run. Overrides kFirstRun in case
-// you're for some reason tempted to pass them both.
+// Skip First Run tasks, whether or not it's actually the First Run. Overridden
+// by kForceFirstRun.
+// Also drops the First Run beacon so that First Run will not occur in
+// subsequent runs as well.
 const char kNoFirstRun[]                    = "no-first-run";
 
 // Support a separate switch that enables the v8 playback extension.