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

1 files changed, 10 insertions, 10 deletions

diff --git a/sandbox/src/process_thread_policy.h b/sandbox/src/process_thread_policy.h
index 78323cc..29ea91d 100644
--- a/sandbox/src/process_thread_policy.h
+++ b/sandbox/src/process_thread_policy.h
@@ -1,9 +1,9 @@
-// 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.
 
-#ifndef SANDBOX_SRC_PROCESS_THREAD_POLICY_H_
-#define SANDBOX_SRC_PROCESS_THREAD_POLICY_H_
+#ifndef SANDBOX_SRC_PROCESS_THREAD_POLICY_H__
+#define SANDBOX_SRC_PROCESS_THREAD_POLICY_H__
 
 #include <string>
 
@@ -37,7 +37,7 @@ class ProcessPolicy {
   static NTSTATUS OpenThreadAction(const ClientInfo& client_info,
                                    uint32 desired_access,
                                    uint32 thread_id,
-                                   HANDLE* handle);
+                                   HANDLE *handle);
 
   // Opens the process id passed in and returns the duplicated handle to
   // the child. We only allow the child processes to open themselves. Any other
@@ -45,24 +45,24 @@ class ProcessPolicy {
   static NTSTATUS OpenProcessAction(const ClientInfo& client_info,
                                     uint32 desired_access,
                                     uint32 process_id,
-                                    HANDLE* handle);
+                                    HANDLE *handle);
 
   // Opens the token associated with the process and returns the duplicated
   // handle to the child. We only allow the child processes to open his own
   // token (using ::GetCurrentProcess()).
   static NTSTATUS OpenProcessTokenAction(const ClientInfo& client_info,
-                                         HANDLE process,
+                                         uint32 process,
                                          uint32 desired_access,
-                                         HANDLE* handle);
+                                         HANDLE *handle);
 
   // Opens the token associated with the process and returns the duplicated
   // handle to the child. We only allow the child processes to open his own
   // token (using ::GetCurrentProcess()).
   static NTSTATUS OpenProcessTokenExAction(const ClientInfo& client_info,
-                                           HANDLE process,
+                                           uint32 process,
                                            uint32 desired_access,
                                            uint32 attributes,
-                                           HANDLE* handle);
+                                           HANDLE *handle);
 
   // Processes a 'CreateProcessW()' request from the target.
   // 'client_info' : the target process that is making the request.
@@ -79,4 +79,4 @@ class ProcessPolicy {
 }  // namespace sandbox
 
 
-#endif  // SANDBOX_SRC_PROCESS_THREAD_POLICY_H_
+#endif  // SANDBOX_SRC_PROCESS_THREAD_POLICY_H__