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

sandbox/win/src/service_resolver.cc

Index: sandbox/win/src/service_resolver.cc
diff --git a/sandbox/win/src/service_resolver.cc b/sandbox/win/src/service_resolver.cc
index bae698c4576d7672ba7f370b1a9223400beb557b..caec61845e5b42ba52cd211548bb34c81c8cfbb0 100644
--- a/sandbox/win/src/service_resolver.cc
+++ b/sandbox/win/src/service_resolver.cc
@@ -4,7 +4,6 @@
 
 #include "sandbox/win/src/service_resolver.h"
 
-#include "base/logging.h"
 #include "base/win/pe_image.h"
 
 namespace sandbox {
@@ -24,7 +23,6 @@ NTSTATUS ServiceResolverThunk::ResolveInterceptor(
 NTSTATUS ServiceResolverThunk::ResolveTarget(const void* module,
                                              const char* function_name,
                                              void** address) {
-  DCHECK(address);

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

removing this is fine

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

Done.

   if (NULL == module)
     return STATUS_UNSUCCESSFUL;
 
@@ -32,7 +30,6 @@ NTSTATUS ServiceResolverThunk::ResolveTarget(const void* module,
   *address = module_image.GetProcAddress(function_name);
 
   if (NULL == *address) {
-    NOTREACHED();

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

but this is a little more worrisome. How about DCHECK_NT(false)?

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

Done.

     return STATUS_UNSUCCESSFUL;
   }