Sync up branch and trunk

browser/components/places/src/nsFaviconService.cpp

@@ -680,7 +680,10 @@ FaviconLoadListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
     nsCOMPtr<nsIContentSniffer> sniffer = do_GetService(snifferCID.get(), &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    sniffer->GetMIMETypeFromContent(aRequest,
+    sniffer->GetMIMETypeFromContent(
+#ifndef MOZILLA_1_8_BRANCH
+               aRequest,
+#endif
                NS_REINTERPRET_CAST(PRUint8*, NS_CONST_CAST(char*, mData.get())),
                mData.Length(), mimeType);
     // ignore errors: mime type will be left empty and we'll try the next sniffer