Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/setup/setup_util.h

 // Copyright (c) 2012 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.
 //
 // This file declares util functions for setup project. It also declares a
 // few functions that the Chrome component updater uses for patching binary
 // deltas.
 
 #ifndef CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
 #define CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
@@ skipping 92 matching lines @@
 // from multi-install to single-install. This includes copying the usagestats
 // value and adjusting the ap values of all multi-install products.
 void MigrateGoogleUpdateStateMultiToSingle(
     bool system_level,
     BrowserDistribution::Type to_migrate,
     const installer::InstallationState& machine_state);
 
 // Returns true if |install_status| represents a successful uninstall code.
 bool IsUninstallSuccess(InstallStatus install_status);
 
+// Returns true if |cmd_line| contains unsupported (legacy) switches.
+bool ContainsUnsupportedSwitch(const CommandLine& cmd_line);
+
 // This class will enable the privilege defined by |privilege_name| on the
 // current process' token. The privilege will be disabled upon the
 // ScopedTokenPrivilege's destruction (unless it was already enabled when the
 // ScopedTokenPrivilege object was constructed).
 // Some privileges might require admin rights to be enabled (check is_enabled()
 // to know whether |privilege_name| was successfully enabled).
 class ScopedTokenPrivilege {
  public:
   explicit ScopedTokenPrivilege(const wchar_t* privilege_name);
   ~ScopedTokenPrivilege();
@@ skipping 12 matching lines @@
   // The previous state of the privilege this object is responsible for. As set
   // by AdjustTokenPrivileges() upon construction.
   TOKEN_PRIVILEGES previous_privileges_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ScopedTokenPrivilege);
 };
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_SETUP_SETUP_UTIL_H_