Revert 41481 - Secound round of sbox changes for 64 bit port

 Handling pointer sized items
 Beefing up unit tests
 Beefing up integration tests
 Enabling Process, Thread and Token IPCs
 Making validation tests compile again

BUG=27218
TEST= unit tests included

Review URL: http://codereview.chromium.org/757001

TBR=cpu@chromium.org
Review URL: http://codereview.chromium.org/871008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41491 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 6 deletions

diff --git a/sandbox/tests/validation_tests/commands.cc b/sandbox/tests/validation_tests/commands.cc
index 4d9eba4..2c9f89b 100644
--- a/sandbox/tests/validation_tests/commands.cc
+++ b/sandbox/tests/validation_tests/commands.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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.
 
@@ -87,11 +87,12 @@ int TestValidWindow(HWND window) {
   return SBOX_TEST_DENIED;
 }
 
-SBOX_TESTS_COMMAND int OpenProcessCmd(int argc, wchar_t **argv) {
+SBOX_TESTS_COMMAND int OpenProcess(int argc, wchar_t **argv) {
   if (1 != argc)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   DWORD process_id = _wtoi(argv[0]);
+
   return TestOpenProcess(process_id);
 }
 
@@ -111,11 +112,12 @@ int TestOpenProcess(DWORD process_id) {
   }
 }
 
-SBOX_TESTS_COMMAND int OpenThreadCmd(int argc, wchar_t **argv) {
+SBOX_TESTS_COMMAND int OpenThread(int argc, wchar_t **argv) {
   if (1 != argc)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   DWORD thread_id = _wtoi(argv[0]);
+
   return TestOpenThread(thread_id);
 }
 
diff --git a/sandbox/tests/validation_tests/suite.cc b/sandbox/tests/validation_tests/suite.cc
index 49faf6d..7992197 100644
--- a/sandbox/tests/validation_tests/suite.cc
+++ b/sandbox/tests/validation_tests/suite.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2009 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.
 
@@ -99,7 +99,7 @@ TEST(ValidationSuite, TestProcess) {
   TestRunner runner;
   wchar_t command[1024] = {0};
 
-  wsprintf(command, L"OpenProcessCmd %d", ::GetCurrentProcessId());
+  wsprintf(command, L"OpenProcess %d", ::GetCurrentProcessId());
   EXPECT_EQ(SBOX_TEST_DENIED, runner.RunTest(command));
 }
 
@@ -108,7 +108,7 @@ TEST(ValidationSuite, TestThread) {
   TestRunner runner;
   wchar_t command[1024] = {0};
 
-  wsprintf(command, L"OpenThreadCmd %d", ::GetCurrentThreadId());
+  wsprintf(command, L"OpenThread %d", ::GetCurrentThreadId());
   EXPECT_EQ(SBOX_TEST_DENIED, runner.RunTest(command));
 }