Revert 156550 - Add sandbox support for Windows process mitigations

content/common/sandbox_policy.cc

Index: content/common/sandbox_policy.cc
===================================================================
--- content/common/sandbox_policy.cc	(revision 156553)
+++ content/common/sandbox_policy.cc	(working copy)
@@ -25,7 +25,6 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/process_type.h"
 #include "content/public/common/sandbox_init.h"
-#include "sandbox/win/src/process_mitigations.h"
 #include "sandbox/win/src/sandbox.h"
 #include "sandbox/win/src/sandbox_nt_util.h"
 #include "sandbox/win/src/win_utils.h"
@@ -44,6 +43,7 @@
   L"acpiz.dll",                   // Unknown.
   L"avgrsstx.dll",                // AVG 8.
   L"babylonchromepi.dll",         // Babylon translator.
+  L"browsemngr.dll",              // Uninstall blocker used by Babylon.
   L"btkeyind.dll",                // Widcomm Bluetooth.
   L"cmcsyshk.dll",                // CMC Internet Security.
   L"cmsetac.dll",                 // Unknown (suspected malware).
@@ -727,28 +727,6 @@
     return process;
   }
 
-  // TODO(jschuh): Add all Win8 mitigations. crbug.com/147752
-  if (type != content::PROCESS_TYPE_NACL_LOADER) {
-    if (policy->SetProcessMitigations(MITIGATION_DEP |
-                                      MITIGATION_DEP_NO_ATL_THUNK |
-                                      MITIGATION_SEHOP |
-                                      MITIGATION_BOTTOM_UP_ASLR)
-        != sandbox::SBOX_ALL_OK) {
-      return 0;
-    }
-  } else {
-    // TODO(jschuh): Make NaCl work with DEP and SEHOP. crbug.com/147752
-    if (policy->SetDelayedProcessMitigations(MITIGATION_DEP |
-                                             MITIGATION_DEP_NO_ATL_THUNK)
-        != sandbox::SBOX_ALL_OK) {
-      return 0;
-    }
-    if (policy->SetProcessMitigations(MITIGATION_BOTTOM_UP_ASLR)
-        != sandbox::SBOX_ALL_OK) {
-      return 0;
-    }
-  }
-
   if (type == content::PROCESS_TYPE_PLUGIN) {
     AddGenericDllEvictionPolicy(policy);
     AddPluginDllEvictionPolicy(policy);