Avoid reporting crashes for exceptions that hit our SEH from calls to the ori...

chrome_frame/chrome_frame_reporting.cc

 // Copyright (c) 2009 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.
 
 // Implementation of wrapper around common crash reporting.
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/file_version_info.h"
 #include "base/win_util.h"
@@ skipping 28 matching lines @@
   static google_breakpad::CustomInfoEntry prod_entry(L"prod", product.c_str());
   static google_breakpad::CustomInfoEntry plat_entry(L"plat", L"Win32");
   static google_breakpad::CustomInfoEntry type_entry(L"ptype", L"chrome_frame");
   static google_breakpad::CustomInfoEntry entries[] = {
       ver_entry, prod_entry, plat_entry, type_entry };
   static google_breakpad::CustomClientInfo custom_info = {
       entries, arraysize(entries) };
   return &custom_info;
 }
 
-
-void CALLBACK BreakpadHandler(EXCEPTION_POINTERS *ptrs) {
-  WriteMinidumpForException(ptrs);
-}
-
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 bool InitializeCrashReporting() {
   // In headless mode we want crashes to be reported back.
   bool always_take_dump = IsHeadlessMode();
   // We want to use the Google Update crash reporting. We need to check if the
   // user allows it first.
   if (!always_take_dump && !GoogleUpdateSettings::GetCollectStatsConsent())
       return true;
 
-  // Set the handler for ExceptionBarrier for this module:
-  DCHECK(ExceptionBarrier::handler() == NULL);
-  ExceptionBarrier::set_handler(BreakpadHandler);
+  // If we got here, we want to report crashes, so make sure all
+  // ExceptionBarrierBase instances do so.
+  ExceptionBarrierConfig::set_enabled(true);
 
   // Get the alternate dump directory. We use the temp path.
   FilePath temp_directory;
   if (!file_util::GetTempDir(&temp_directory) || temp_directory.empty()) {
     return false;
   }
 
   wchar_t dll_path[MAX_PATH * 2] = {0};
   GetModuleFileName(reinterpret_cast<HMODULE>(&__ImageBase), dll_path,
                     arraysize(dll_path));
@@ skipping 13 matching lines @@
     }
   } else {
     user_sid = kSystemPrincipalSid;
   }
 
   return InitializeVectoredCrashReporting(false, user_sid.c_str(),
       temp_directory.value(), GetCustomInfo(dll_path));
 }
 
 bool ShutdownCrashReporting() {
+  ExceptionBarrierConfig::set_enabled(false);
   return ShutdownVectoredCrashReporting();
 }