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

sandbox/win/src/service_resolver_32.cc

 // Copyright (c) 2012 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/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)
 
 const BYTE kMovEax = 0xB8;
 const BYTE kMovEdx = 0xBA;
 const USHORT kMovEdxEsp = 0xD48B;
 const USHORT kCallPtrEdx = 0x12FF;
 const USHORT kCallEdx = 0xD2FF;
 const BYTE kCallEip = 0xE8;
@@ skipping 392 matching lines @@
     return false;
   }
 
   // Save the verified code
   memcpy(local_thunk, &function_code, sizeof(function_code));
 
   return true;
 }
 
 }  // namespace sandbox