2 files changed, 0 insertions, 24 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index c2b4e04..c4021cb 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -115,11 +115,6 @@ void PpapiThread::Shutdown() {
   if (plugin_entry_points_.shutdown_module)
     plugin_entry_points_.shutdown_module();
   WebKit::shutdown();
-
-#if defined(OS_WIN)
-  if (permissions_.HasPermission(ppapi::PERMISSION_FLASH))
-    base::win::SetShouldCrashOnProcessDetach(false);
-#endif
 }
 
 bool PpapiThread::Send(IPC::Message* msg) {
@@ -308,11 +303,6 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path,
   // If code subsequently tries to exit using abort(), force a crash (since
   // otherwise these would be silent terminations and fly under the radar).
   base::win::SetAbortBehaviorForCrashReporting();
-  if (permissions.HasPermission(ppapi::PERMISSION_FLASH)) {
-    // Force a crash for exit(), _exit(), or ExitProcess(), but only do that for
-    // Pepper Flash.
-    base::win::SetShouldCrashOnProcessDetach(true);
-  }
 
   // Once we lower the token the sandbox is locked down and no new modules
   // can be loaded. TODO(cpu): consider changing to the loading style of
diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc
index 44d5166..c4b4616 100644
--- a/content/renderer/renderer_main_platform_delegate_win.cc
+++ b/content/renderer/renderer_main_platform_delegate_win.cc
@@ -43,14 +43,6 @@ void SkiaPreCacheFontCharacters(const LOGFONT& logfont,
   }
 }
 
-void InitExitInterceptions() {
-  // If code subsequently tries to exit using exit(), _exit(), abort(), or
-  // ExitProcess(), force a crash (since otherwise these would be silent
-  // terminations and fly under the radar).
-  base::win::SetShouldCrashOnProcessDetach(true);
-  base::win::SetAbortBehaviorForCrashReporting();
-}
-
 #if !defined(NDEBUG)
 LRESULT CALLBACK WindowsHookCBT(int code, WPARAM w_param, LPARAM l_param) {
   CHECK_NE(code, HCBT_CREATEWND)
@@ -59,7 +51,6 @@ LRESULT CALLBACK WindowsHookCBT(int code, WPARAM w_param, LPARAM l_param) {
 }
 #endif  // !NDEBUG
 
-
 }  // namespace
 
 RendererMainPlatformDelegate::RendererMainPlatformDelegate(
@@ -81,8 +72,6 @@ void RendererMainPlatformDelegate::PlatformInitialize() {
       SetWindowsHookEx(WH_CBT, WindowsHookCBT, NULL, ::GetCurrentThreadId()));
 #endif  // !NDEBUG
 
-  InitExitInterceptions();
-
   const CommandLine& command_line = parameters_.command_line;
 
 #ifdef ENABLE_VTUNE_JIT_INTERFACE
@@ -109,9 +98,6 @@ void RendererMainPlatformDelegate::PlatformInitialize() {
 }
 
 void RendererMainPlatformDelegate::PlatformUninitialize() {
-  // At this point we are shutting down in a normal code path, so undo our
-  // hack to crash on exit.
-  base::win::SetShouldCrashOnProcessDetach(false);
 }
 
 bool RendererMainPlatformDelegate::InitSandboxTests(bool no_sandbox) {