corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1099296 - Attach LoadInfo to remaining callers of ioService and ProtocolHandlers - in extensions/ (r=ehsan)

Browse Source
This commit is contained in:
Christoph Kerschbaumer
2015-02-17 10:09:16 -08:00
parent eaea5361d1
commit 53d0e29ca5
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/cookie/nsPermissionManager.cpp
View File

@@ -1895,18 +1895,16 @@ nsPermissionManager::ImportDefaults()
return NS_OK; return NS_OK;
} }
nsresult rv;
nsCOMPtr<nsIIOService> ioservice =
do_GetService("@mozilla.org/network/io-service;1", &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIURI> defaultsURI; nsCOMPtr<nsIURI> defaultsURI;
rv = NS_NewURI(getter_AddRefs(defaultsURI), defaultsURL, nsresult rv = NS_NewURI(getter_AddRefs(defaultsURI), defaultsURL);
nullptr, nullptr, ioservice);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIChannel> channel; nsCOMPtr<nsIChannel> 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); NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIInputStream> inputStream; nsCOMPtr<nsIInputStream> inputStream;

22
extensions/pref/autoconfig/src/nsReadConfig.cpp
View File

@@ -24,6 +24,7 @@
#include "nsCRT.h" #include "nsCRT.h"
#include "nspr.h" #include "nspr.h"
#include "nsXULAppAPI.h" #include "nsXULAppAPI.h"
#include "nsContentUtils.h"
extern PRLogModuleInfo *MCD; extern PRLogModuleInfo *MCD;
@@ -253,26 +254,23 @@ nsresult nsReadConfig::openAndEvaluateJSFile(const char *aFileName, int32_t obsc
return rv; return rv;
} else { } else {
nsCOMPtr<nsIIOService> ioService = do_GetIOService(&rv);
if (NS_FAILED(rv))
return rv;
nsAutoCString location("resource://gre/defaults/autoconfig/"); nsAutoCString location("resource://gre/defaults/autoconfig/");
location += aFileName; location += aFileName;
nsCOMPtr<nsIURI> uri; nsCOMPtr<nsIURI> uri;
rv = ioService->NewURI(location, nullptr, nullptr, getter_AddRefs(uri)); rv = NS_NewURI(getter_AddRefs(uri), location);
if (NS_FAILED(rv)) NS_ENSURE_SUCCESS(rv, rv);
return rv;
nsCOMPtr<nsIChannel> channel; nsCOMPtr<nsIChannel> channel;
rv = ioService->NewChannelFromURI(uri, getter_AddRefs(channel)); rv = NS_NewChannel(getter_AddRefs(channel),
if (NS_FAILED(rv)) uri,
return rv; nsContentUtils::GetSystemPrincipal(),
nsILoadInfo::SEC_NORMAL,
nsIContentPolicy::TYPE_OTHER);
NS_ENSURE_SUCCESS(rv, rv);
rv = channel->Open(getter_AddRefs(inStr)); rv = channel->Open(getter_AddRefs(inStr));
if (NS_FAILED(rv)) NS_ENSURE_SUCCESS(rv, rv);
return rv;
} }
uint64_t fs64; uint64_t fs64;