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
This commit is contained in:
mark@chromium.org
2011-11-28 19:17:41 +00:00
parent 29138814cc
commit 06c856fd67
13 changed files with 4 additions and 208 deletions

View File

@@ -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(

View File

@@ -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;
}

View File

@@ -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.