Minor cleanups for user experiments (follow-up to Issue 12321061).

chrome/installer/util/user_experiment.cc

Index: chrome/installer/util/user_experiment.cc
diff --git a/chrome/installer/util/user_experiment.cc b/chrome/installer/util/user_experiment.cc
index 27eca57c0ac0f9baca7c2545353b1ce46c3cdd05..6d9ae4ea03fbb9dd136bc698cf49677346a2908b 100644
--- a/chrome/installer/util/user_experiment.cc
+++ b/chrome/installer/util/user_experiment.cc
@@ -395,7 +395,7 @@ void LaunchBrowserUserExperiment(const CommandLine& base_cmd_line,
       return;
     }
   } else {
-    if ((NEW_VERSION_UPDATED != status) && (REENTRY_SYS_UPDATE != status)) {
+    if (status != NEW_VERSION_UPDATED && status != REENTRY_SYS_UPDATE) {
       // We are not updating or in re-launch. Exit.
       return;
     }
@@ -484,7 +484,7 @@ void LaunchBrowserUserExperiment(const CommandLine& base_cmd_line,
 // as a parameter to chrome.exe.
 void InactiveUserToastExperiment(int flavor,
                                  const string16& experiment_group,
-                                 const Product& installation,
+                                 const Product& product,
                                  const base::FilePath& application_path) {
   // Add the 'welcome back' url for chrome to show.
   CommandLine options(CommandLine::NO_PROGRAM);
@@ -501,7 +501,7 @@ void InactiveUserToastExperiment(int flavor,
 
   // Launch chrome now. It will show the toast UI.
   int32 exit_code = 0;
-  if (!installation.LaunchChromeAndWait(application_path, options, &exit_code))
+  if (!product.LaunchChromeAndWait(application_path, options, &exit_code))
     return;
 
   // The chrome process has exited, figure out what happened.
@@ -530,8 +530,8 @@ void InactiveUserToastExperiment(int flavor,
   bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSystemLevelToast);
 
-  CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast,
-                      installation.distribution()->GetType()));
+  CommandLine cmd(InstallUtil::GetChromeUninstallCmd(
+                      system_level_toast, product.distribution()->GetType()));
   base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
 }