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

sandbox/win/src/sandbox_utils.cc

-// 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"
 
 namespace sandbox {
 
 bool IsXPSP2OrLater() {
   base::win::Version version = base::win::GetVersion();
   return (version > base::win::VERSION_XP) ||
       ((version == base::win::VERSION_XP) &&
        (base::win::OSInfo::GetInstance()->service_pack().major >= 2));
 }
 
 void InitObjectAttribs(const std::wstring& name,
                        ULONG attributes,
                        HANDLE root,
                        OBJECT_ATTRIBUTES* obj_attr,
                        UNICODE_STRING* uni_name) {
   static RtlInitUnicodeStringFunction RtlInitUnicodeString;
   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