diff --git a/mozilla/content/base/public/nsContentUtils.h b/mozilla/content/base/public/nsContentUtils.h
index 05c65c41b94..a13cf1ef63a 100644
--- a/mozilla/content/base/public/nsContentUtils.h
+++ b/mozilla/content/base/public/nsContentUtils.h
@@ -251,14 +251,14 @@ public:
   // element.
   static PRBool InProlog(nsIDOMNode *aNode);
 
-  static nsIParserService* GetParserServiceWeakRef();
+  static nsIParserService* GetParserService();
 
-  static nsINameSpaceManager* GetNSManagerWeakRef()
+  static nsINameSpaceManager* NameSpaceManager()
   {
     return sNameSpaceManager;
   }
 
-  static nsIIOService* GetIOServiceWeakRef()
+  static nsIIOService* GetIOService()
   {
     return sIOService;
   }
@@ -269,10 +269,10 @@ public:
   }
 
 #ifdef MOZ_XTF
-  static nsIXTFService* GetXTFServiceWeakRef();
+  static nsIXTFService* GetXTFService();
 #endif
 
-  static nsIScriptSecurityManager* GetSecurityManager()
+  static nsIScriptSecurityManager* SecurityManager()
   {
     return sSecurityManager;
   }
@@ -339,12 +339,12 @@ public:
     return sPrefBranch;
   }
 
-  static nsILineBreaker* GetLineBreaker()
+  static nsILineBreaker* LineBreaker()
   {
     return sLineBreaker;
   }
 
-  static nsIWordBreaker* GetWordBreaker()
+  static nsIWordBreaker* WordBreaker()
   {
     return sWordBreaker;
   }
diff --git a/mozilla/content/base/src/mozSanitizingSerializer.cpp b/mozilla/content/base/src/mozSanitizingSerializer.cpp
index 97e84a3bd20..53ef0152e46 100644
--- a/mozilla/content/base/src/mozSanitizingSerializer.cpp
+++ b/mozilla/content/base/src/mozSanitizingSerializer.cpp
@@ -124,8 +124,7 @@ NS_IMETHODIMP
 mozSanitizingHTMLSerializer::Init(PRUint32 aFlags, PRUint32 dummy,
                                   const char* aCharSet, PRBool aIsCopying)
 {
-  NS_ENSURE_TRUE(nsContentUtils::GetParserServiceWeakRef(),
-                 NS_ERROR_UNEXPECTED);
+  NS_ENSURE_TRUE(nsContentUtils::GetParserService(), NS_ERROR_UNEXPECTED);
 
   return NS_OK;
 }
@@ -190,7 +189,7 @@ mozSanitizingHTMLSerializer::IsContainer(PRInt32 aId)
 {
   PRBool isContainer = PR_FALSE;
 
-  nsIParserService* parserService = nsContentUtils::GetParserServiceWeakRef();
+  nsIParserService* parserService = nsContentUtils::GetParserService();
   if (parserService) {
     parserService->IsContainer(aId, isContainer);
   }
@@ -214,7 +213,7 @@ mozSanitizingHTMLSerializer::GetIdForContent(nsIContent* aContent)
     return eHTMLTag_unknown;
   }
 
-  nsIParserService* parserService = nsContentUtils::GetParserServiceWeakRef();
+  nsIParserService* parserService = nsContentUtils::GetParserService();
 
   return parserService ? parserService->HTMLAtomTagToId(aContent->Tag()) :
                          eHTMLTag_unknown;
@@ -441,8 +440,7 @@ mozSanitizingHTMLSerializer::DoOpenContainer(PRInt32 aTag)
 
   if (IsAllowedTag(type))
   {
-    nsIParserService* parserService =
-      nsContentUtils::GetParserServiceWeakRef();
+    nsIParserService* parserService = nsContentUtils::GetParserService();
     if (!parserService)
       return NS_ERROR_OUT_OF_MEMORY;
     const PRUnichar* tag_name = parserService->HTMLIdToStringTag(aTag);
@@ -488,8 +486,7 @@ mozSanitizingHTMLSerializer::DoCloseContainer(PRInt32 aTag)
   eHTMLTags type = (eHTMLTags)aTag;
 
   if (IsAllowedTag(type)) {
-    nsIParserService* parserService =
-      nsContentUtils::GetParserServiceWeakRef();
+    nsIParserService* parserService = nsContentUtils::GetParserService();
     if (!parserService)
       return NS_ERROR_OUT_OF_MEMORY;
     const PRUnichar* tag_name = parserService->HTMLIdToStringTag(aTag);
@@ -699,7 +696,7 @@ mozSanitizingHTMLSerializer::ParsePrefs(const nsAString& aPref)
 nsresult
 mozSanitizingHTMLSerializer::ParseTagPref(const nsCAutoString& tagpref)
 {
-  nsIParserService* parserService = nsContentUtils::GetParserServiceWeakRef();
+  nsIParserService* parserService = nsContentUtils::GetParserService();
   if (!parserService)
     return NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/mozilla/content/base/src/nsContentAreaDragDrop.cpp b/mozilla/content/base/src/nsContentAreaDragDrop.cpp
index a94076bd7fb..4683547d62a 100644
--- a/mozilla/content/base/src/nsContentAreaDragDrop.cpp
+++ b/mozilla/content/base/src/nsContentAreaDragDrop.cpp
@@ -574,7 +574,7 @@ nsContentAreaDragDrop::DragDrop(nsIDOMEvent* inMouseEvent)
           nsCAutoString sourceUriStr;
           sourceUri->GetSpec(sourceUriStr);
 
-          rv = nsContentUtils::GetSecurityManager()->
+          rv = nsContentUtils::SecurityManager()->
             CheckLoadURIStr(sourceUriStr, NS_ConvertUTF16toUTF8(url),
                             nsIScriptSecurityManager::STANDARD);
 
diff --git a/mozilla/content/base/src/nsContentSink.cpp b/mozilla/content/base/src/nsContentSink.cpp
index 86ee05c3431..3d0c62d1982 100644
--- a/mozilla/content/base/src/nsContentSink.cpp
+++ b/mozilla/content/base/src/nsContentSink.cpp
@@ -334,7 +334,7 @@ nsContentSink::ProcessHeaderData(nsIAtom* aHeader, const nsAString& aValue,
     }
 
     nsCOMPtr<nsIPrincipal> systemPrincipal;
-    nsContentUtils::GetSecurityManager()->
+    nsContentUtils::SecurityManager()->
       GetSystemPrincipal(getter_AddRefs(systemPrincipal));
     NS_ASSERTION(systemPrincipal, "No system principal");
     
diff --git a/mozilla/content/base/src/nsContentUtils.cpp b/mozilla/content/base/src/nsContentUtils.cpp
index f44a5f97a99..97742b7f137 100644
--- a/mozilla/content/base/src/nsContentUtils.cpp
+++ b/mozilla/content/base/src/nsContentUtils.cpp
@@ -121,28 +121,28 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
 #include "nsIConsoleService.h"
 
 static const char kJSStackContractID[] = "@mozilla.org/js/xpc/ContextStack;1";
-static NS_DEFINE_IID(kParserServiceCID, NS_PARSERSERVICE_CID);
+static NS_DEFINE_CID(kParserServiceCID, NS_PARSERSERVICE_CID);
 
 nsIDOMScriptObjectFactory *nsContentUtils::sDOMScriptObjectFactory = nsnull;
-nsIXPConnect *nsContentUtils::sXPConnect = nsnull;
-nsIScriptSecurityManager *nsContentUtils::sSecurityManager = nsnull;
-nsIThreadJSContextStack *nsContentUtils::sThreadJSContextStack = nsnull;
+nsIXPConnect *nsContentUtils::sXPConnect;
+nsIScriptSecurityManager *nsContentUtils::sSecurityManager;
+nsIThreadJSContextStack *nsContentUtils::sThreadJSContextStack;
 nsIParserService *nsContentUtils::sParserService = nsnull;
-nsINameSpaceManager *nsContentUtils::sNameSpaceManager = nsnull;
-nsIIOService *nsContentUtils::sIOService = nsnull;
+nsINameSpaceManager *nsContentUtils::sNameSpaceManager;
+nsIIOService *nsContentUtils::sIOService;
 #ifdef MOZ_XTF
 nsIXTFService *nsContentUtils::sXTFService = nsnull;
 #endif
 nsIPrefBranch *nsContentUtils::sPrefBranch = nsnull;
 nsIPref *nsContentUtils::sPref = nsnull;
-imgILoader *nsContentUtils::sImgLoader = nsnull;
+imgILoader *nsContentUtils::sImgLoader;
 nsIConsoleService *nsContentUtils::sConsoleService;
 nsIStringBundleService *nsContentUtils::sStringBundleService;
 nsIStringBundle *nsContentUtils::sStringBundles[PropertiesFile_COUNT];
 nsIContentPolicy *nsContentUtils::sContentPolicyService;
 PRBool nsContentUtils::sTriedToGetContentPolicy = PR_FALSE;
-nsILineBreaker *nsContentUtils::sLineBreaker = nsnull;
-nsIWordBreaker *nsContentUtils::sWordBreaker = nsnull;
+nsILineBreaker *nsContentUtils::sLineBreaker;
+nsIWordBreaker *nsContentUtils::sWordBreaker;
 nsIEventQueueService *nsContentUtils::sEventQueueService;
 nsVoidArray *nsContentUtils::sPtrsToPtrsToRelease;
 
@@ -179,12 +179,7 @@ nsContentUtils::Init()
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = CallGetService(kJSStackContractID, &sThreadJSContextStack);
-  if (NS_FAILED(rv) && sXPConnect) {
-    // However, if we can't get a context stack after getting
-    // an nsIXPConnect, things are broken, so let's fail here.
-
-    return rv;
-  }
+  NS_ENSURE_SUCCESS(rv, rv);
 
   rv = CallGetService(NS_IOSERVICE_CONTRACTID, &sIOService);
   if (NS_FAILED(rv)) {
@@ -225,7 +220,7 @@ nsContentUtils::Init()
  */
 /* static */
 nsIParserService*
-nsContentUtils::GetParserServiceWeakRef()
+nsContentUtils::GetParserService()
 {
   // XXX: This isn't accessed from several threads, is it?
   if (!sParserService) {
@@ -242,7 +237,7 @@ nsContentUtils::GetParserServiceWeakRef()
 
 #ifdef MOZ_XTF
 nsIXTFService*
-nsContentUtils::GetXTFServiceWeakRef()
+nsContentUtils::GetXTFService()
 {
   if (!sXTFService) {
     nsresult rv = CallGetService(kXTFServiceCID, &sXTFService);
@@ -904,10 +899,6 @@ nsContentUtils::ReparentContentWrapper(nsIContent *aContent,
 nsIDocShell *
 nsContentUtils::GetDocShellFromCaller()
 {
-  if (!sThreadJSContextStack) {
-    return nsnull;
-  }
-
   JSContext *cx = nsnull;
   sThreadJSContextStack->Peek(&cx);
 
@@ -925,10 +916,6 @@ nsContentUtils::GetDocShellFromCaller()
 nsIDOMDocument *
 nsContentUtils::GetDocumentFromCaller()
 {
-  if (!sThreadJSContextStack) {
-    return nsnull;
-  }
-
   JSContext *cx = nsnull;
   sThreadJSContextStack->Peek(&cx);
 
@@ -1647,7 +1634,7 @@ nsresult
 nsContentUtils::CheckQName(const nsAString& aQualifiedName,
                            PRBool aNamespaceAware)
 {
-  nsIParserService *parserService = GetParserServiceWeakRef();
+  nsIParserService *parserService = GetParserService();
   NS_ENSURE_TRUE(parserService, NS_ERROR_FAILURE);
 
   const PRUnichar *colon;
@@ -1661,7 +1648,7 @@ nsContentUtils::SplitQName(nsIContent* aNamespaceResolver,
                            const nsAFlatString& aQName,
                            PRInt32 *aNamespace, nsIAtom **aLocalName)
 {
-  nsIParserService* parserService = GetParserServiceWeakRef();
+  nsIParserService* parserService = GetParserService();
   NS_ENSURE_TRUE(parserService, NS_ERROR_FAILURE);
 
   const PRUnichar* colon;
@@ -1676,7 +1663,7 @@ nsContentUtils::SplitQName(nsIContent* aNamespaceResolver,
                             nameSpace);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    GetNSManagerWeakRef()->GetNameSpaceID(nameSpace, aNamespace);
+    NameSpaceManager()->GetNameSpaceID(nameSpace, aNamespace);
     if (*aNamespace == kNameSpaceID_Unknown)
       return NS_ERROR_FAILURE;
 
@@ -1722,7 +1709,7 @@ nsContentUtils::GetNodeInfoFromQName(const nsAString& aNamespaceURI,
                                      nsNodeInfoManager* aNodeInfoManager,
                                      nsINodeInfo** aNodeInfo)
 {
-  nsIParserService* parserService = GetParserServiceWeakRef();
+  nsIParserService* parserService = GetParserService();
   NS_ENSURE_TRUE(parserService, NS_ERROR_FAILURE);
 
   const nsAFlatString& qName = PromiseFlatString(aQualifiedName);
diff --git a/mozilla/content/base/src/nsDOMAttributeMap.cpp b/mozilla/content/base/src/nsDOMAttributeMap.cpp
index b2943ffb37f..7acf908d1c0 100644
--- a/mozilla/content/base/src/nsDOMAttributeMap.cpp
+++ b/mozilla/content/base/src/nsDOMAttributeMap.cpp
@@ -389,8 +389,8 @@ nsDOMAttributeMap::GetNamedItemNSInternal(const nsAString& aNamespaceURI,
   PRInt32 nameSpaceID = kNameSpaceID_None;
 
   if (!aNamespaceURI.IsEmpty()) {
-    nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(aNamespaceURI,
-                                                          &nameSpaceID);
+    nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI,
+                                                       &nameSpaceID);
 
     if (nameSpaceID == kNameSpaceID_Unknown) {
       return NS_OK;
diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index e9d58b8a80d..40c1952a79d 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -555,8 +555,7 @@ nsDOMImplementation::CreateDocument(const nsAString& aNamespaceURI,
 
   nsresult rv;
   if (!aQualifiedName.IsEmpty()) {
-    nsIParserService *parserService =
-      nsContentUtils::GetParserServiceWeakRef();
+    nsIParserService *parserService = nsContentUtils::GetParserService();
     NS_ENSURE_TRUE(parserService, NS_ERROR_FAILURE);
 
     const nsAFlatString& qName = PromiseFlatString(aQualifiedName);
@@ -1205,11 +1204,7 @@ nsDocument::GetPrincipal()
 {
   if (!mPrincipal) {
     nsIScriptSecurityManager *securityManager =
-      nsContentUtils::GetSecurityManager();
-
-    if (!securityManager) {
-      return nsnull;
-    }
+      nsContentUtils::SecurityManager();
 
     NS_WARN_IF_FALSE(mDocumentURI, "no URI!");
     nsresult rv =
@@ -1265,7 +1260,7 @@ nsDocument::SetBaseURI(nsIURI* aURI)
     NS_ENSURE_TRUE(principal, NS_ERROR_FAILURE);
     
     nsIScriptSecurityManager* securityManager =
-      nsContentUtils::GetSecurityManager();
+      nsContentUtils::SecurityManager();
     rv = securityManager->
       CheckLoadURIWithPrincipal(principal, aURI,
                                 nsIScriptSecurityManager::STANDARD);
@@ -2731,8 +2726,8 @@ nsDocument::GetElementsByTagNameNS(const nsAString& aNamespaceURI,
   nsContentList *list = nsnull;
 
   if (!aNamespaceURI.EqualsLiteral("*")) {
-    nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(aNamespaceURI,
-                                                          &nameSpaceId);
+    nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI,
+                                                       &nameSpaceId);
 
     if (nameSpaceId == kNameSpaceID_Unknown) {
       // Unknown namespace means no matches, we create an empty list...
diff --git a/mozilla/content/base/src/nsDocumentEncoder.cpp b/mozilla/content/base/src/nsDocumentEncoder.cpp
index 547f52e7722..4fb1887ef2e 100644
--- a/mozilla/content/base/src/nsDocumentEncoder.cpp
+++ b/mozilla/content/base/src/nsDocumentEncoder.cpp
@@ -1431,8 +1431,7 @@ nsHTMLCopyEncoder::GetPromotedPoint(Endpoint aWhere, nsIDOMNode *aNode, PRInt32
       rv = GetNodeLocation(node, address_of(parent), &offset);
       NS_ENSURE_SUCCESS(rv, rv);
       if (offset == -1) return NS_OK; // we hit generated content; STOP
-      nsIParserService *parserService =
-        nsContentUtils::GetParserServiceWeakRef();
+      nsIParserService *parserService = nsContentUtils::GetParserService();
       if (!parserService)
         return NS_ERROR_OUT_OF_MEMORY;
       while ((IsFirstNode(node)) && (!IsRoot(parent)) && (parent != common))
@@ -1514,8 +1513,7 @@ nsHTMLCopyEncoder::GetPromotedPoint(Endpoint aWhere, nsIDOMNode *aNode, PRInt32
       rv = GetNodeLocation(node, address_of(parent), &offset);
       NS_ENSURE_SUCCESS(rv, rv);
       if (offset == -1) return NS_OK; // we hit generated content; STOP
-      nsIParserService *parserService =
-        nsContentUtils::GetParserServiceWeakRef();
+      nsIParserService *parserService = nsContentUtils::GetParserService();
       if (!parserService)
         return NS_ERROR_OUT_OF_MEMORY;
       while ((IsLastNode(node)) && (!IsRoot(parent)) && (parent != common))
diff --git a/mozilla/content/base/src/nsFrameLoader.cpp b/mozilla/content/base/src/nsFrameLoader.cpp
index ed0ab4f272a..e6b547124b0 100644
--- a/mozilla/content/base/src/nsFrameLoader.cpp
+++ b/mozilla/content/base/src/nsFrameLoader.cpp
@@ -122,7 +122,7 @@ nsFrameLoader::LoadFrame()
   NS_ENSURE_TRUE(loadInfo, NS_ERROR_FAILURE);
 
   // Check for security
-  nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
+  nsIScriptSecurityManager *secMan = nsContentUtils::SecurityManager();
 
   // Get referring URL
   nsCOMPtr<nsIURI> referrer;
diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp
index 27877994b49..c7e5d9663f1 100644
--- a/mozilla/content/base/src/nsGenericElement.cpp
+++ b/mozilla/content/base/src/nsGenericElement.cpp
@@ -417,8 +417,8 @@ nsNode3Tearoff::LookupPrefix(const nsAString& aNamespaceURI,
 
   // Get the namespace id for the URI
   PRInt32 namespaceId;
-  nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(aNamespaceURI,
-                                                        &namespaceId);
+  nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI,
+                                                     &namespaceId);
   if (namespaceId == kNameSpaceID_Unknown) {
     return NS_OK;
   }
@@ -1520,7 +1520,7 @@ nsGenericElement::GetAttributeNS(const nsAString& aNamespaceURI,
                                  nsAString& aReturn)
 {
   PRInt32 nsid;
-  nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(aNamespaceURI, &nsid);
+  nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI, &nsid);
 
   if (nsid == kNameSpaceID_Unknown) {
     // Unknown namespace means no attr...
@@ -1559,7 +1559,7 @@ nsGenericElement::RemoveAttributeNS(const nsAString& aNamespaceURI,
   nsCOMPtr<nsIAtom> name = do_GetAtom(aLocalName);
   PRInt32 nsid;
 
-  nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(aNamespaceURI, &nsid);
+  nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI, &nsid);
 
   if (nsid == kNameSpaceID_Unknown) {
     // Unknown namespace means no attr...
@@ -1631,8 +1631,8 @@ nsGenericElement::GetElementsByTagNameNS(const nsAString& aNamespaceURI,
 
   nsIDocument* document = GetCurrentDoc();
   if (!aNamespaceURI.EqualsLiteral("*")) {
-    nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(aNamespaceURI,
-                                                          &nameSpaceId);
+    nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI,
+                                                       &nameSpaceId);
 
     if (nameSpaceId == kNameSpaceID_Unknown) {
       // Unknown namespace means no matches, we create an empty list...
@@ -1674,7 +1674,7 @@ nsGenericElement::HasAttributeNS(const nsAString& aNamespaceURI,
   NS_ENSURE_ARG_POINTER(aReturn);
 
   PRInt32 nsid;
-  nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(aNamespaceURI, &nsid);
+  nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI, &nsid);
 
   if (nsid == kNameSpaceID_Unknown) {
     // Unknown namespace means no attr...
@@ -2410,7 +2410,7 @@ nsGenericElement::GetBaseURI() const
                  doc->GetDocumentCharacterSet().get(), parentBase);
   if (NS_SUCCEEDED(rv)) {
     // do a security check, almost the same as nsDocument::SetBaseURL()
-    rv = nsContentUtils::GetSecurityManager()->
+    rv = nsContentUtils::SecurityManager()->
       CheckLoadURIWithPrincipal(doc->GetPrincipal(), ourBase,
                                 nsIScriptSecurityManager::STANDARD);
   }
@@ -3754,8 +3754,8 @@ nsGenericElement::List(FILE* out, PRInt32 aIndent) const
 {
   NS_PRECONDITION(IsInDoc(), "bad content");
 
-  PRInt32 index;
-  for (index = aIndent; --index >= 0; ) fputs("  ", out);
+  PRInt32 indent;
+  for (indent = aIndent; --indent >= 0; ) fputs("  ", out);
 
   nsAutoString buf;
   mNodeInfo->GetQualifiedName(buf);
@@ -3763,7 +3763,7 @@ nsGenericElement::List(FILE* out, PRInt32 aIndent) const
 
   fprintf(out, "@%p", this);
 
-  PRUint32 attrcount = mAttrsAndChildren.AttrCount();
+  PRUint32 index, attrcount = mAttrsAndChildren.AttrCount();
   for (index = 0; index < attrcount; index++) {
     nsAutoString buffer;
 
diff --git a/mozilla/content/base/src/nsHTMLContentSerializer.cpp b/mozilla/content/base/src/nsHTMLContentSerializer.cpp
index d3d3cf0b09f..6b1aa466198 100644
--- a/mozilla/content/base/src/nsHTMLContentSerializer.cpp
+++ b/mozilla/content/base/src/nsHTMLContentSerializer.cpp
@@ -333,42 +333,39 @@ void nsHTMLContentSerializer::AppendWrapped_NonWhitespaceSequence(
         // we must wrap
 
         PRBool foundWrapPosition = PR_FALSE;
-        nsCOMPtr<nsILineBreaker> aLineBreaker = nsContentUtils::GetLineBreaker();
+        nsILineBreaker *lineBreaker = nsContentUtils::LineBreaker();
 
-        if (aLineBreaker) { // we have a line breaker helper object
-          PRInt32 wrapPosition;
+        PRInt32 wrapPosition;
 
-          wrapPosition = aLineBreaker->Prev(aSequenceStart,
+        wrapPosition = lineBreaker->Prev(aSequenceStart,
+                                         (aEnd - aSequenceStart),
+                                         (aPos - aSequenceStart) + 1);
+        if (wrapPosition != NS_LINEBREAKER_NEED_MORE_TEXT) {
+          foundWrapPosition = PR_TRUE;
+        }
+        else {
+          wrapPosition = lineBreaker->Next(aSequenceStart,
                                            (aEnd - aSequenceStart),
-                                           (aPos - aSequenceStart) + 1);
+                                           (aPos - aSequenceStart));
           if (wrapPosition != NS_LINEBREAKER_NEED_MORE_TEXT) {
             foundWrapPosition = PR_TRUE;
           }
-          else {
-            wrapPosition = aLineBreaker->Next(aSequenceStart,
-                                             (aEnd - aSequenceStart),
-                                             (aPos - aSequenceStart));
-            if (wrapPosition != NS_LINEBREAKER_NEED_MORE_TEXT) {
-              foundWrapPosition = PR_TRUE;
-            }
-          }
-
-          if (foundWrapPosition) {
-            if (mAddSpace) {
-              aOutputStr.Append(PRUnichar(' '));
-              mAddSpace = PR_FALSE;
-            }
-
-            aOutputStr.Append(aSequenceStart, wrapPosition);
-            aOutputStr.Append(mLineBreak);
-            aPos = aSequenceStart + wrapPosition;
-            mColPos = 0;
-            aMayIgnoreStartOfLineWhitespaceSequence = PR_TRUE;
-            mMayIgnoreLineBreakSequence = PR_TRUE;
-          }
         }
 
-        if (!aLineBreaker || !foundWrapPosition) {
+        if (foundWrapPosition) {
+          if (mAddSpace) {
+            aOutputStr.Append(PRUnichar(' '));
+            mAddSpace = PR_FALSE;
+          }
+
+          aOutputStr.Append(aSequenceStart, wrapPosition);
+          aOutputStr.Append(mLineBreak);
+          aPos = aSequenceStart + wrapPosition;
+          mColPos = 0;
+          aMayIgnoreStartOfLineWhitespaceSequence = PR_TRUE;
+          mMayIgnoreLineBreakSequence = PR_TRUE;
+        }
+        else {
           // try some simple fallback logic
           // go forward up to the next whitespace position,
           // in the worst case this will be all the rest of the data
@@ -777,7 +774,7 @@ nsHTMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement,
     }
   }
   
-  nsIParserService* parserService = nsContentUtils::GetParserServiceWeakRef();
+  nsIParserService* parserService = nsContentUtils::GetParserService();
 
   if (parserService && (name != nsHTMLAtoms::style)) {
     PRBool isContainer;
@@ -893,8 +890,7 @@ nsHTMLContentSerializer::AppendToString(const nsAString& aStr,
                   nsIDocumentEncoder::OutputEncodeLatin1Entities |
                   nsIDocumentEncoder::OutputEncodeHTMLEntities   |
                   nsIDocumentEncoder::OutputEncodeW3CEntities)) {
-      nsIParserService* parserService =
-        nsContentUtils::GetParserServiceWeakRef();
+      nsIParserService* parserService = nsContentUtils::GetParserService();
 
       if (!parserService) {
         NS_ERROR("Can't get parser service");
@@ -1040,8 +1036,7 @@ nsHTMLContentSerializer::LineBreakBeforeOpen(nsIAtom* aName,
     return PR_TRUE;
   }
   else {
-    nsIParserService* parserService =
-      nsContentUtils::GetParserServiceWeakRef();
+    nsIParserService* parserService = nsContentUtils::GetParserService();
     
     if (parserService) {
       PRBool res;
@@ -1138,8 +1133,7 @@ nsHTMLContentSerializer::LineBreakAfterClose(nsIAtom* aName,
     return PR_TRUE;
   }
   else {
-    nsIParserService* parserService =
-      nsContentUtils::GetParserServiceWeakRef();
+    nsIParserService* parserService = nsContentUtils::GetParserService();
     
     if (parserService) {
       PRBool res;
diff --git a/mozilla/content/base/src/nsImageLoadingContent.cpp b/mozilla/content/base/src/nsImageLoadingContent.cpp
index 35f0e4026ad..b75174d0c8a 100644
--- a/mozilla/content/base/src/nsImageLoadingContent.cpp
+++ b/mozilla/content/base/src/nsImageLoadingContent.cpp
@@ -611,7 +611,7 @@ nsImageLoadingContent::StringToURI(const nsAString& aSpec,
                    aSpec,
                    charset.IsEmpty() ? nsnull : PromiseFlatCString(charset).get(),
                    baseURL,
-                   nsContentUtils::GetIOServiceWeakRef());
+                   nsContentUtils::GetIOService());
 }
 
 
diff --git a/mozilla/content/base/src/nsNameSpaceManager.cpp b/mozilla/content/base/src/nsNameSpaceManager.cpp
index 9229de38971..0d84c481c0f 100644
--- a/mozilla/content/base/src/nsNameSpaceManager.cpp
+++ b/mozilla/content/base/src/nsNameSpaceManager.cpp
@@ -268,7 +268,7 @@ NS_NewElement(nsIContent** aResult, PRInt32 aElementType,
   }
 #ifdef MOZ_XTF
   if (aElementType > kNameSpaceID_LastBuiltin) {
-    nsIXTFService* xtfService = nsContentUtils::GetXTFServiceWeakRef();
+    nsIXTFService* xtfService = nsContentUtils::GetXTFService();
     NS_ASSERTION(xtfService, "could not get xtf service");
     if (xtfService &&
         NS_SUCCEEDED(xtfService->CreateElement(aResult, aNodeInfo)))
diff --git a/mozilla/content/base/src/nsNodeInfo.cpp b/mozilla/content/base/src/nsNodeInfo.cpp
index c0dc65e1584..9a32dc84635 100644
--- a/mozilla/content/base/src/nsNodeInfo.cpp
+++ b/mozilla/content/base/src/nsNodeInfo.cpp
@@ -156,8 +156,8 @@ nsNodeInfo::GetNamespaceURI(nsAString& aNameSpaceURI) const
   nsresult rv = NS_OK;
 
   if (mInner.mNamespaceID > 0) {
-    rv = nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceURI(mInner.mNamespaceID,
-                                                                aNameSpaceURI);
+    rv = nsContentUtils::NameSpaceManager()->GetNameSpaceURI(mInner.mNamespaceID,
+                                                             aNameSpaceURI);
   } else {
     SetDOMStringToNull(aNameSpaceURI);
   }
@@ -213,7 +213,7 @@ PRBool
 nsNodeInfo::NamespaceEquals(const nsAString& aNamespaceURI) const
 {
   PRInt32 nsid;
-  nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(aNamespaceURI, &nsid);
+  nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI, &nsid);
 
   return nsINodeInfo::NamespaceEquals(nsid);
 }
diff --git a/mozilla/content/base/src/nsNodeInfoManager.cpp b/mozilla/content/base/src/nsNodeInfoManager.cpp
index 741c6330632..b7dd65acfcb 100644
--- a/mozilla/content/base/src/nsNodeInfoManager.cpp
+++ b/mozilla/content/base/src/nsNodeInfoManager.cpp
@@ -249,7 +249,7 @@ nsNodeInfoManager::GetNodeInfo(const nsAString& aQualifiedName,
   PRInt32 nsid = kNameSpaceID_None;
 
   if (!aNamespaceURI.IsEmpty()) {
-    nsresult rv = nsContentUtils::GetNSManagerWeakRef()->
+    nsresult rv = nsContentUtils::NameSpaceManager()->
       RegisterNameSpace(aNamespaceURI, nsid);
     NS_ENSURE_SUCCESS(rv, rv);
   }
diff --git a/mozilla/content/base/src/nsPlainTextSerializer.cpp b/mozilla/content/base/src/nsPlainTextSerializer.cpp
index 2f550515f89..770d39543e7 100644
--- a/mozilla/content/base/src/nsPlainTextSerializer.cpp
+++ b/mozilla/content/base/src/nsPlainTextSerializer.cpp
@@ -160,16 +160,14 @@ nsPlainTextSerializer::Init(PRUint32 aFlags, PRUint32 aWrapColumn,
   }
 #endif
 
-  NS_ENSURE_TRUE(nsContentUtils::GetParserServiceWeakRef(),
-                 NS_ERROR_UNEXPECTED);
+  NS_ENSURE_TRUE(nsContentUtils::GetParserService(), NS_ERROR_UNEXPECTED);
 
   mFlags = aFlags;
   mWrapColumn = aWrapColumn;
 
   // Only create a linebreaker if we will handle wrapping.
   if (MayWrap()) {
-    mLineBreaker = nsContentUtils::GetLineBreaker();
-    if (!mLineBreaker) return NS_ERROR_FAILURE;
+    mLineBreaker = nsContentUtils::LineBreaker();
   }
 
   // Set the line break character:
@@ -1144,8 +1142,7 @@ nsPlainTextSerializer::DoAddLeaf(const nsIParserNode *aNode, PRInt32 aTag,
     Write(aText);
   }
   else if (type == eHTMLTag_entity) {
-    nsIParserService* parserService =
-      nsContentUtils::GetParserServiceWeakRef();
+    nsIParserService* parserService = nsContentUtils::GetParserService();
     if (parserService) {
       nsAutoString str(aText);
       PRInt32 entity;
@@ -1877,7 +1874,7 @@ nsPlainTextSerializer::GetIdForContent(nsIContent* aContent)
     return eHTMLTag_unknown;
   }
 
-  nsIParserService* parserService = nsContentUtils::GetParserServiceWeakRef();
+  nsIParserService* parserService = nsContentUtils::GetParserService();
 
   return parserService ? parserService->HTMLAtomTagToId(aContent->Tag()) :
                          eHTMLTag_unknown;
@@ -1892,7 +1889,7 @@ nsPlainTextSerializer::IsBlockLevel(PRInt32 aId)
 {
   PRBool isBlock = PR_FALSE;
 
-  nsIParserService* parserService = nsContentUtils::GetParserServiceWeakRef();
+  nsIParserService* parserService = nsContentUtils::GetParserService();
   if (parserService) {
     parserService->IsBlock(aId, isBlock);
   }
@@ -1908,7 +1905,7 @@ nsPlainTextSerializer::IsContainer(PRInt32 aId)
 {
   PRBool isContainer = PR_FALSE;
 
-  nsIParserService* parserService = nsContentUtils::GetParserServiceWeakRef();
+  nsIParserService* parserService = nsContentUtils::GetParserService();
   if (parserService) {
     parserService->IsContainer(aId, isContainer);
   }
diff --git a/mozilla/content/base/src/nsRange.cpp b/mozilla/content/base/src/nsRange.cpp
index 54546d02511..80eb4a88711 100644
--- a/mozilla/content/base/src/nsRange.cpp
+++ b/mozilla/content/base/src/nsRange.cpp
@@ -2432,7 +2432,7 @@ nsRange::CreateContextualFragment(const nsAString& aFragment,
         nsCOMPtr<nsIPrincipal> sysPrin;
         nsCOMPtr<nsIPrincipal> subjectPrin;
 
-        nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
+        nsIScriptSecurityManager *secMan = nsContentUtils::SecurityManager();
 
         // Just to compare, not to use!
         result = secMan->GetSystemPrincipal(getter_AddRefs(sysPrin));
diff --git a/mozilla/content/base/src/nsScriptLoader.cpp b/mozilla/content/base/src/nsScriptLoader.cpp
index e703254d958..7ef302e7aed 100644
--- a/mozilla/content/base/src/nsScriptLoader.cpp
+++ b/mozilla/content/base/src/nsScriptLoader.cpp
@@ -86,7 +86,7 @@ IntersectPrincipalCerts(nsIPrincipal *aOld, nsIPrincipal *aNew)
       aOld->GetURI(getter_AddRefs(uri));
       aOld->GetDomain(getter_AddRefs(domain));
 
-      nsContentUtils::GetSecurityManager()->GetCodebasePrincipal(uri, &principal);
+      nsContentUtils::SecurityManager()->GetCodebasePrincipal(uri, &principal);
       if (principal && domain) {
         principal->SetDomain(domain);
       }
@@ -513,7 +513,7 @@ nsScriptLoader::ProcessScriptElement(nsIScriptElement *aElement,
     if (!docPrincipal) {
       return FireErrorNotification(NS_ERROR_UNEXPECTED, aElement, aObserver);
     }
-    rv = nsContentUtils::GetSecurityManager()->
+    rv = nsContentUtils::SecurityManager()->
       CheckLoadURIWithPrincipal(docPrincipal, scriptURI,
                                 nsIScriptSecurityManager::ALLOW_CHROME);
 
diff --git a/mozilla/content/base/src/nsSyncLoadService.cpp b/mozilla/content/base/src/nsSyncLoadService.cpp
index 06bc5a0338a..0eedb4d112c 100644
--- a/mozilla/content/base/src/nsSyncLoadService.cpp
+++ b/mozilla/content/base/src/nsSyncLoadService.cpp
@@ -332,7 +332,7 @@ nsSyncLoader::LoadDocument(nsIChannel* aChannel,
         NS_ENSURE_SUCCESS(rv, rv);
 
         nsIScriptSecurityManager *securityManager =
-            nsContentUtils::GetSecurityManager();
+            nsContentUtils::SecurityManager();
 
         rv = securityManager->CheckLoadURI(aLoaderURI, docURI,
                                            nsIScriptSecurityManager::STANDARD);
@@ -527,7 +527,7 @@ nsSyncLoader::OnChannelRedirect(nsIChannel *aOldChannel,
     rv = aNewChannel->GetURI(getter_AddRefs(newURI)); // The new URI
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = nsContentUtils::GetSecurityManager()->CheckSameOriginURI(oldURI, newURI);
+    rv = nsContentUtils::SecurityManager()->CheckSameOriginURI(oldURI, newURI);
 
     NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/mozilla/content/base/src/nsXMLContentSerializer.cpp b/mozilla/content/base/src/nsXMLContentSerializer.cpp
index eeb9b30c915..c9de4f88934 100644
--- a/mozilla/content/base/src/nsXMLContentSerializer.cpp
+++ b/mozilla/content/base/src/nsXMLContentSerializer.cpp
@@ -625,8 +625,7 @@ nsXMLContentSerializer::AppendElementStart(nsIDOMElement *aElement,
 
     addNSAttr = PR_FALSE;
     if (kNameSpaceID_XMLNS != namespaceID) {
-      nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceURI(namespaceID,
-                                                             uriStr);
+      nsContentUtils::NameSpaceManager()->GetNameSpaceURI(namespaceID, uriStr);
       addNSAttr = ConfirmPrefix(prefixStr, uriStr, aElement,
                                 namespaceID != kNameSpaceID_None);
     }
diff --git a/mozilla/content/base/src/nsXMLNameSpaceMap.cpp b/mozilla/content/base/src/nsXMLNameSpaceMap.cpp
index 7149753ab76..4f091744141 100755
--- a/mozilla/content/base/src/nsXMLNameSpaceMap.cpp
+++ b/mozilla/content/base/src/nsXMLNameSpaceMap.cpp
@@ -111,8 +111,8 @@ nsresult
 nsXMLNameSpaceMap::AddPrefix(nsIAtom *aPrefix, nsString &aURI)
 {
   PRInt32 id;
-  nsresult rv = nsContentUtils::GetNSManagerWeakRef()->RegisterNameSpace(aURI,
-                                                                         id);
+  nsresult rv = nsContentUtils::NameSpaceManager()->RegisterNameSpace(aURI,
+                                                                      id);
 
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/mozilla/content/events/src/nsDOMEvent.cpp b/mozilla/content/events/src/nsDOMEvent.cpp
index d2703f61a08..851b48ee290 100644
--- a/mozilla/content/events/src/nsDOMEvent.cpp
+++ b/mozilla/content/events/src/nsDOMEvent.cpp
@@ -507,7 +507,7 @@ nsDOMEvent::InitEvent(const nsAString& aEventTypeArg, PRBool aCanBubbleArg, PRBo
     // Ensure the caller is permitted to dispatch trusted DOM events.
 
     PRBool enabled = PR_FALSE;
-    nsContentUtils::GetSecurityManager()->
+    nsContentUtils::SecurityManager()->
       IsCapabilityEnabled("UniversalBrowserWrite", &enabled);
 
     if (!enabled) {
diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp
index 505110ee47d..8a5f523a623 100644
--- a/mozilla/content/events/src/nsEventListenerManager.cpp
+++ b/mozilla/content/events/src/nsEventListenerManager.cpp
@@ -1463,7 +1463,7 @@ nsEventListenerManager::RegisterScriptEventListener(nsIScriptContext *aContext,
         STRING_TO_JSVAL(::JS_InternString(cx, "addEventListener"));
     }
 
-    rv = nsContentUtils::GetSecurityManager()->
+    rv = nsContentUtils::SecurityManager()->
       CheckPropertyAccess(cx, jsobj,
                           "EventTarget",
                           sAddListenerID,
diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index a4d3b55b5c7..58c0271a5f4 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -4540,7 +4540,7 @@ nsEventStateManager::DispatchNewEvent(nsISupports* aTarget,
     if (!trusted) {
       //Check security state to determine if dispatcher is trusted
       nsIScriptSecurityManager *securityManager =
-        nsContentUtils::GetSecurityManager();
+        nsContentUtils::SecurityManager();
 
       PRBool enabled;
       nsresult res =
diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
index bfb1268de59..808f18e868e 100644
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
@@ -3909,7 +3909,7 @@ nsGenericHTMLElement::GetProtocolFromHrefString(const nsAString& aHref,
 {
   aProtocol.Truncate();
 
-  nsIIOService* ioService = nsContentUtils::GetIOServiceWeakRef();
+  nsIIOService* ioService = nsContentUtils::GetIOService();
   NS_ENSURE_TRUE(ioService, NS_ERROR_FAILURE);
 
   nsCAutoString protocol;
diff --git a/mozilla/content/html/content/src/nsHTMLFormElement.cpp b/mozilla/content/html/content/src/nsHTMLFormElement.cpp
index 3fcdec0dcea..b5a51565c23 100644
--- a/mozilla/content/html/content/src/nsHTMLFormElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLFormElement.cpp
@@ -1374,7 +1374,7 @@ nsHTMLFormElement::GetActionURL(nsIURI** aActionURL)
   // Get security manager, check to see if access to action URI is allowed.
   //
   nsIScriptSecurityManager *securityManager =
-      nsContentUtils::GetSecurityManager();
+      nsContentUtils::SecurityManager();
   rv = securityManager->
     CheckLoadURIWithPrincipal(document->GetPrincipal(), actionURL,
                               nsIScriptSecurityManager::STANDARD);
diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp
index 8e4c6480bd4..07b08ece177 100644
--- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp
@@ -662,7 +662,7 @@ nsHTMLInputElement::SetValue(const nsAString& aValue)
   // OK and gives pages a way to clear a file input if necessary.
   if (mType == NS_FORM_INPUT_FILE && !aValue.IsEmpty()) {
     nsIScriptSecurityManager *securityManager =
-      nsContentUtils::GetSecurityManager();
+      nsContentUtils::SecurityManager();
 
     PRBool enabled;
     nsresult rv =
diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index 3126184ed62..bba63f2ccc2 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -760,8 +760,7 @@ HTMLContentSink::SinkTraceNode(PRUint32 aBit,
                                void* aThis)
 {
   if (SINK_LOG_TEST(gSinkLogModuleInfo, aBit)) {
-    nsIParserService *parserService =
-      nsContentUtils::GetParserServiceWeakRef();
+    nsIParserService *parserService = nsContentUtils::GetParserService();
     if (!parserService)
       return;
 
@@ -871,8 +870,7 @@ HTMLContentSink::CreateContentObject(const nsIParserNode& aNode,
     mNodeInfoManager->GetNodeInfo(name, nsnull, kNameSpaceID_None,
                                   getter_AddRefs(nodeInfo));
   } else {
-    nsIParserService *parserService =
-      nsContentUtils::GetParserServiceWeakRef();
+    nsIParserService *parserService = nsContentUtils::GetParserService();
     if (!parserService)
       return nsnull;
 
@@ -902,7 +900,7 @@ NS_NewHTMLElement(nsIContent** aResult, nsINodeInfo *aNodeInfo)
 {
   *aResult = nsnull;
 
-  nsIParserService* parserService = nsContentUtils::GetParserServiceWeakRef();
+  nsIParserService* parserService = nsContentUtils::GetParserService();
   if (!parserService)
     return NS_ERROR_OUT_OF_MEMORY;
 
@@ -1110,8 +1108,7 @@ SinkContext::DidAddContent(nsIContent* aContent, PRBool aDidNotify)
 
 #ifdef NS_DEBUG
     // Tracing code
-    nsIParserService *parserService =
-      nsContentUtils::GetParserServiceWeakRef();
+    nsIParserService *parserService = nsContentUtils::GetParserService();
     if (parserService) {
       nsHTMLTag tag = nsHTMLTag(mStack[mStackPos - 1].mType);
       NS_ConvertUTF16toUTF8 str(parserService->HTMLIdToStringTag(tag));
@@ -1972,9 +1969,8 @@ IsScriptEnabled(nsIDocument *aDoc, nsIDocShell *aContainer)
   NS_ENSURE_TRUE(cx, PR_TRUE);
 
   PRBool enabled = PR_TRUE;
-  nsContentUtils::GetSecurityManager()->CanExecuteScripts(cx,
-                                                          principal,
-                                                          &enabled);
+  nsContentUtils::SecurityManager()->CanExecuteScripts(cx, principal,
+                                                       &enabled);
   return enabled;
 }
 
@@ -2003,7 +1999,7 @@ HTMLContentSink::Init(nsIDocument* aDoc,
   CallQueryInterface(aDoc, &mHTMLDocument);
 
   mObservers = nsnull;
-  nsIParserService* service = nsContentUtils::GetParserServiceWeakRef();
+  nsIParserService* service = nsContentUtils::GetParserService();
   if (!service) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
@@ -3589,7 +3585,7 @@ HTMLContentSink::ProcessBaseHref(const nsAString& aBaseHref)
     // NAV compatibility quirk
 
     nsIScriptSecurityManager *securityManager =
-      nsContentUtils::GetSecurityManager();
+      nsContentUtils::SecurityManager();
 
     rv = securityManager->
       CheckLoadURIWithPrincipal(mDocument->GetPrincipal(), baseHrefURI,
diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index 28d90fc3936..bc11e68a4fd 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -1855,7 +1855,7 @@ nsHTMLDocument::OpenCommon(const nsACString& aContentType, PRBool aReplace)
   }
 
   nsCOMPtr<nsIPrincipal> callerPrincipal;
-  nsContentUtils::GetSecurityManager()->
+  nsContentUtils::SecurityManager()->
     GetSubjectPrincipal(getter_AddRefs(callerPrincipal));
 
   // The URI for the document after this call. Get it from the calling
@@ -2245,7 +2245,7 @@ nsHTMLDocument::ScriptWriteCommon(PRBool aNewlineTerminate)
     // document for security purposes. Thus a document.write of a script tag
     // ends up producing a script with the same principals as the script
     // that performed the write.
-    nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
+    nsIScriptSecurityManager *secMan = nsContentUtils::SecurityManager();
 
     nsCOMPtr<nsIPrincipal> subject;
     rv = secMan->GetSubjectPrincipal(getter_AddRefs(subject));
@@ -3544,8 +3544,8 @@ nsHTMLDocument::SetDesignMode(const nsAString & aDesignMode)
   if (!url.Equals("about:blank")) {
     // If we're 'about:blank' then we don't care who can edit us.
     // If we're not about:blank, then we need to check sameOrigin.
-    rv = nsContentUtils::GetSecurityManager()->CheckSameOrigin(nsnull,
-                                                               mDocumentURI);
+    rv = nsContentUtils::SecurityManager()->CheckSameOrigin(nsnull,
+                                                            mDocumentURI);
     if (NS_FAILED(rv))
       return rv;
   }
@@ -3818,8 +3818,7 @@ nsHTMLDocument::DoClipboardSecurityCheck(PRBool aPaste)
 
     NS_NAMED_LITERAL_CSTRING(classNameStr, "Clipboard");
 
-    nsIScriptSecurityManager *secMan =
-      nsContentUtils::GetSecurityManager();
+    nsIScriptSecurityManager *secMan = nsContentUtils::SecurityManager();
 
     if (aPaste) {
       if (nsHTMLDocument::sPasteInternal_id == JSVAL_VOID) {
diff --git a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp
index c6abc305d8b..00f3961c0f4 100644
--- a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp
@@ -430,8 +430,7 @@ nsHTMLFragmentContentSink::OpenContainer(const nsIParserNode& aNode)
                                       kNameSpaceID_None,
                                       getter_AddRefs(nodeInfo));
     } else {
-      nsIParserService* parserService =
-        nsContentUtils::GetParserServiceWeakRef();
+      nsIParserService* parserService = nsContentUtils::GetParserService();
       if (!parserService)
         return NS_ERROR_OUT_OF_MEMORY;
 
@@ -505,8 +504,7 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode)
         nsCOMPtr<nsIContent> content;
         nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
 
-        nsIParserService* parserService =
-          nsContentUtils::GetParserServiceWeakRef();
+        nsIParserService* parserService = nsContentUtils::GetParserService();
         if (!parserService)
           return NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/mozilla/content/html/document/src/nsWyciwygChannel.cpp b/mozilla/content/html/document/src/nsWyciwygChannel.cpp
index 7a92295d2f0..91c2b0d066d 100644
--- a/mozilla/content/html/document/src/nsWyciwygChannel.cpp
+++ b/mozilla/content/html/document/src/nsWyciwygChannel.cpp
@@ -208,7 +208,7 @@ nsWyciwygChannel::GetOwner(nsISupports **aOwner)
     NS_ENSURE_TRUE(mOriginalURI, NS_ERROR_FAILURE);
 
     nsCOMPtr<nsIPrincipal> principal;
-    nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
+    nsIScriptSecurityManager *secMan = nsContentUtils::SecurityManager();
     rv = secMan->GetCodebasePrincipal(mOriginalURI, getter_AddRefs(principal));
     if (NS_SUCCEEDED(rv)) {
       mOwner = principal;
diff --git a/mozilla/content/xbl/src/nsXBLBinding.cpp b/mozilla/content/xbl/src/nsXBLBinding.cpp
index e6e96093da5..b17e0ac73ee 100644
--- a/mozilla/content/xbl/src/nsXBLBinding.cpp
+++ b/mozilla/content/xbl/src/nsXBLBinding.cpp
@@ -1202,11 +1202,6 @@ nsXBLBinding::AllowScripts()
   // Nasty hack.  Use the JSContext of the bound node, since the
   // security manager API expects to get the docshell type from
   // that.  But use the nsIPrincipal of our document.
-  nsIScriptSecurityManager* mgr = nsContentUtils::GetSecurityManager();
-  if (!mgr) {
-    return PR_FALSE;
-  }
-  
   nsIDocument* doc = mBoundElement->GetOwnerDoc();
   if (!doc) {
     return PR_FALSE;
@@ -1231,6 +1226,8 @@ nsXBLBinding::AllowScripts()
     return PR_FALSE;
   }
 
+  nsIScriptSecurityManager* mgr = nsContentUtils::SecurityManager();
+
   PRBool canExecute;
   nsresult rv = mgr->CanExecuteScripts(cx, principal, &canExecute);
   return NS_SUCCEEDED(rv) && canExecute;
diff --git a/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp b/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp
index b0ae7b84340..6f386d6fbd0 100644
--- a/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp
+++ b/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp
@@ -329,7 +329,7 @@ nsXBLProtoImplAnonymousMethod::Execute(nsIContent* aBoundElement)
   nsCxPusher pusher(aBoundElement);
 
   // Check whether it's OK to call the method.
-  rv = nsContentUtils::GetSecurityManager()->CheckFunctionAccess(cx, method, thisObject);
+  rv = nsContentUtils::SecurityManager()->CheckFunctionAccess(cx, method, thisObject);
 
   JSBool ok = JS_TRUE;
   if (NS_SUCCEEDED(rv)) {
diff --git a/mozilla/content/xbl/src/nsXBLService.cpp b/mozilla/content/xbl/src/nsXBLService.cpp
index dc274b5fbdd..3ed35a3df5d 100644
--- a/mozilla/content/xbl/src/nsXBLService.cpp
+++ b/mozilla/content/xbl/src/nsXBLService.cpp
@@ -552,7 +552,7 @@ nsXBLService::LoadBindings(nsIContent* aContent, nsIURI* aURL, PRBool aAugmentFl
 
   // Not everything with a chrome URI has a system principal.  See bug 160042.
   if (NS_FAILED(rv) || !isChrome) {
-    nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
+    nsIScriptSecurityManager *secMan = nsContentUtils::SecurityManager();
 
     rv = secMan->
       CheckLoadURIWithPrincipal(document->GetPrincipal(), aURL,
@@ -965,8 +965,8 @@ nsXBLService::GetBinding(nsIContent* aBoundElement, nsIURI* aURI,
 
             PRInt32 nameSpaceID;
 
-            nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(nameSpace,
-                                                                  &nameSpaceID);
+            nsContentUtils::NameSpaceManager()->GetNameSpaceID(nameSpace,
+                                                               &nameSpaceID);
 
             nsCOMPtr<nsIAtom> tagName = do_GetAtom(display);
             protoBinding->SetBaseTag(nameSpaceID, tagName);
diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
index 174dccf9188..92d3484a20a 100644
--- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
@@ -432,7 +432,7 @@ nsXMLContentSink::CreateElement(const PRUnichar** aAtts, PRUint32 aAttsCount,
     if (!mPrettyPrintHasFactoredElements && !mPrettyPrintHasSpecialRoot &&
         mPrettyPrintXML) {
       mPrettyPrintHasFactoredElements =
-        nsContentUtils::GetNSManagerWeakRef()->
+        nsContentUtils::NameSpaceManager()->
           HasElementCreator(aNodeInfo->NamespaceID());
     }
 
@@ -639,7 +639,7 @@ nsXMLContentSink::ProcessStyleLink(nsIContent* aElement,
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Do security check
-    nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
+    nsIScriptSecurityManager *secMan = nsContentUtils::SecurityManager();
     rv = secMan->
       CheckLoadURIWithPrincipal(mDocument->GetPrincipal(), url,
                                 nsIScriptSecurityManager::ALLOW_CHROME);
diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp
index a1e55d3ba8b..5e53d546287 100644
--- a/mozilla/content/xml/document/src/nsXMLDocument.cpp
+++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp
@@ -277,7 +277,7 @@ nsXMLDocument::OnChannelRedirect(nsIChannel *aOldChannel,
   if (NS_FAILED(rv)) 
     return rv;
 
-  nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
+  nsIScriptSecurityManager *secMan = nsContentUtils::SecurityManager();
 
   if (mScriptContext && !mCrossSiteAccessEnabled) {
     nsCOMPtr<nsIJSContextStack> stack(do_GetService("@mozilla.org/js/xpc/ContextStack;1", & rv));
diff --git a/mozilla/content/xtf/src/nsXMLContentBuilder.cpp b/mozilla/content/xtf/src/nsXMLContentBuilder.cpp
index 4783281fc2c..d8aa42909a0 100644
--- a/mozilla/content/xtf/src/nsXMLContentBuilder.cpp
+++ b/mozilla/content/xtf/src/nsXMLContentBuilder.cpp
@@ -145,7 +145,7 @@ NS_IMETHODIMP nsXMLContentBuilder::SetDocument(nsIDOMDocument *doc)
 /* void setElementNamespace (in AString ns); */
 NS_IMETHODIMP nsXMLContentBuilder::SetElementNamespace(const nsAString & ns)
 {
-  nsContentUtils::GetNSManagerWeakRef()->RegisterNameSpace(ns, mNamespaceId);
+  nsContentUtils::NameSpaceManager()->RegisterNameSpace(ns, mNamespaceId);
   return NS_OK;
 }
 
diff --git a/mozilla/content/xtf/src/nsXTFElementWrapper.cpp b/mozilla/content/xtf/src/nsXTFElementWrapper.cpp
index a8125a7bccc..30193f70153 100644
--- a/mozilla/content/xtf/src/nsXTFElementWrapper.cpp
+++ b/mozilla/content/xtf/src/nsXTFElementWrapper.cpp
@@ -430,8 +430,8 @@ nsXTFElementWrapper::CloneNode(PRBool aDeep, nsIDOMNode **aResult)
 {
   *aResult = nsnull;
   nsCOMPtr<nsIContent> it;
-  nsContentUtils::GetXTFServiceWeakRef()->CreateElement(getter_AddRefs(it),
-                                                        mNodeInfo);
+  nsContentUtils::GetXTFService()->CreateElement(getter_AddRefs(it),
+                                                 mNodeInfo);
   if (!it)
     return NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/mozilla/content/xul/content/src/nsXULPopupListener.cpp b/mozilla/content/xul/content/src/nsXULPopupListener.cpp
index f2c20730ccc..a660340210e 100644
--- a/mozilla/content/xul/content/src/nsXULPopupListener.cpp
+++ b/mozilla/content/xul/content/src/nsXULPopupListener.cpp
@@ -244,7 +244,7 @@ XULPopupListenerImpl::PreLaunchPopup(nsIDOMEvent* aMouseEvent)
                                               getter_AddRefs(prin));
       if (prin) {
         nsCOMPtr<nsIPrincipal> system;
-        nsContentUtils::GetSecurityManager()->GetSystemPrincipal(getter_AddRefs(system));
+        nsContentUtils::SecurityManager()->GetSystemPrincipal(getter_AddRefs(system));
         if (prin != system) {
           // This isn't chrome.  Cancel the preventDefault() and
           // let the event go forth.
diff --git a/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp b/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp
index 2833c2148b3..84b9e0bfaf5 100644
--- a/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp
@@ -668,7 +668,7 @@ nsXULPrototypeDocument::GetDocumentPrincipal()
     NS_PRECONDITION(mNodeInfoManager, "missing nodeInfoManager");
     if (!mDocumentPrincipal) {
         nsIScriptSecurityManager *securityManager =
-            nsContentUtils::GetSecurityManager();
+            nsContentUtils::SecurityManager();
         nsresult rv = NS_OK;
 
         // XXX This should be handled by the security manager, see bug 160042
diff --git a/mozilla/content/xul/templates/src/nsXULContentUtils.cpp b/mozilla/content/xul/templates/src/nsXULContentUtils.cpp
index bb413cb3808..3e53090bf43 100644
--- a/mozilla/content/xul/templates/src/nsXULContentUtils.cpp
+++ b/mozilla/content/xul/templates/src/nsXULContentUtils.cpp
@@ -454,7 +454,7 @@ nsXULContentUtils::GetResource(PRInt32 aNameSpaceID, const nsAString& aAttribute
     PRUnichar buf[256];
     nsFixedString uri(buf, NS_ARRAY_LENGTH(buf), 0);
     if (aNameSpaceID != kNameSpaceID_Unknown && aNameSpaceID != kNameSpaceID_None) {
-        rv = nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceURI(aNameSpaceID, uri);
+        rv = nsContentUtils::NameSpaceManager()->GetNameSpaceURI(aNameSpaceID, uri);
         // XXX ignore failure; treat as "no namespace"
     }
 
diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp
index d5a38954c36..c97d967c282 100644
--- a/mozilla/layout/generic/nsTextFrame.cpp
+++ b/mozilla/layout/generic/nsTextFrame.cpp
@@ -6270,8 +6270,7 @@ nsTextFrame::ComputeWordFragmentDimensions(nsPresContext* aPresContext,
       memcpy((void*)&(aWordBuf[aRunningWordLen]), bp, sizeof(PRUnichar)*wordLen);
       
       PRInt32 breakP=0;
-      PRBool needMore=PR_TRUE;
-      breakP = nsContentUtils::GetLineBreaker()->Next(aWordBuf, 
+      breakP = nsContentUtils::LineBreaker()->Next(aWordBuf, 
                                          aRunningWordLen+wordLen, 0);
       // when we look at two pieces text together, we might decide to break
       // eariler than if we only look at the 2nd pieces of text
@@ -6295,7 +6294,7 @@ nsTextFrame::ComputeWordFragmentDimensions(nsPresContext* aPresContext,
     // Even if the previous text fragment is not breakable, the connected pieces 
     // can be breakable in between. This especially true for CJK.
     PRBool canBreak;
-    canBreak = nsContentUtils::GetLineBreaker()->BreakInBetween(aWordBuf, 
+    canBreak = nsContentUtils::LineBreaker()->BreakInBetween(aWordBuf, 
                                             aRunningWordLen, bp, wordLen);
     if (canBreak) {
       wordLen = 0;
diff --git a/mozilla/layout/generic/nsTextTransformer.cpp b/mozilla/layout/generic/nsTextTransformer.cpp
index 3057e93f9d2..ce044ef341b 100644
--- a/mozilla/layout/generic/nsTextTransformer.cpp
+++ b/mozilla/layout/generic/nsTextTransformer.cpp
@@ -182,9 +182,6 @@ nsTextTransformer::nsTextTransformer(nsPresContext* aPresContext)
 #ifdef IBMBIDI
   mPresContext = aPresContext;
 #endif
-  if (nsContentUtils::GetLineBreaker() == nsnull &&
-      nsContentUtils::GetWordBreaker() == nsnull )
-    NS_ASSERTION(0, "invalid creation of nsTextTransformer");
   
 #ifdef DEBUG
   static PRBool firstTime = PR_TRUE;
@@ -541,11 +538,11 @@ nsTextTransformer::ScanNormalUnicodeText_F(PRBool   aForLineBreak,
     const PRUnichar* cp = cp0 + offset;
     PRBool breakBetween = PR_FALSE;
     if (aForLineBreak) {
-      breakBetween = nsContentUtils::GetLineBreaker()->BreakInBetween(
+      breakBetween = nsContentUtils::LineBreaker()->BreakInBetween(
           &firstChar, 1, cp, (fragLen-offset));
     }
     else {
-      breakBetween = nsContentUtils::GetWordBreaker()->BreakInBetween(
+      breakBetween = nsContentUtils::WordBreaker()->BreakInBetween(
           &firstChar, 1, cp, (fragLen-offset));
     }
 
@@ -568,10 +565,10 @@ nsTextTransformer::ScanNormalUnicodeText_F(PRBool   aForLineBreak,
       // Find next position
       PRInt32 next;
       if (aForLineBreak) {
-        next = nsContentUtils::GetLineBreaker()->Next(cp0, fragLen, offset);
+        next = nsContentUtils::LineBreaker()->Next(cp0, fragLen, offset);
       }
       else {
-        next = nsContentUtils::GetWordBreaker()->NextWord(cp0, fragLen, offset);
+        next = nsContentUtils::WordBreaker()->NextWord(cp0, fragLen, offset);
       }
       if (aForLineBreak && next == NS_LINEBREAKER_NEED_MORE_TEXT ||
           next == NS_WORDBREAKER_NEED_MORE_TEXT)
@@ -1213,11 +1210,11 @@ nsTextTransformer::ScanNormalUnicodeText_B(PRBool aForLineBreak,
     const PRUnichar* cp = cp0 + offset;
     PRBool breakBetween = PR_FALSE;
     if (aForLineBreak) {
-      breakBetween = nsContentUtils::GetLineBreaker()->BreakInBetween(cp0, 
+      breakBetween = nsContentUtils::LineBreaker()->BreakInBetween(cp0, 
           offset + 1, mTransformBuf.GetBufferEnd()-1, 1);
     }
     else {
-      breakBetween = nsContentUtils::GetWordBreaker()->BreakInBetween(cp0,
+      breakBetween = nsContentUtils::WordBreaker()->BreakInBetween(cp0,
           offset + 1, mTransformBuf.GetBufferEnd()-1, 1);
     }
 
@@ -1225,10 +1222,10 @@ nsTextTransformer::ScanNormalUnicodeText_B(PRBool aForLineBreak,
       // Find next position
       PRInt32 prev;
       if (aForLineBreak) {
-        prev = nsContentUtils::GetLineBreaker()->Prev(cp0, offset, offset);
+        prev = nsContentUtils::LineBreaker()->Prev(cp0, offset, offset);
       }
       else {
-        prev = nsContentUtils::GetWordBreaker()->PrevWord(cp0, offset, offset);
+        prev = nsContentUtils::WordBreaker()->PrevWord(cp0, offset, offset);
       }
       if (aForLineBreak && prev == NS_LINEBREAKER_NEED_MORE_TEXT ||
           prev == NS_WORDBREAKER_NEED_MORE_TEXT)
diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp
index 7ed6f787b24..f3afbb69dda 100644
--- a/mozilla/layout/style/nsCSSLoader.cpp
+++ b/mozilla/layout/style/nsCSSLoader.cpp
@@ -842,7 +842,7 @@ CSSLoaderImpl::CheckLoadAllowed(nsIURI* aSourceURI,
   LOG(("CSSLoaderImpl::CheckLoadAllowed"));
   
   // Check with the security manager
-  nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
+  nsIScriptSecurityManager *secMan = nsContentUtils::SecurityManager();
   nsresult rv = secMan->CheckLoadURI(aSourceURI, aTargetURI,
                                      nsIScriptSecurityManager::ALLOW_CHROME);
   if (NS_FAILED(rv)) { // failure is normal here; don't warn
diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp
index 07d1ad0d945..2881c567b41 100644
--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
@@ -2173,8 +2173,8 @@ nsCSSStyleSheet::GetCssRules(nsIDOMCSSRuleList** aCssRules)
     return NS_ERROR_FAILURE;
 
   // Get the security manager and do the same-origin check
-  rv = nsContentUtils::GetSecurityManager()->CheckSameOrigin(cx,
-                                                             mInner->mSheetURI);
+  rv = nsContentUtils::SecurityManager()->CheckSameOrigin(cx,
+                                                          mInner->mSheetURI);
   if (NS_FAILED(rv)) {
     return rv;
   }