Moved exception_handler_test to the more aptly named exception_handler_death_...

src/client/windows/crash_generation/crash_generation_client.cc

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 253 matching lines @@
          (msg.pid != 0) &&
          (msg.dump_request_handle != NULL) &&
          (msg.dump_generated_handle != NULL) &&
          (msg.server_alive_handle != NULL);
 }
 
 bool CrashGenerationClient::IsRegistered() const {
   return crash_event_ != NULL;
 }
 
-bool CrashGenerationClient::RequestDump(EXCEPTION_POINTERS* ex_info) {
+bool CrashGenerationClient::RequestDump(EXCEPTION_POINTERS* ex_info,
+                                        MDRawAssertionInfo* assert_info) {
   if (!IsRegistered()) {
     return false;
   }
 
   exception_pointers_ = ex_info;
   thread_id_ = GetCurrentThreadId();
 
-  assert_info_.line = 0;
-  assert_info_.type = 0;
-  assert_info_.expression[0] = 0;
-  assert_info_.file[0] = 0;
-  assert_info_.function[0] = 0;
-
-  return SignalCrashEventAndWait();
-}
-
-bool CrashGenerationClient::RequestDump(MDRawAssertionInfo* assert_info) {
-  if (!IsRegistered()) {
-    return false;
-  }
-
-  exception_pointers_ = NULL;
-
   if (assert_info) {
     memcpy(&assert_info_, assert_info, sizeof(assert_info_));
   } else {
     memset(&assert_info_, 0, sizeof(assert_info_));
   }
 
-  thread_id_ = GetCurrentThreadId();
+  return SignalCrashEventAndWait();
+}
 
-  return SignalCrashEventAndWait();
+bool CrashGenerationClient::RequestDump(EXCEPTION_POINTERS* ex_info) {
+  return RequestDump(ex_info, NULL);
+}
+
+bool CrashGenerationClient::RequestDump(MDRawAssertionInfo* assert_info) {
+  return RequestDump(NULL, assert_info);
 }
 
 bool CrashGenerationClient::SignalCrashEventAndWait() {
   assert(crash_event_);
   assert(crash_generated_);
   assert(server_alive_);
 
   // Reset the dump generated event before signaling the crash
   // event so that the server can set the dump generated event
   // once it is done generating the event.
@@ skipping 11 matching lines @@
                                         wait_handles,
                                         FALSE,
                                         kWaitForServerTimeoutMs);
 
   // Crash dump was successfully generated only if the server
   // signaled the crash generated event.
   return result == WAIT_OBJECT_0;
 }
 
 }  // namespace google_breakpad