From 70ef6eb69ade373f191031dcd4b9a87b2df04d71 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Mon, 19 Nov 2012 20:09:11 -0500
Subject: [PATCH] Bug 812880 - Remove some static RefPtrs which were causing
 deadlocks at shutdown. r=cjones

---
 dom/system/gonk/AutoMounter.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dom/system/gonk/AutoMounter.cpp b/dom/system/gonk/AutoMounter.cpp
index c37a4948cd35..cc808d47ddfa 100644
--- a/dom/system/gonk/AutoMounter.cpp
+++ b/dom/system/gonk/AutoMounter.cpp
@@ -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()