Backed out changeset a1fb4230b8b8 (bug 1034916) for non-unified bustage.

CLOSED TREE

intl/uconv/nsUTF8ConverterService.h

@@ -9,14 +9,22 @@
 
 //==============================================================
 
+class nsUTF8ConverterService;
+
+namespace mozilla {
+template<>
+struct HasDangerousPublicDestructor<nsUTF8ConverterService>
+{
+  static const bool value = true;
+};
+}
+
 class nsUTF8ConverterService: public nsIUTF8ConverterService {
-public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIUTF8CONVERTERSERVICE
 
+public:
   nsUTF8ConverterService() {}
-
-private:
   virtual ~nsUTF8ConverterService() {}
 };
 

netwerk/cookie/nsCookie.cpp

@@ -80,9 +80,9 @@ nsCookie::Create(const nsACString &aName,
 {
   // Ensure mValue contains a valid UTF-8 sequence. Otherwise XPConnect will
   // truncate the string after the first invalid octet.
-  nsRefPtr<nsUTF8ConverterService> converter = new nsUTF8ConverterService();
+  nsUTF8ConverterService converter;
   nsAutoCString aUTF8Value;
-  converter->ConvertStringToUTF8(aValue, "UTF-8", false, true, 1, aUTF8Value);
+  converter.ConvertStringToUTF8(aValue, "UTF-8", false, true, 1, aUTF8Value);
 
   // find the required string buffer size, adding 4 for the terminating nulls
   const uint32_t stringLength = aName.Length() + aUTF8Value.Length() +