diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp index d53de885d3ce..99561abcdd10 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -1895,18 +1895,16 @@ nsPermissionManager::ImportDefaults() return NS_OK; } - nsresult rv; - nsCOMPtr ioservice = - do_GetService("@mozilla.org/network/io-service;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - nsCOMPtr defaultsURI; - rv = NS_NewURI(getter_AddRefs(defaultsURI), defaultsURL, - nullptr, nullptr, ioservice); + nsresult rv = NS_NewURI(getter_AddRefs(defaultsURI), defaultsURL); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr channel; - rv = ioservice->NewChannelFromURI(defaultsURI, getter_AddRefs(channel)); + rv = NS_NewChannel(getter_AddRefs(channel), + defaultsURI, + nsContentUtils::GetSystemPrincipal(), + nsILoadInfo::SEC_NORMAL, + nsIContentPolicy::TYPE_OTHER); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr inputStream; diff --git a/extensions/pref/autoconfig/src/nsReadConfig.cpp b/extensions/pref/autoconfig/src/nsReadConfig.cpp index c2621321f073..85a0c148ad72 100644 --- a/extensions/pref/autoconfig/src/nsReadConfig.cpp +++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp @@ -24,6 +24,7 @@ #include "nsCRT.h" #include "nspr.h" #include "nsXULAppAPI.h" +#include "nsContentUtils.h" extern PRLogModuleInfo *MCD; @@ -253,26 +254,23 @@ nsresult nsReadConfig::openAndEvaluateJSFile(const char *aFileName, int32_t obsc return rv; } else { - nsCOMPtr ioService = do_GetIOService(&rv); - if (NS_FAILED(rv)) - return rv; - nsAutoCString location("resource://gre/defaults/autoconfig/"); location += aFileName; nsCOMPtr uri; - rv = ioService->NewURI(location, nullptr, nullptr, getter_AddRefs(uri)); - if (NS_FAILED(rv)) - return rv; + rv = NS_NewURI(getter_AddRefs(uri), location); + NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr channel; - rv = ioService->NewChannelFromURI(uri, getter_AddRefs(channel)); - if (NS_FAILED(rv)) - return rv; + rv = NS_NewChannel(getter_AddRefs(channel), + uri, + nsContentUtils::GetSystemPrincipal(), + nsILoadInfo::SEC_NORMAL, + nsIContentPolicy::TYPE_OTHER); + NS_ENSURE_SUCCESS(rv, rv); rv = channel->Open(getter_AddRefs(inStr)); - if (NS_FAILED(rv)) - return rv; + NS_ENSURE_SUCCESS(rv, rv); } uint64_t fs64;