| Index: chrome/installer/setup/setup_util.h
|
| diff --git a/chrome/installer/setup/setup_util.h b/chrome/installer/setup/setup_util.h
|
| index 007c75f9bba4b998abdff92cd3e8570353c6bc3d..5fbc3a16a9db16bf719f7b45f174b75f5b8fa06b 100644
|
| --- a/chrome/installer/setup/setup_util.h
|
| +++ b/chrome/installer/setup/setup_util.h
|
| @@ -9,16 +9,13 @@
|
| #ifndef CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
|
| #define CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
|
|
|
| -#include <windows.h>
|
| #include <stdint.h>
|
|
|
| #include <memory>
|
| #include <vector>
|
|
|
| -#include "base/macros.h"
|
| #include "base/strings/string16.h"
|
| #include "base/time/time.h"
|
| -#include "base/win/scoped_handle.h"
|
| #include "chrome/installer/util/browser_distribution.h"
|
| #include "chrome/installer/util/lzma_util.h"
|
| #include "chrome/installer/util/util_constants.h"
|
| @@ -154,35 +151,6 @@ void DoLegacyCleanups(const InstallerState& installer_state,
|
| // a null time in case of error.
|
| base::Time GetConsoleSessionStartTime();
|
|
|
| -// 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();
|
| -
|
| - // Always returns true unless the privilege could not be enabled.
|
| - bool is_enabled() const { return is_enabled_; }
|
| -
|
| - private:
|
| - // Always true unless the privilege could not be enabled.
|
| - bool is_enabled_;
|
| -
|
| - // A scoped handle to the current process' token. This will be closed
|
| - // preemptively should enabling the privilege fail in the constructor.
|
| - base::win::ScopedHandle token_;
|
| -
|
| - // 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_
|
|
|