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

sandbox/win/src/sandbox_utils.cc

Index: sandbox/win/src/sandbox_utils.cc
diff --git a/sandbox/win/src/sandbox_utils.cc b/sandbox/win/src/sandbox_utils.cc
index f4511a475136b2edec8fce1f1886f34d78b904b2..fb401b4cf5222fefab0fcd664ef04e1d13d7d5df 100644
--- a/sandbox/win/src/sandbox_utils.cc
+++ b/sandbox/win/src/sandbox_utils.cc
@@ -1,11 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/sandbox_utils.h"
 
-#include <windows.h>

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

why?

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

earlier refactoring cruft. undone.

-
 #include "base/logging.h"
 #include "base/win/windows_version.h"
 #include "sandbox/win/src/internal_types.h"
@@ -28,11 +26,11 @@ void InitObjectAttribs(const std::wstring& name,
   if (!RtlInitUnicodeString) {
     HMODULE ntdll = ::GetModuleHandle(kNtdllName);
     RtlInitUnicodeString = reinterpret_cast<RtlInitUnicodeStringFunction>(
-      GetProcAddress(ntdll, "RtlInitUnicodeString"));
+        GetProcAddress(ntdll, "RtlInitUnicodeString"));
     DCHECK(RtlInitUnicodeString);
   }
   RtlInitUnicodeString(uni_name, name.c_str());
   InitializeObjectAttributes(obj_attr, uni_name, attributes, root, NULL);
 }
 
-};  // namespace sandbox
+}  // namespace sandbox