Bug 1205151 - Use channel->Open2() in extensions/cookie/nsPermissionManager.cpp (r=sicking)
authorChristoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Tue, 15 Sep 2015 19:47:27 -0700
changeset 262833 840452fa48bda27169b26a24ac484f99dc7bf34f
parent 262832 b2663d8fb86aa34110a9a340e75bad3ce0388d60
child 262834 7ac8d5a59602fb39f491209226b04eb852ee1e8d
push id65125
push usermozilla@christophkerschbaumer.com
push dateWed, 16 Sep 2015 18:20:08 +0000
treeherdermozilla-inbound@710023d8a43c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssicking
bugs1205151
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1205151 - Use channel->Open2() in extensions/cookie/nsPermissionManager.cpp (r=sicking)
extensions/cookie/nsPermissionManager.cpp
--- a/extensions/cookie/nsPermissionManager.cpp
+++ b/extensions/cookie/nsPermissionManager.cpp
@@ -2631,22 +2631,22 @@ nsPermissionManager::ImportDefaults()
   nsCOMPtr<nsIURI> defaultsURI;
   nsresult rv = NS_NewURI(getter_AddRefs(defaultsURI), defaultsURL);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIChannel> channel;
   rv = NS_NewChannel(getter_AddRefs(channel),
                      defaultsURI,
                      nsContentUtils::GetSystemPrincipal(),
-                     nsILoadInfo::SEC_NORMAL,
+                     nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
                      nsIContentPolicy::TYPE_OTHER);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIInputStream> inputStream;
-  rv = channel->Open(getter_AddRefs(inputStream));
+  rv = channel->Open2(getter_AddRefs(inputStream));
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = _DoImport(inputStream, nullptr);
   inputStream->Close();
   return rv;
 }
 
 // _DoImport reads the specified stream and adds the parsed elements.  If