diff --git a/widget/ContentCache.h b/widget/ContentCache.h
index a3710fcdd4a4..0849bdc125a1 100644
--- a/widget/ContentCache.h
+++ b/widget/ContentCache.h
@@ -35,7 +35,7 @@ class BrowserParent;
 
 class ContentCache {
  public:
-  typedef InfallibleTArray<LayoutDeviceIntRect> RectArray;
+  typedef nsTArray<LayoutDeviceIntRect> RectArray;
   typedef widget::IMENotification IMENotification;
 
   ContentCache();
diff --git a/widget/nsBaseFilePicker.h b/widget/nsBaseFilePicker.h
index 2fbd03b143c4..9b96a31562a3 100644
--- a/widget/nsBaseFilePicker.h
+++ b/widget/nsBaseFilePicker.h
@@ -59,7 +59,7 @@ class nsBaseFilePicker : public nsIFilePicker {
   nsCOMPtr<nsPIDOMWindowOuter> mParent;
   int16_t mMode;
   nsString mOkButtonLabel;
-  InfallibleTArray<nsString> mRawFilters;
+  nsTArray<nsString> mRawFilters;
 };
 
 #endif  // nsBaseFilePicker_h__
diff --git a/widget/nsFilePickerProxy.cpp b/widget/nsFilePickerProxy.cpp
index f4c7d4c79605..5522952be9eb 100644
--- a/widget/nsFilePickerProxy.cpp
+++ b/widget/nsFilePickerProxy.cpp
@@ -134,7 +134,7 @@ nsFilePickerProxy::Open(nsIFilePickerShownCallback* aCallback) {
 mozilla::ipc::IPCResult nsFilePickerProxy::Recv__delete__(
     const MaybeInputData& aData, const int16_t& aResult) {
   if (aData.type() == MaybeInputData::TInputBlobs) {
-    const InfallibleTArray<IPCBlob>& blobs = aData.get_InputBlobs().blobs();
+    const nsTArray<IPCBlob>& blobs = aData.get_InputBlobs().blobs();
     for (uint32_t i = 0; i < blobs.Length(); ++i) {
       RefPtr<BlobImpl> blobImpl = IPCBlobUtils::Deserialize(blobs[i]);
       NS_ENSURE_TRUE(blobImpl, IPC_OK());
diff --git a/widget/nsFilePickerProxy.h b/widget/nsFilePickerProxy.h
index 35f5f9916bf0..2402608bcf5c 100644
--- a/widget/nsFilePickerProxy.h
+++ b/widget/nsFilePickerProxy.h
@@ -74,8 +74,8 @@ class nsFilePickerProxy : public nsBaseFilePicker,
 
   bool mIPCActive;
 
-  InfallibleTArray<nsString> mFilters;
-  InfallibleTArray<nsString> mFilterNames;
+  nsTArray<nsString> mFilters;
+  nsTArray<nsString> mFilterNames;
 };
 
 #endif  // NSFILEPICKERPROXY_H
diff --git a/widget/windows/IMMHandler.h b/widget/windows/IMMHandler.h
index 848e9fe3372e..844c342c3245 100644
--- a/widget/windows/IMMHandler.h
+++ b/widget/windows/IMMHandler.h
@@ -391,8 +391,8 @@ class IMMHandler final {
   nsWindow* mComposingWindow;
   RefPtr<TextEventDispatcher> mDispatcher;
   nsString mCompositionString;
-  InfallibleTArray<uint32_t> mClauseArray;
-  InfallibleTArray<uint8_t> mAttributeArray;
+  nsTArray<uint32_t> mClauseArray;
+  nsTArray<uint8_t> mAttributeArray;
 
   int32_t mCursorPosition;
   uint32_t mCompositionStart;