Remove support for non-browser products from InstallationState and ProductState.

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 <stddef.h>
 #include <stdint.h>
 #include <wtsapi32.h>
-#include <vector>
+
+#include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
-#include "base/win/windows_version.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
-#include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/product.h"
 #include "content/public/common/result_codes.h"
 
 namespace installer {
 
 namespace {
 
 // The following strings are the possible outcomes of the toast experiment
 // as recorded in the |client| field.
@@ skipping 169 matching lines @@
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kVerboseLogging))
     cmd_line->AppendSwitch(switches::kVerboseLogging);
 
   // Get the Google Update results key, and pass it on the command line to
   // the child process.
   int key = GoogleUpdateSettings::DuplicateGoogleUpdateSystemClientKey();
   cmd_line->AppendSwitchASCII(switches::kToastResultsKey,
                               base::IntToString(key));
 
-  if (base::win::GetVersion() > base::win::VERSION_XP) {
-    // Make sure that in Vista and Above we have the proper DACLs so
-    // the interactive user can launch it.
-    if (!FixDACLsForExecute(cmd_line->GetProgram()))
-      NOTREACHED();
-  }
+  // Make sure that in Vista and Above we have the proper DACLs so the
+  // interactive user can launch it.
+  if (!FixDACLsForExecute(cmd_line->GetProgram()))
+    NOTREACHED();
 
   DWORD console_id = ::WTSGetActiveConsoleSessionId();
   if (console_id == 0xFFFFFFFF) {
     PLOG(ERROR) << __func__ << " failed to get active session id";
     return false;
   }
   HANDLE user_token;
   if (!::WTSQueryUserToken(console_id, &user_token)) {
     PLOG(ERROR) << __func__ << " failed to get user token for console_id "
                 << console_id;
@@ skipping 284 matching lines @@
   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 = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSystemLevelToast);
 
-  base::CommandLine cmd(InstallUtil::GetChromeUninstallCmd(
-      system_level_toast, product.distribution()->GetType()));
+  base::CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast));
   base::LaunchProcess(cmd, base::LaunchOptions());
 }
 
 }  // namespace installer