Re-land second sandbox round of changes

- broke integration tests

See http://codereview.chromium.org/757001

BUG=27218
TEST=included

No change in the original files.
The only changes are in the files:

sandbox/src/registry_dispatcher.cc
sandbox/src/registry_dispatcher.h
sandbox/src/filesystem_dispatcher.cc

Because now even in 32 bits the handles map to void pointers
Review URL: http://codereview.chromium.org/873006

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

2 files changed, 6 insertions, 8 deletions

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