import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1130096 - Convert embedding/browser/ to Gecko style. r=mccr8 (59ec06fe2)
- Bug 1179967 - Always rewrite links to absolute in nsWebBrowserPersist instead of side-effecting document. r=jst (93bf54d47)
- Bug 1155765 - Get rid of gratuitous goto from nsWebBrowserPersist::MakeFilenameFromURI(). r=smaug (ecf31fed2)
- Bug 1170334 - Re-escape entities in nsWebBrowserPersist XML stylesheet handling. r=hsivonen (e04b410a0)
- Bug 345852 - Save personal dictionary when a word is added or removed. r=ehsan (d62c40fb7)
- Bug 1133063 - Move SetLength into the if's condition. r=froydnj (bd1d03ad4)
- Bug 1165919 - [Qt] InitLayersAccelerationPrefs () crash due to missing gfxInfo. r=rojkov (e966f5aa1)
- Bug 1090448 - Add initial serialization and deserialization capabilities for nsPrintOptionsGTK. r=karlt. (34c5cca7b)
- Bug 1090439 - PPrinting calls from child to parent via ShowProgress and ShowPrintDialog should not be sync. r=smaug. (6321a2f61)
- Remove some unneeded MOZ_IMPLICITs, no bug (b884ec906)
- MOZ_FINAL -> final (cfffe033d)
- fix misspatch (77a20bcc2)
- Bug 1090448 - Add GTK-specific PrintData fields and serialization / deserialization. r=karlt. (afc2d1166)
- Bug 1109338: Part 3: Use separate proxy and UDPMessage class for PBackground r=dragana (ff1711e1e)

xpcom/io/nsScriptableBase64Encoder.cpp

@@ -17,8 +17,7 @@ nsScriptableBase64Encoder::EncodeToCString(nsIInputStream* aStream,
                                            uint32_t aLength,
                                            nsACString& aResult)
 {
-  Base64EncodeInputStream(aStream, aResult, aLength);
-  return NS_OK;
+  return Base64EncodeInputStream(aStream, aResult, aLength);
 }
 
 /* AString encodeToString (in nsIInputStream stream, in unsigned long length); */
@@ -27,6 +26,5 @@ nsScriptableBase64Encoder::EncodeToString(nsIInputStream* aStream,
                                           uint32_t aLength,
                                           nsAString& aResult)
 {
-  Base64EncodeInputStream(aStream, aResult, aLength);
-  return NS_OK;
+  return Base64EncodeInputStream(aStream, aResult, aLength);
 }