Improve the ScopedHandle verifier.

chrome/app/chrome_main.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 "chrome/app/chrome_main_delegate.h"
 
 #include "content/public/app/content_main.h"
 
 #if defined(OS_WIN)
 #include "base/debug/dump_without_crashing.h"
 #include "base/win/win_util.h"
+#include "chrome/app/close_handle_hook_win.h"
 #include "chrome/common/chrome_constants.h"
 
 #define DLLEXPORT __declspec(dllexport)
 
 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling.
 extern "C" {
 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
                                  sandbox::SandboxInterfaceInfo* sandbox_info);
 }
 #elif defined(OS_POSIX)
@@ skipping 12 matching lines @@
   ChromeMainDelegate chrome_main_delegate;
   content::ContentMainParams params(&chrome_main_delegate);
 
 #if defined(OS_WIN)
   // The process should crash when going through abnormal termination.
   base::win::SetShouldCrashOnProcessDetach(true);
   base::win::SetAbortBehaviorForCrashReporting();
   params.instance = instance;
   params.sandbox_info = sandbox_info;
 
+  InstallCloseHandleHooks();
+
   // SetDumpWithoutCrashingFunction must be passed the DumpProcess function
   // from the EXE and not from the DLL in order for DumpWithoutCrashing to
   // function correctly.
   typedef void (__cdecl *DumpProcessFunction)();
   DumpProcessFunction DumpProcess = reinterpret_cast<DumpProcessFunction>(
       ::GetProcAddress(::GetModuleHandle(chrome::kBrowserProcessExecutableName),
           "DumpProcessWithoutCrash"));
   base::debug::SetDumpWithoutCrashingFunction(DumpProcess);
 #else
   params.argc = argc;
   params.argv = argv;
 #endif
 
   int rv = content::ContentMain(params);
 
 #if defined(OS_WIN)
+  RemoveCloseHandleHooks();
   base::win::SetShouldCrashOnProcessDetach(false);
 #endif
 
   return rv;
 }