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

sandbox/win/src/service_resolver_64.cc

Index: sandbox/win/src/service_resolver_64.cc
diff --git a/sandbox/win/src/service_resolver_64.cc b/sandbox/win/src/service_resolver_64.cc
index 32de53a43f438335e077f76d33a430438c70368b..bb2646364e90209277f0a00961f99cf8199efe86 100644
--- a/sandbox/win/src/service_resolver_64.cc
+++ b/sandbox/win/src/service_resolver_64.cc
@@ -4,9 +4,8 @@
 
 #include "sandbox/win/src/service_resolver.h"
 
-#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/src/win_utils.h"
+#include "sandbox/win/src/sandbox_nt_util.h"
 
 namespace {
 #pragma pack(push, 1)
@@ -151,7 +150,6 @@ NTSTATUS ServiceResolverThunk::PerformPatch(void* local_thunk,
 
   // Patch the original code.
   ServiceEntry local_service;
-  DCHECK_GE(GetInternalThunkSize(), sizeof(local_service));

[rvargas (doing something else), 2013/11/27 23:53:51]

Convert DCHECKS to appropriate DCHECK_NT

[robertshield, 2013/11/29 01:21:26]

Done.

   if (!SetInternalThunk(&local_service, sizeof(local_service), NULL,
                         interceptor_))
     return STATUS_UNSUCCESSFUL;
@@ -181,12 +179,10 @@ NTSTATUS ServiceResolverThunk::PerformPatch(void* local_thunk,
 }
 
 bool Wow64ResolverThunk::IsFunctionAService(void* local_thunk) const {
-  NOTREACHED();

[rvargas (doing something else), 2013/11/27 23:53:51]

Don't remove these

[robertshield, 2013/11/29 01:21:26]

Replaced with DCHECK_NT(false);

   return false;
 }
 
 bool Win2kResolverThunk::IsFunctionAService(void* local_thunk) const {
-  NOTREACHED();
   return false;
 }