Backed out changeset af41c2ddcb5a (bug 1278929) for bustage on a CLOSED TREE

accessible/base/AccIterator.cpp

@@ -96,8 +96,7 @@ RelatedAccIterator::Next()
     return nullptr;
 
   while (mIndex < mProviders->Length()) {
-    const std::unique_ptr<DocAccessible::AttrRelProvider>& provider =
-      (*mProviders)[mIndex++];
+    DocAccessible::AttrRelProvider* provider = (*mProviders)[mIndex++];
 
     // Return related accessible for the given attribute and if the provider
     // content is in the same binding in the case of XBL usage.

accessible/generic/DocAccessible.cpp

@@ -120,7 +120,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(DocAccessible, Accessible)
       NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(
         cb, "content of dependent ids hash entry of document accessible");
 
-      AttrRelProvider* provider = (*providers)[jdx].get();
+      AttrRelProvider* provider = (*providers)[jdx];
       cb.NoteXPCOMChild(provider->mContent);
 
       NS_ASSERTION(provider->mContent->IsInUncomposedDoc(),
@@ -1571,10 +1571,10 @@ DocAccessible::RemoveDependentIDsFor(Accessible* aRelProvider,
       AttrRelProviderArray* providers = mDependentIDsHash.Get(id);
       if (providers) {
         for (uint32_t jdx = 0; jdx < providers->Length(); ) {
-          const std::unique_ptr<AttrRelProvider>& provider = (*providers)[jdx];
+          AttrRelProvider* provider = (*providers)[jdx];
           if (provider->mRelAttr == relAttr &&
               provider->mContent == relProviderElm)
-            providers->RemoveElementAt(jdx);
+            providers->RemoveElement(provider);
           else
             jdx++;
         }

accessible/generic/DocAccessible.h

@@ -11,7 +11,7 @@
 #include "HyperTextAccessibleWrap.h"
 #include "AccEvent.h"
 
-#include <memory>
+#include "nsAutoPtr.h"
 #include "nsClassHashtable.h"
 #include "nsDataHashtable.h"
 #include "nsIDocument.h"
@@ -671,7 +671,7 @@ protected:
   /**
    * The cache of IDs pointed by relation attributes.
    */
-  typedef nsTArray<std::unique_ptr<AttrRelProvider>> AttrRelProviderArray;
+  typedef nsTArray<nsAutoPtr<AttrRelProvider> > AttrRelProviderArray;
   nsClassHashtable<nsStringHashKey, AttrRelProviderArray>
     mDependentIDsHash;