diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
index 83f1ca47eed..1b1e7a66771 100644
--- a/dom/plugins/base/nsPluginStreamListenerPeer.cpp
+++ b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
@@ -27,6 +27,7 @@
 #include "nsPluginNativeWindow.h"
 #include "GeckoProfiler.h"
 #include "nsPluginInstanceOwner.h"
+#include "nsDataHashtable.h"
 
 #define MAGIC_REQUEST_CONTEXT 0x01020304
 
@@ -241,28 +242,6 @@ nsPluginByteRangeStreamListener::GetInterface(const nsIID& aIID, void** result)
 
   return finalStreamListener->GetInterface(aIID, result);
 }
-    
-
-// nsPRUintKey
-
-class nsPRUintKey : public nsHashKey {
-protected:
-  uint32_t mKey;
-public:
-  nsPRUintKey(uint32_t key) : mKey(key) {}
-  
-  uint32_t HashCode() const {
-    return mKey;
-  }
-  
-  bool Equals(const nsHashKey *aKey) const {
-    return mKey == ((const nsPRUintKey*)aKey)->mKey;
-  }
-  nsHashKey *Clone() const {
-    return new nsPRUintKey(mKey);
-  }
-  uint32_t GetValue() { return mKey; }
-};
 
 // nsPluginStreamListenerPeer
 
@@ -350,7 +329,7 @@ nsresult nsPluginStreamListenerPeer::Initialize(nsIURI *aURL,
 
   mPendingRequests = 1;
 
-  mDataForwardToRequest = new nsHashtable();
+  mDataForwardToRequest = new nsDataHashtable<nsUint32HashKey, uint32_t>();
 
   return NS_OK;
 }
@@ -841,10 +820,8 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(nsIRequest *request,
       //
       // Why couldn't this be tracked on the plugin info, and not in a
       // *hash table*?
-      nsPRUintKey key(absoluteOffset);
-      int32_t amtForwardToPlugin =
-      NS_PTR_TO_INT32(mDataForwardToRequest->Get(&key));
-      mDataForwardToRequest->Put(&key, NS_INT32_TO_PTR(amtForwardToPlugin + aLength));
+      int32_t amtForwardToPlugin = mDataForwardToRequest->Get(absoluteOffset);
+      mDataForwardToRequest->Put(absoluteOffset, (amtForwardToPlugin + aLength));
       
       SetStreamOffset(absoluteOffset + amtForwardToPlugin);
     }
@@ -913,11 +890,9 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request,
     brr->GetStartRange(&absoluteOffset64);
     // XXX support 64-bit offsets
     int32_t absoluteOffset = (int32_t)int64_t(absoluteOffset64);
-    
-    nsPRUintKey key(absoluteOffset);
-    
+
     // remove the request from our data forwarding count hash.
-    mDataForwardToRequest->Remove(&key);
+    mDataForwardToRequest->Remove(absoluteOffset);
     
     
     PLUGIN_LOG(PLUGIN_LOG_NOISY,
diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.h b/dom/plugins/base/nsPluginStreamListenerPeer.h
index 939c763c74c..04656686e1d 100644
--- a/dom/plugins/base/nsPluginStreamListenerPeer.h
+++ b/dom/plugins/base/nsPluginStreamListenerPeer.h
@@ -13,7 +13,8 @@
 #include "nsIHttpHeaderVisitor.h"
 #include "nsWeakReference.h"
 #include "nsNPAPIPluginStreamListener.h"
-#include "nsHashtable.h"
+#include "nsDataHashtable.h"
+#include "nsHashKeys.h"
 #include "nsNPAPIPluginInstance.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIChannelEventSink.h"
@@ -154,7 +155,7 @@ private:
   // or plugin asks stream as file and it expects file extension until bug 90558 got fixed
   nsRefPtr<CachedFileHolder> mLocalCachedFileHolder;
   nsCOMPtr<nsIOutputStream> mFileCacheOutputStream;
-  nsHashtable             *mDataForwardToRequest;
+  nsDataHashtable<nsUint32HashKey, uint32_t>* mDataForwardToRequest;
   
   nsCString mContentType;
   bool mSeekable;