diff --git a/mozilla/docshell/base/nsDefaultURIFixup.cpp b/mozilla/docshell/base/nsDefaultURIFixup.cpp
index be864e08bd5..59f9d015fa9 100644
--- a/mozilla/docshell/base/nsDefaultURIFixup.cpp
+++ b/mozilla/docshell/base/nsDefaultURIFixup.cpp
@@ -205,7 +205,7 @@ nsresult nsDefaultURIFixup::ConvertFileToStringURI(nsString& aIn,
           ConvertStringURIToFileCharset(aIn, file);
         }
 
-        nsresult rv = NS_NewLocalFile(file, PR_FALSE, getter_AddRefs(filePath));
+        nsresult rv = NS_NewLocalFile(file.get(), PR_FALSE, getter_AddRefs(filePath));
         if (NS_SUCCEEDED(rv))
         {
             nsXPIDLCString fileurl;
diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index f51ff23e93f..989ab9e1e86 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -786,7 +786,7 @@ nsWebShell::HandleLinkClickEvent(nsIContent *aContent,
             NS_ASSERTION(NS_SUCCEEDED(rv), "can't create simple uri");
             if (NS_SUCCEEDED(rv))
             {
-                rv = uri->SetSpec(spec);
+                rv = uri->SetSpec(spec.get());
                 NS_ASSERTION(NS_SUCCEEDED(rv), "spec is invalid");
                 if (NS_SUCCEEDED(rv))
                 {
diff --git a/mozilla/layout/base/nsPresContext.cpp b/mozilla/layout/base/nsPresContext.cpp
index c734d0f7f7d..c89472447c2 100644
--- a/mozilla/layout/base/nsPresContext.cpp
+++ b/mozilla/layout/base/nsPresContext.cpp
@@ -361,7 +361,7 @@ nsPresContext::GetFontPreferences()
     // get font.size.[generic].[langGroup]
     // size=0 means 'Auto', i.e., generic fonts retain the size of the variable font
     MAKE_FONT_PREF_KEY(pref, "font.size", generic_dot_langGroup);
-    rv = mPrefs->GetIntPref(pref, &size);
+    rv = mPrefs->GetIntPref(pref.get(), &size);
     if (NS_SUCCEEDED(rv) && size > 0) {
       if (unit == eUnit_px) {
         font->size = NSFloatPixelsToTwips((float)size, p2t);
diff --git a/mozilla/layout/base/src/nsPresContext.cpp b/mozilla/layout/base/src/nsPresContext.cpp
index c734d0f7f7d..c89472447c2 100644
--- a/mozilla/layout/base/src/nsPresContext.cpp
+++ b/mozilla/layout/base/src/nsPresContext.cpp
@@ -361,7 +361,7 @@ nsPresContext::GetFontPreferences()
     // get font.size.[generic].[langGroup]
     // size=0 means 'Auto', i.e., generic fonts retain the size of the variable font
     MAKE_FONT_PREF_KEY(pref, "font.size", generic_dot_langGroup);
-    rv = mPrefs->GetIntPref(pref, &size);
+    rv = mPrefs->GetIntPref(pref.get(), &size);
     if (NS_SUCCEEDED(rv) && size > 0) {
       if (unit == eUnit_px) {
         font->size = NSFloatPixelsToTwips((float)size, p2t);