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

chrome/installer/util/user_experiment.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/util/user_experiment.h"
 
 #include <windows.h>
 #include <sddl.h>
 #include <wtsapi32.h>
 #include <vector>
@@ skipping 377 matching lines @@
                                  bool system_level) {
   if (system_level) {
     if (NEW_VERSION_UPDATED == status) {
       CommandLine cmd_line(base_cmd_line);
       cmd_line.AppendSwitch(switches::kSystemLevelToast);
       // We need to relaunch as the interactive user.
       LaunchSetupAsConsoleUser(&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;
     }
   }
 
   // The |flavor| value ends up being processed by TryChromeDialogView to show
   // different experiments.
   ExperimentDetails experiment;
   if (!CreateExperimentDetails(-1, &experiment)) {
     VLOG(1) << "Failed to get experiment details.";
@@ skipping 68 matching lines @@
                              base::IntToString(flavor));
   cmd_line.AppendSwitchASCII(switches::kExperimentGroup,
                              WideToASCII(base_group));
   LaunchSetup(&cmd_line, system_level);
 }
 
 // User qualifies for the experiment. To test, use --try-chrome-again=|flavor|
 // 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);
   options.AppendSwitchNative(::switches::kTryChromeAgain,
       base::IntToString16(flavor));
   // Prepend the url with a space.
   string16 url(GetWelcomeBackUrl());
   options.AppendArg("--");
   options.AppendArgNative(url);
   // The command line should now have the url added as:
   // "chrome.exe -- <url>"
   DCHECK_NE(string16::npos,
       options.GetCommandLineString().find(L" -- " + url));
 
   // 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.
   const wchar_t* outcome = NULL;
   switch (exit_code) {
     case content::RESULT_CODE_NORMAL_EXIT:
       outcome = kToastExpTriesOkGroup;
       break;
     case chrome::RESULT_CODE_NORMAL_EXIT_CANCEL:
       outcome = kToastExpCancelGroup;
       break;
     case chrome::RESULT_CODE_NORMAL_EXIT_EXP2:
       outcome = kToastExpUninstallGroup;
       break;
     default:
       outcome = kToastExpTriesErrorGroup;
   };
   // Write to the |client| key for the last time.
   SetClient(experiment_group + outcome, true);
 
   if (outcome != kToastExpUninstallGroup)
     return;
   // The user wants to uninstall. This is a best effort operation. Note that
   // we waited for chrome to exit so the uninstall would not detect chrome
   // running.
   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);
 }
 
 }  // namespace installer