diff options
| author | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2011-11-28 19:17:41 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2011-11-28 19:17:41 +0000 |
| commit | 06c856fd6762fc886edd031aad94e6ca4b2064a5 (patch) | |
| tree | f69024e635cac4b15979d7adeacf9b0a7d3d0c05 /src/client/windows/unittests | |
| parent | Fix some comments and parameter names. (diff) | |
| download | breakpad-06c856fd6762fc886edd031aad94e6ca4b2064a5.tar.xz | |
Speculative back-out of r883, which may have broken Windows crash reporting.
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@891 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/windows/unittests')
3 files changed, 2 insertions, 8 deletions
diff --git a/src/client/windows/unittests/crash_generation_server_test.cc b/src/client/windows/unittests/crash_generation_server_test.cc index 01dda951..ce49439c 100644 --- a/src/client/windows/unittests/crash_generation_server_test.cc +++ b/src/client/windows/unittests/crash_generation_server_test.cc @@ -77,9 +77,8 @@ class CrashGenerationServerTest : public ::testing::Test { public: MOCK_METHOD1(OnClientConnected, void(const google_breakpad::ClientInfo* client_info)); - MOCK_METHOD3(OnClientDumpRequested, + MOCK_METHOD2(OnClientDumpRequested, void(const google_breakpad::ClientInfo* client_info, - const google_breakpad::CrashGenerationServer::ClientDumpRequestType request_type, const std::wstring* file_path)); MOCK_METHOD1(OnClientExited, void(const google_breakpad::ClientInfo* client_info)); @@ -177,7 +176,6 @@ class CrashGenerationServerTest : public ::testing::Test { custom_info, NULL, NULL, - NULL, NULL); DWORD bytes_count = 0; @@ -239,10 +237,9 @@ class CrashGenerationServerTest : public ::testing::Test { static void CallOnClientDumpRequested( void* context, const google_breakpad::ClientInfo* client_info, - const google_breakpad::CrashGenerationServer::ClientDumpRequestType request_type, const std::wstring* file_path) { static_cast<MockCrashGenerationServerCallbacks*>(context)-> - OnClientDumpRequested(client_info, request_type, file_path); + OnClientDumpRequested(client_info, file_path); } static void CallOnClientExited( diff --git a/src/client/windows/unittests/exception_handler_death_test.cc b/src/client/windows/unittests/exception_handler_death_test.cc index bac96def..adea044f 100644 --- a/src/client/windows/unittests/exception_handler_death_test.cc +++ b/src/client/windows/unittests/exception_handler_death_test.cc @@ -131,7 +131,6 @@ static bool gDumpCallbackCalled = false; void clientDumpCallback(void *dump_context, const google_breakpad::ClientInfo *client_info, - const google_breakpad::CrashGenerationServer::ClientDumpRequestType request_type, const std::wstring *dump_path) { gDumpCallbackCalled = true; } diff --git a/src/client/windows/unittests/exception_handler_test.cc b/src/client/windows/unittests/exception_handler_test.cc index 18aeded7..f0341880 100644 --- a/src/client/windows/unittests/exception_handler_test.cc +++ b/src/client/windows/unittests/exception_handler_test.cc @@ -78,7 +78,6 @@ class ExceptionHandlerTest : public ::testing::Test { static void ClientDumpCallback( void *dump_context, const google_breakpad::ClientInfo *client_info, - const google_breakpad::CrashGenerationServer::ClientDumpRequestType request_type, const std::wstring *dump_path); static bool DumpCallback(const wchar_t* dump_path, @@ -139,7 +138,6 @@ BOOL ExceptionHandlerTest::DoesPathExist(const TCHAR *path_name) { void ExceptionHandlerTest::ClientDumpCallback( void *dump_context, const google_breakpad::ClientInfo *client_info, - const google_breakpad::CrashGenerationServer::ClientDumpRequestType request_type, const wstring *dump_path) { dump_file = *dump_path; // Create the full dump file name from the dump path. |