Restructure sandbox code to reduce dependencies pulled in by intercept code.

sandbox/win/src/policy_target.cc

 // 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.
 
 #include "sandbox/win/src/policy_target.h"
 
 #include "sandbox/win/src/crosscall_client.h"
 #include "sandbox/win/src/ipc_tags.h"
 #include "sandbox/win/src/policy_engine_processor.h"
 #include "sandbox/win/src/policy_low_level.h"
 #include "sandbox/win/src/policy_params.h"
 #include "sandbox/win/src/sandbox_factory.h"
 #include "sandbox/win/src/sandbox_nt_util.h"
+#include "sandbox/win/src/sandbox_utils.h"

[rvargas (doing something else), 2013/11/26 20:42:12]

same here

[robertshield, 2013/11/27 20:28:01]

Done.

 #include "sandbox/win/src/sharedmem_ipc_client.h"
 #include "sandbox/win/src/target_services.h"
 
 namespace sandbox {
 
 // Handle for our private heap.
 extern void* g_heap;
 
 // This is the list of all imported symbols from ntdll.dll.
 SANDBOX_INTERCEPT NtExports g_nt;
@@ skipping 94 matching lines @@
     ACCESS_MASK desired_access, BOOLEAN open_as_self, ULONG handle_attributes,
     PHANDLE token) {
   if (!SandboxFactory::GetTargetServices()->GetState()->RevertedToSelf())
     open_as_self = FALSE;
 
   return orig_OpenThreadTokenEx(thread, desired_access, open_as_self,
                                 handle_attributes, token);
 }
 
 }  // namespace sandbox