Bug 1486147: Follow-up: Fix missing QueryInterface entries. r=bustage

--HG--
extra : rebase_source : 4ab19b5145117f9c9aef87d8d59ad7ff923e299d

modules/libjar/nsJAR.cpp

@@ -392,7 +392,8 @@ nsJAR::ReadLine(const char** src)
   return length;
 }
 
-NS_IMPL_ISUPPORTS(nsJAREnumerator, nsIUTF8StringEnumerator)
+NS_IMPL_ISUPPORTS(nsJAREnumerator, nsIUTF8StringEnumerator,
+                  nsIStringEnumerator)
 
 //----------------------------------------------
 // nsJAREnumerator::HasMore

netwerk/protocol/http/HttpBaseChannel.cpp

@@ -1457,7 +1457,8 @@ HttpBaseChannel::nsContentEncodings::GetNext(nsACString& aNextEncoding)
 // HttpBaseChannel::nsContentEncodings::nsISupports
 //-----------------------------------------------------------------------------
 
-NS_IMPL_ISUPPORTS(HttpBaseChannel::nsContentEncodings, nsIUTF8StringEnumerator)
+NS_IMPL_ISUPPORTS(HttpBaseChannel::nsContentEncodings, nsIUTF8StringEnumerator,
+                  nsIStringEnumerator)
 
 //-----------------------------------------------------------------------------
 // HttpBaseChannel::nsContentEncodings <private>

toolkit/system/gnome/nsGIOService.cpp

@@ -282,7 +282,8 @@ public:
   uint32_t            mIndex;
 };
 
-NS_IMPL_ISUPPORTS(GIOUTF8StringEnumerator, nsIUTF8StringEnumerator)
+NS_IMPL_ISUPPORTS(GIOUTF8StringEnumerator, nsIUTF8StringEnumerator,
+                  nsIStringEnumerator)
 
 NS_IMETHODIMP
 GIOUTF8StringEnumerator::HasMore(bool* aResult)

xpcom/components/nsCategoryManager.cpp

@@ -92,7 +92,8 @@ protected:
 };
 
 NS_IMPL_ISUPPORTS_INHERITED(CategoryEnumerator, nsSimpleEnumerator,
-                            nsIUTF8StringEnumerator)
+                            nsIUTF8StringEnumerator,
+                            nsIStringEnumerator)
 
 NS_IMETHODIMP
 CategoryEnumerator::HasMoreElements(bool* aResult)

xpcom/ds/nsStringEnumerator.cpp

@@ -27,7 +27,9 @@ class JSStringEnumerator final : public nsIJSEnumerator
 
   explicit JSStringEnumerator(nsIStringEnumerator* aEnumerator)
     : mEnumerator(do_QueryInterface(aEnumerator))
-  {}
+  {
+    MOZ_ASSERT(mEnumerator);
+  }
 
 private:
   ~JSStringEnumerator() = default;