Speculatively back out r984. See http://codereview.chromium.org/10805065/

and
http://build.chromium.org/p/chromium/builders/NACL%20Tests%20%28x64%29/builds/34563

chrome src/native_client/tests/inbrowser_crash_test/crash_dump_tester.py says
that the observed failures are a symptom of crash_service.exe itself crashing.


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@999 4c0a9323-5329-0410-9bdc-e9ce6186880e

1 files changed, 5 insertions, 17 deletions

diff --git a/src/client/windows/crash_generation/minidump_generator.cc b/src/client/windows/crash_generation/minidump_generator.cc
index f407ef8c..fe4937aa 100644
--- a/src/client/windows/crash_generation/minidump_generator.cc
+++ b/src/client/windows/crash_generation/minidump_generator.cc
@@ -271,15 +271,14 @@ bool MinidumpGenerator::WriteMinidump(HANDLE process_handle,
                                       DWORD requesting_thread_id,
                                       EXCEPTION_POINTERS* exception_pointers,
                                       MDRawAssertionInfo* assert_info,
-                                      CustomDataStream* custom_data_stream,
                                       MINIDUMP_TYPE dump_type,
                                       bool is_client_pointers,
                                       wstring* dump_path) {
   // Just call the full WriteMinidump with NULL as the full_dump_path.
   return this->WriteMinidump(process_handle, process_id, thread_id,
                              requesting_thread_id, exception_pointers,
-                             assert_info, custom_data_stream, dump_type,
-                             is_client_pointers, dump_path, NULL);
+                             assert_info, dump_type, is_client_pointers,
+                             dump_path, NULL);
 }
 
 bool MinidumpGenerator::WriteMinidump(HANDLE process_handle,
@@ -288,7 +287,6 @@ bool MinidumpGenerator::WriteMinidump(HANDLE process_handle,
                                       DWORD requesting_thread_id,
                                       EXCEPTION_POINTERS* exception_pointers,
                                       MDRawAssertionInfo* assert_info,
-                                      CustomDataStream* custom_data_stream,
                                       MINIDUMP_TYPE dump_type,
                                       bool is_client_pointers,
                                       wstring* dump_path,
@@ -370,9 +368,9 @@ bool MinidumpGenerator::WriteMinidump(HANDLE process_handle,
     breakpad_info.requesting_thread_id = requesting_thread_id;
   }
 
-  // Leave room in user_stream_array for possible assertion info, handle
-  // operations, and custom data streams.
-  MINIDUMP_USER_STREAM user_stream_array[4];
+  // Leave room in user_stream_array for possible assertion info and handle
+  // operations streams.
+  MINIDUMP_USER_STREAM user_stream_array[3];
   user_stream_array[0].Type = MD_BREAKPAD_INFO_STREAM;
   user_stream_array[0].BufferSize = sizeof(breakpad_info);
   user_stream_array[0].Buffer = &breakpad_info;
@@ -416,16 +414,6 @@ bool MinidumpGenerator::WriteMinidump(HANDLE process_handle,
     ++user_streams.UserStreamCount;
   }
 
-  if (custom_data_stream) {
-    user_stream_array[user_streams.UserStreamCount].Type =
-        MD_CUSTOM_DATA_STREAM;
-    user_stream_array[user_streams.UserStreamCount].BufferSize =
-        static_cast<ULONG>(custom_data_stream->size);
-    user_stream_array[user_streams.UserStreamCount].Buffer =
-        custom_data_stream->stream;
-    ++user_streams.UserStreamCount;
-  }
-
   // If the process is terminated by STATUS_INVALID_HANDLE exception store
   // the trace of operatios for the offending handle value. Do nothing special
   // if the client already requested the handle trace to be stored in the dump.