Re-land second sandbox round of changes...

sandbox/src/policy_broker.cc

 // 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.
 
 #include <map>
 
 #include "sandbox/src/policy_broker.h"
 
 #include "base/logging.h"
 #include "base/pe_image.h"
@@ skipping 70 matching lines @@
 #endif
   ResultCode ret = child->TransferVariable("g_nt", &g_nt, sizeof(g_nt));
 
   return SBOX_ALL_OK == ret ? true : false;
 }
 
 #undef INIT_GLOBAL_NT
 #undef INIT_GLOBAL_RTL
 
 bool SetupBasicInterceptions(InterceptionManager* manager) {
-#if !defined(_WIN64)
-  // Bug 27218: We don't have dispatch for some x64 syscalls.
   // Interceptions provided by process_thread_policy, without actual policy.
   if (!INTERCEPT_NT(manager, NtOpenThread, OPEN_TREAD_ID, 20) ||
       !INTERCEPT_NT(manager, NtOpenProcess, OPEN_PROCESS_ID, 20) ||
       !INTERCEPT_NT(manager, NtOpenProcessToken, OPEN_PROCESS_TOKEN_ID, 16))
     return false;
-#endif
 
   // Interceptions with neither policy nor IPC.
   if (!INTERCEPT_NT(manager, NtSetInformationThread, SET_INFORMATION_THREAD_ID,
                     20) ||
       !INTERCEPT_NT(manager, NtOpenThreadToken, OPEN_THREAD_TOKEN_ID, 20))
     return false;
 
   if (win_util::GetWinVersion() >= win_util::WINVERSION_XP) {
-#if !defined(_WIN64)
     // Bug 27218: We don't have dispatch for some x64 syscalls.
     // This one is also provided by process_thread_policy.
     if (!INTERCEPT_NT(manager, NtOpenProcessTokenEx, OPEN_PROCESS_TOKEN_EX_ID,
                       20))
       return false;
-#endif
 
     return INTERCEPT_NT(manager, NtOpenThreadTokenEx, OPEN_THREAD_TOKEN_EX_ID,
                         24);
   }
 
   return true;
 }
 
 }  // namespace sandbox