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

sandbox/win/src/win_utils.cc

 // Copyright (c) 2011 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/win_utils.h"
 
 #include <map>
 
-#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "sandbox/win/src/internal_types.h"
 #include "sandbox/win/src/nt_internals.h"
+#include "sandbox/win/src/sandbox_nt_util.h"
 
 namespace {
 
 // Holds the information about a known registry key.
 struct KnownReservedKey {
   const wchar_t* name;
   HKEY key;
 };
 
 // Contains all the known registry key by name and by handle.
@@ skipping 74 matching lines @@
   do {
     path = path.substr(0, last_pos);
 
     DWORD attributes = ::GetFileAttributes(path.c_str());
     if (INVALID_FILE_ATTRIBUTES == attributes) {
       DWORD error = ::GetLastError();
       if (error != ERROR_FILE_NOT_FOUND &&
           error != ERROR_PATH_NOT_FOUND &&
           error != ERROR_INVALID_NAME) {
         // Unexpected error.
-        NOTREACHED();
+        NOTREACHED_NT();
         return error;
       }
     } else if (FILE_ATTRIBUTE_REPARSE_POINT & attributes) {
       // This is a reparse point.
       *result = true;
       return ERROR_SUCCESS;
     }
 
     last_pos = path.rfind(L'\\');
   } while (last_pos != std::wstring::npos);
 
   *result = false;
   return ERROR_SUCCESS;
 }
 
 // We get a |full_path| of the form \??\c:\some\foo\bar, and the name that
 // we'll get from |handle| will be \device\harddiskvolume1\some\foo\bar.
 bool SameObject(HANDLE handle, const wchar_t* full_path) {
   std::wstring path(full_path);
-  DCHECK(!path.empty());
+  DCHECK_NT(!path.empty());
 
   // Check if it's a pipe.
   if (IsPipe(path))
     return true;
 
   std::wstring actual_path;
   if (!GetPathFromHandle(handle, &actual_path))
     return false;
 
   // This may end with a backslash.
@@ skipping 174 matching lines @@
   FARPROC* function_ptr = reinterpret_cast<FARPROC*>(ptr);
   *function_ptr = ::GetProcAddress(ntdll, name);
 
   for (int tries = 1; !(*function_ptr) && tries < max_tries; ++tries) {
     if (tries >= sleep_threshold)
       ::Sleep(1);
     ntdll = ::GetModuleHandle(sandbox::kNtdllName);
     *function_ptr = ::GetProcAddress(ntdll, name);
   }
 
-  CHECK(*function_ptr);
+  VERIFY(*function_ptr);

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

We need CHECK_NT

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

Done.

 }