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

sandbox/win/src/service_resolver_32.cc

Index: sandbox/win/src/service_resolver_32.cc
diff --git a/sandbox/win/src/service_resolver_32.cc b/sandbox/win/src/service_resolver_32.cc
index 2e69dbc9e7e083b74e8f4db47f7e257ce29acf7f..f10466e239cab405c1ed02da2a7fe501581da80b 100644
--- a/sandbox/win/src/service_resolver_32.cc
+++ b/sandbox/win/src/service_resolver_32.cc
@@ -5,7 +5,7 @@
 #include "sandbox/win/src/service_resolver.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/src/win_utils.h"

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

Looks like the only thing from win_utils that requires an object file from base
is logging. And even that, we only use CHECK, DCHECK and NOTREACHED. Would
removing base logging be enough? We could move the macros from nt_utils to a new
header usable from both sides of the sandbox (nt and not-nt), at least from
these files, and remove logging.h.

Or simply include nt_utils just for the check macros.

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

Ah, that's a much better idea that what I did :) Done as you suggest.

+#include "sandbox/win/src/sandbox_nt_util.h"
 
 namespace {
 #pragma pack(push, 1)