| Index: sandbox/win/src/policy_target_test.cc
|
| diff --git a/sandbox/win/src/policy_target_test.cc b/sandbox/win/src/policy_target_test.cc
|
| index 013fddfcef6903ddee95c43b61430ae5718a5284..71054abd3d5ab50f0e7f75930251c7b67ccecd67 100644
|
| --- a/sandbox/win/src/policy_target_test.cc
|
| +++ b/sandbox/win/src/policy_target_test.cc
|
| @@ -170,25 +170,20 @@ SBOX_TESTS_COMMAND int PolicyTargetTest_process(int argc, wchar_t **argv) {
|
|
|
| TEST(PolicyTargetTest, SetInformationThread) {
|
| TestRunner runner;
|
| - if (base::win::GetVersion() >= base::win::VERSION_XP) {
|
| - runner.SetTestState(BEFORE_REVERT);
|
| - EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"PolicyTargetTest_token"));
|
| - }
|
| + runner.SetTestState(BEFORE_REVERT);
|
| + EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"PolicyTargetTest_token"));
|
|
|
| runner.SetTestState(AFTER_REVERT);
|
| EXPECT_EQ(ERROR_NO_TOKEN, runner.RunTest(L"PolicyTargetTest_token"));
|
|
|
| runner.SetTestState(EVERY_STATE);
|
| - if (base::win::GetVersion() >= base::win::VERSION_XP)
|
| - EXPECT_EQ(SBOX_TEST_FAILED, runner.RunTest(L"PolicyTargetTest_steal"));
|
| + EXPECT_EQ(SBOX_TEST_FAILED, runner.RunTest(L"PolicyTargetTest_steal"));
|
| }
|
|
|
| TEST(PolicyTargetTest, OpenThreadToken) {
|
| TestRunner runner;
|
| - if (base::win::GetVersion() >= base::win::VERSION_XP) {
|
| - runner.SetTestState(BEFORE_REVERT);
|
| - EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"PolicyTargetTest_token2"));
|
| - }
|
| + runner.SetTestState(BEFORE_REVERT);
|
| + EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"PolicyTargetTest_token2"));
|
|
|
| runner.SetTestState(AFTER_REVERT);
|
| EXPECT_EQ(ERROR_NO_TOKEN, runner.RunTest(L"PolicyTargetTest_token2"));
|
| @@ -196,8 +191,6 @@ TEST(PolicyTargetTest, OpenThreadToken) {
|
|
|
| TEST(PolicyTargetTest, OpenThreadTokenEx) {
|
| TestRunner runner;
|
| - if (base::win::GetVersion() < base::win::VERSION_XP)
|
| - return;
|
|
|
| runner.SetTestState(BEFORE_REVERT);
|
| EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"PolicyTargetTest_token3"));
|
| @@ -356,9 +349,6 @@ TEST(PolicyTargetTest, WinstaPolicy) {
|
| // Launches the app in the sandbox and share a handle with it. The app should
|
| // be able to use the handle.
|
| TEST(PolicyTargetTest, ShareHandleTest) {
|
| - // The way we share handles via STARTUPINFOEX does not work on XP.
|
| - if (base::win::GetVersion() < base::win::VERSION_VISTA)
|
| - return;
|
|
|
| BrokerServices* broker = GetBroker();
|
| ASSERT_TRUE(broker != NULL);
|
|
|