Bug 944913 - Partial revert of a41081c1026c due to build bustage.

This commit is contained in:
Jacek Caban 2013-12-03 16:35:11 +01:00
parent f1bc13f4ff
commit 8289445c70

View File

@ -871,7 +871,7 @@ nsresult SetExceptionHandler(nsIFile* aXREDirectory,
nsString crashReporterPath_temp;
exePath->GetPath(crashReporterPath_temp);
crashReporterPath = reinterpret_cast<wchar_t*>(ToNewUnicode(crashReporterPath_temp));
crashReporterPath = ToNewUnicode(crashReporterPath_temp);
#elif !defined(__ANDROID__)
nsCString crashReporterPath_temp;
@ -1098,7 +1098,7 @@ nsresult SetMinidumpPath(const nsAString& aPath)
#ifndef XP_LINUX
gExceptionHandler->set_dump_path(
char16ptr_t(CONVERT_UTF16_TO_XP_CHAR(aPath).BeginReading()));
CONVERT_UTF16_TO_XP_CHAR(aPath).BeginReading());
#else
gExceptionHandler->set_minidump_descriptor(
MinidumpDescriptor(CONVERT_UTF16_TO_XP_CHAR(aPath).BeginReading()));
@ -1922,7 +1922,7 @@ FindPendingDir()
#ifdef XP_WIN
nsString path;
pendingDir->GetPath(path);
pendingDirectory = reinterpret_cast<wchar_t*>(ToNewUnicode(path));
pendingDirectory = ToNewUnicode(path);
#else
nsCString path;
pendingDir->GetNativePath(path);
@ -2503,7 +2503,7 @@ SetRemoteExceptionHandler(const nsACString& crashPipe)
nullptr, // no callback context
google_breakpad::ExceptionHandler::HANDLER_ALL,
MiniDumpNormal,
NS_ConvertASCIItoUTF16(crashPipe).get(),
NS_ConvertASCIItoUTF16(crashPipe).BeginReading(),
nullptr);
#ifdef XP_WIN
gExceptionHandler->set_handle_debug_exceptions(true);