Bug 812880 - Remove some static RefPtrs which were causing deadlocks at shutdown. r=cjones

This commit is contained in:
Justin Lebar 2012-11-19 20:09:11 -05:00
parent ada22bb4e7
commit 98407c7f6c

View File

@ -22,6 +22,7 @@
#include "base/message_loop.h"
#include "mozilla/FileUtils.h"
#include "mozilla/Hal.h"
#include "mozilla/StaticPtr.h"
#include "nsAutoPtr.h"
#include "nsMemory.h"
#include "nsString.h"
@ -285,7 +286,7 @@ private:
VolumeArray mAutoVolume;
};
static RefPtr<AutoMounter> sAutoMounter;
static StaticRefPtr<AutoMounter> sAutoMounter;
/***************************************************************************/
@ -524,8 +525,8 @@ public:
}
};
static RefPtr<UsbCableObserver> sUsbCableObserver;
static RefPtr<AutoMounterSetting> sAutoMounterSetting;
static StaticRefPtr<UsbCableObserver> sUsbCableObserver;
static StaticRefPtr<AutoMounterSetting> sAutoMounterSetting;
void
InitAutoMounter()