Pulling user experiment code from BrowserDistribution to a new class.

chrome/installer/util/chrome_app_host_operations.cc

Index: chrome/installer/util/chrome_app_host_operations.cc
diff --git a/chrome/installer/util/chrome_app_host_operations.cc b/chrome/installer/util/chrome_app_host_operations.cc
index 3690196cd422ac33e7899e398638b17c9e695a50..361f952ef10e612e6fbc4a2e4a58bf251e60ece5 100644
--- a/chrome/installer/util/chrome_app_host_operations.cc
+++ b/chrome/installer/util/chrome_app_host_operations.cc
@@ -18,9 +18,8 @@
 
 namespace installer {
 
-void ChromeAppHostOperations::ReadOptions(
-    const MasterPreferences& prefs,
-    std::set<std::wstring>* options) const {
+void ChromeAppHostOperations::ReadOptions(const MasterPreferences& prefs,
+                                          std::set<string16>* options) const {
   DCHECK(options);
 
   bool pref_value;
@@ -30,9 +29,8 @@ void ChromeAppHostOperations::ReadOptions(
   }
 }
 
-void ChromeAppHostOperations::ReadOptions(
-    const CommandLine& uninstall_command,
-    std::set<std::wstring>* options) const {
+void ChromeAppHostOperations::ReadOptions(const CommandLine& uninstall_command,
+                                          std::set<string16>* options) const {
   DCHECK(options);
 
   if (uninstall_command.HasSwitch(switches::kMultiInstall))
@@ -40,17 +38,17 @@ void ChromeAppHostOperations::ReadOptions(
 }
 
 void ChromeAppHostOperations::AddKeyFiles(
-    const std::set<std::wstring>& options,
+    const std::set<string16>& options,
     std::vector<base::FilePath>* key_files) const {
 }
 
 void ChromeAppHostOperations::AddComDllList(
-    const std::set<std::wstring>& options,
+    const std::set<string16>& options,
     std::vector<base::FilePath>* com_dll_list) const {
 }
 
 void ChromeAppHostOperations::AppendProductFlags(
-    const std::set<std::wstring>& options,
+    const std::set<string16>& options,
     CommandLine* cmd_line) const {
   DCHECK(cmd_line);
   bool is_multi_install = options.find(kOptionMultiInstall) != options.end();
@@ -67,7 +65,7 @@ void ChromeAppHostOperations::AppendProductFlags(
 }
 
 void ChromeAppHostOperations::AppendRenameFlags(
-    const std::set<std::wstring>& options,
+    const std::set<string16>& options,
     CommandLine* cmd_line) const {
   DCHECK(cmd_line);
   bool is_multi_install = options.find(kOptionMultiInstall) != options.end();
@@ -80,10 +78,9 @@ void ChromeAppHostOperations::AppendRenameFlags(
     cmd_line->AppendSwitch(switches::kMultiInstall);
 }
 
-bool ChromeAppHostOperations::SetChannelFlags(
-    const std::set<std::wstring>& options,
-    bool set,
-    ChannelInfo* channel_info) const {
+bool ChromeAppHostOperations::SetChannelFlags(const std::set<string16>& options,
+                                              bool set,
+                                              ChannelInfo* channel_info) const {
 #if defined(GOOGLE_CHROME_BUILD)
   DCHECK(channel_info);
   return channel_info->SetAppLauncher(set);
@@ -93,7 +90,7 @@ bool ChromeAppHostOperations::SetChannelFlags(
 }
 
 bool ChromeAppHostOperations::ShouldCreateUninstallEntry(
-    const std::set<std::wstring>& options) const {
+    const std::set<string16>& options) const {
   return true;
 }
 
@@ -120,4 +117,14 @@ void ChromeAppHostOperations::AddDefaultShortcutProperties(
   }
 }
 
+void ChromeAppHostOperations::LaunchUserExperiment(
+    const base::FilePath& setup_path,
+    const std::set<string16>& options,
+    InstallStatus status,
+    bool system_level) const {
+  // No experiments yet.  If adding some in the future, need to have
+  // ChromeAppHostDistribution::HasUserExperiments() return true.
+  NOTREACHED();
+}
+
 }  // namespace installer