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..5dbb8cd983ddea1b7efe4b5677db8a94b568e518 100644
--- a/sandbox/win/src/service_resolver.cc
+++ b/sandbox/win/src/service_resolver.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/logging.h"
 #include "base/win/pe_image.h"
+#include "sandbox/win/src/sandbox_nt_util.h"
 
 namespace sandbox {
 
@@ -24,7 +24,6 @@ NTSTATUS ServiceResolverThunk::ResolveInterceptor(
 NTSTATUS ServiceResolverThunk::ResolveTarget(const void* module,
                                              const char* function_name,
                                              void** address) {
-  DCHECK(address);
   if (NULL == module)
     return STATUS_UNSUCCESSFUL;
 
@@ -32,11 +31,15 @@ NTSTATUS ServiceResolverThunk::ResolveTarget(const void* module,
   *address = module_image.GetProcAddress(function_name);
 
   if (NULL == *address) {
-    NOTREACHED();
+    DCHECK_NT(false);
     return STATUS_UNSUCCESSFUL;
   }
 
   return STATUS_SUCCESS;
 }
 
+void ServiceResolverThunk::AllowLocalPatches() {

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

This requires unit tests

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

Test added.

+  ntdll_base_ = ::GetModuleHandle(L"ntdll.dll");
+}
+
 }  // namespace sandbox