Pulling user experiment code from BrowserDistribution to a new class.

chrome/installer/setup/setup_main.cc

Index: chrome/installer/setup/setup_main.cc
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 073d4423e19526182a45c3c3ef53e3e210b09069..0cf8f84389044d26883a7e05611ecbaa36f958b7 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -60,6 +60,7 @@
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/self_cleaning_temp_dir.h"
 #include "chrome/installer/util/shell_util.h"
+#include "chrome/installer/util/user_experiment.h"
 #include "chrome/installer/util/util_constants.h"
 
 #include "installer_util_strings.h"  // NOLINT
@@ -923,8 +924,8 @@ installer::InstallStatus InstallProductsHelper(
       for (Products::const_iterator it = products.begin(); it < products.end();
            ++it) {
         const Product& product = **it;
-        product.distribution()->LaunchUserExperiment(setup_path,
-            install_status, *installer_version, product, system_install);
+        product.LaunchUserExperiment(setup_path, install_status,
+                                     system_install);
       }
     }
   }
@@ -1428,8 +1429,7 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state,
       for (Products::const_iterator it = products.begin(); it < products.end();
            ++it) {
         const Product& product = **it;
-        BrowserDistribution* browser_dist = product.distribution();
-        browser_dist->InactiveUserToastExperiment(
+        installer::InactiveUserToastExperiment(

[gab, 2013/03/21 14:53:28]

This will now be called for all products (it used to only be via the
GoogleChromeDistribution)... why doesn't this go through |product| like
LaunchUserExperiment()?

[grt (UTC plus 2), 2013/03/21 17:23:49]

This will only be called for products that had gone through
product.LaunchUserExperiment (which relaunch setup.exe with
--inactive-user-toast), so there's no real need to do it again.

[gab, 2013/03/21 19:59:07]

Ah I see, the code review tool was hiding the lines above so I didn't realize
this was inside that flag... perhaps add a comment above this line to make sure
no one else is further puzzled by this?

[huangs, 2013/03/26 22:00:24]

Added comments (in new CL).

             flavor, ASCIIToUTF16(experiment_group), product,
             installer_state->target_path());
       }
@@ -1449,9 +1449,8 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state,
                    << browser_dist->GetAppShortCutName()
                    << " found for system-level toast.";
       } else {
-        browser_dist->LaunchUserExperiment(cmd_line.GetProgram(),
-                                           installer::REENTRY_SYS_UPDATE,
-                                           installed_version, product, true);
+        product.LaunchUserExperiment(
+            cmd_line.GetProgram(), installer::REENTRY_SYS_UPDATE, true);
       }
     }
   } else if (cmd_line.HasSwitch(