From 53e1f836f45a4558c1e01dd3aca7040e149e6e6f Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Mon, 26 Jan 2015 09:28:15 -0800
Subject: [PATCH] Bug 1124268, part 1 - Take advantage of the infallibility of
 nsContentUtils::GetSameOriginChecker(). r=smaug

---
 dom/base/nsContentUtils.cpp | 2 +-
 dom/base/nsDocument.cpp     | 1 -
 dom/xbl/nsXBLService.cpp    | 1 -
 dom/xml/XMLDocument.cpp     | 4 ----
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index fc02c48a29f..43bcedf80a3 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -5652,7 +5652,7 @@ nsContentUtils::GetSameOriginChecker()
 {
   if (!sSameOriginChecker) {
     sSameOriginChecker = new SameOriginChecker();
-    NS_IF_ADDREF(sSameOriginChecker);
+    NS_ADDREF(sSameOriginChecker);
   }
   return sSameOriginChecker;
 }
diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp
index 6864a643617..998e9acf985 100644
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -1338,7 +1338,6 @@ nsExternalResourceMap::PendingLoad::StartLoad(nsIURI* aURI,
   nsIDocument* doc = aRequestingNode->OwnerDoc();
 
   nsCOMPtr<nsIInterfaceRequestor> req = nsContentUtils::GetSameOriginChecker();
-  NS_ENSURE_TRUE(req, NS_ERROR_OUT_OF_MEMORY);
 
   nsCOMPtr<nsILoadGroup> loadGroup = doc->GetDocumentLoadGroup();
   nsCOMPtr<nsIChannel> channel;
diff --git a/dom/xbl/nsXBLService.cpp b/dom/xbl/nsXBLService.cpp
index fbe03eb244a..f472cecaa4a 100644
--- a/dom/xbl/nsXBLService.cpp
+++ b/dom/xbl/nsXBLService.cpp
@@ -1101,7 +1101,6 @@ nsXBLService::FetchBindingDocument(nsIContent* aBoundElement, nsIDocument* aBoun
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIInterfaceRequestor> sameOriginChecker = nsContentUtils::GetSameOriginChecker();
-  NS_ENSURE_TRUE(sameOriginChecker, NS_ERROR_OUT_OF_MEMORY);
 
   channel->SetNotificationCallbacks(sameOriginChecker);
 
diff --git a/dom/xml/XMLDocument.cpp b/dom/xml/XMLDocument.cpp
index eb916aa175d..92ba3b832e7 100644
--- a/dom/xml/XMLDocument.cpp
+++ b/dom/xml/XMLDocument.cpp
@@ -435,10 +435,6 @@ XMLDocument::Load(const nsAString& aUrl, ErrorResult& aRv)
 
   // Create a channel
   nsCOMPtr<nsIInterfaceRequestor> req = nsContentUtils::GetSameOriginChecker();
-  if (!req) {
-    aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
-    return false;
-  }
 
   nsCOMPtr<nsIChannel> channel;
   // nsIRequest::LOAD_BACKGROUND prevents throbber from becoming active,