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 12fd98d907ef58013a7723727b809ffd55c2436a..0c45527126053c45922610a245f6a626f1721684 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);
       }
     }
   }
@@ -1429,8 +1430,8 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state,
            ++it) {
         const Product& product = **it;
         BrowserDistribution* browser_dist = product.distribution();
-        browser_dist->InactiveUserToastExperiment(
-            flavor, ASCIIToUTF16(experiment_group), product,
+        installer::InactiveUserToastExperiment(
+            browser_dist, flavor, ASCIIToUTF16(experiment_group), product,
             installer_state->target_path());
       }
     }
@@ -1449,9 +1450,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(