From 1439913c4c8c7a5343e31b7f5b82a750fd084bb3 Mon Sep 17 00:00:00 2001
From: Neil Rashbrook <neil@parkwaycc.co.uk>
Date: Fri, 25 Mar 2011 11:43:15 +0000
Subject: [PATCH] Bug 611503 Fix broken consumers of nsTDependentString on an
 nsTAString r=dwitte

---
 content/xul/templates/src/nsXULSortService.cpp | 4 ++--
 modules/libpref/src/nsPrefService.cpp          | 2 +-
 netwerk/cookie/nsCookieService.cpp             | 9 +++------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/content/xul/templates/src/nsXULSortService.cpp b/content/xul/templates/src/nsXULSortService.cpp
index 53d4808eae10..705d7ceafc7a 100644
--- a/content/xul/templates/src/nsXULSortService.cpp
+++ b/content/xul/templates/src/nsXULSortService.cpp
@@ -494,9 +494,9 @@ XULSortServiceImpl::CompareValues(const nsAString& aLeft,
 {
   if (aSortHints & SORT_INTEGER) {
     PRInt32 err;
-    PRInt32 leftint = nsDependentString(aLeft).ToInteger(&err);
+    PRInt32 leftint = PromiseFlatString(aLeft).ToInteger(&err);
     if (NS_SUCCEEDED(err)) {
-      PRInt32 rightint = nsDependentString(aRight).ToInteger(&err);
+      PRInt32 rightint = PromiseFlatString(aRight).ToInteger(&err);
       if (NS_SUCCEEDED(err)) {
         return leftint - rightint;
       }
diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp
index 55eeb51f8d76..b19f2bda997c 100644
--- a/modules/libpref/src/nsPrefService.cpp
+++ b/modules/libpref/src/nsPrefService.cpp
@@ -352,7 +352,7 @@ NS_IMETHODIMP nsPrefService::ClearContentPref(const nsACString& aPrefName)
 NS_IMETHODIMP nsPrefService::MirrorPreference(const nsACString& aPrefName,
                                               PrefTuple *aPref)
 {
-  PrefHashEntry *pref = pref_HashTableLookup(nsDependentCString(aPrefName).get());
+  PrefHashEntry *pref = pref_HashTableLookup(PromiseFlatCString(aPrefName).get());
 
   if (!pref)
     return NS_ERROR_NOT_AVAILABLE;
diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp
index c783b24dc78d..0f3ff5eb245c 100644
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -3024,14 +3024,11 @@ nsCookieService::GetBaseDomainFromHost(const nsACString &aHost,
     return NS_ERROR_INVALID_ARG;
 
   // aHost may contain a leading dot; if so, strip it now.
-  nsDependentCString host(aHost);
-  PRBool domain = !host.IsEmpty() && host.First() == '.';
-  if (domain)
-    host.Rebind(host.BeginReading() + 1, host.EndReading());
+  PRBool domain = !aHost.IsEmpty() && aHost.First() == '.';
 
   // get the base domain. this will fail if the host contains a leading dot,
   // more than one trailing dot, or is otherwise malformed.
-  nsresult rv = mTLDService->GetBaseDomainFromHost(host, 0, aBaseDomain);
+  nsresult rv = mTLDService->GetBaseDomainFromHost(Substring(aHost, domain), 0, aBaseDomain);
   if (rv == NS_ERROR_HOST_IS_IP_ADDRESS ||
       rv == NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) {
     // aHost is either an IP address, an alias such as 'localhost', an eTLD
@@ -3041,7 +3038,7 @@ nsCookieService::GetBaseDomainFromHost(const nsACString &aHost,
     if (domain)
       return NS_ERROR_INVALID_ARG;
 
-    aBaseDomain = host;
+    aBaseDomain = aHost;
     return NS_OK;
   }
   return rv;