Cleanup sandbox/ in advance of re-enabling some MSVC warnings.

sandbox/win/src/process_mitigations.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/process_mitigations.h"
 
 #include <algorithm>
 
 #include "base/win/windows_version.h"
 #include "sandbox/win/src/nt_internals.h"
@@ skipping 61 matching lines @@
         reinterpret_cast<SetProcessDEPPolicyFunction>(
             ::GetProcAddress(module, "SetProcessDEPPolicy"));
     if (set_process_dep_policy) {
       if (!set_process_dep_policy(dep_flags) &&
           ERROR_ACCESS_DENIED != ::GetLastError() && return_on_fail) {
         return false;
       }
     } else {
       // We're on XP sp2, so use the less standard approach.
       // For reference: http://www.uninformed.org/?v=2&a=4
-      const int MEM_EXECUTE_OPTION_ENABLE = 1;
-      const int MEM_EXECUTE_OPTION_DISABLE = 2;
-      const int MEM_EXECUTE_OPTION_ATL7_THUNK_EMULATION = 4;
-      const int MEM_EXECUTE_OPTION_PERMANENT = 8;
+      static const int MEM_EXECUTE_OPTION_ENABLE = 1;
+      static const int MEM_EXECUTE_OPTION_DISABLE = 2;
+      static const int MEM_EXECUTE_OPTION_ATL7_THUNK_EMULATION = 4;
+      static const int MEM_EXECUTE_OPTION_PERMANENT = 8;
 
       NtSetInformationProcessFunction set_information_process = NULL;
       ResolveNTFunctionPtr("NtSetInformationProcess",
                            &set_information_process);
       if (!set_information_process)
         return false;
       ULONG dep = MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_PERMANENT;
       if (!(dep_flags & PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION))
         dep |= MEM_EXECUTE_OPTION_ATL7_THUNK_EMULATION;
       if (!SUCCEEDED(set_information_process(GetCurrentProcess(),
@@ skipping 217 matching lines @@
 }
 
 bool CanSetProcessMitigationsPreStartup(MitigationFlags flags) {
   // These mitigations cannot be enabled prior to startup.
   return !(flags & (MITIGATION_STRICT_HANDLE_CHECKS |
                     MITIGATION_DLL_SEARCH_ORDER));
 }
 
 }  // namespace sandbox