--- a/netwerk/cache/nsDiskCacheDeviceSQL.cpp
+++ b/netwerk/cache/nsDiskCacheDeviceSQL.cpp
@@ -1974,18 +1974,17 @@ nsOfflineCacheDevice::AddNamespace(const
   rv = ns->GetData(data);
   NS_ENSURE_SUCCESS(rv, rv);
 
   PRUint32 itemType;
   rv = ns->GetItemType(&itemType);
   NS_ENSURE_SUCCESS(rv, rv);
 
   LOG(("nsOfflineCacheDevice::AddNamespace [cid=%s, ns=%s, data=%s, type=%d]",
-       PromiseFlatCString(clientID).get(),
-       namespaceSpec.get(), data.get(), itemType));
+       clientID.get(), namespaceSpec.get(), data.get(), itemType));
 
   AutoResetStatement statement(mStatement_InsertNamespaceEntry);
 
   rv = statement->BindUTF8StringByIndex(0, clientID);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = statement->BindUTF8StringByIndex(1, namespaceSpec);
   NS_ENSURE_SUCCESS(rv, rv);

--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -301,18 +301,17 @@ HttpChannelParent::RecvCancel(const nsre
   return true;
 }
 
 
 bool
 HttpChannelParent::RecvSetCacheTokenCachedCharset(const nsCString& charset)
 {
   if (mCacheDescriptor)
-    mCacheDescriptor->SetMetaDataElement("charset",
-                                         PromiseFlatCString(charset).get());
+    mCacheDescriptor->SetMetaDataElement("charset", charset.get());
   return true;
 }
 
 bool
 HttpChannelParent::RecvUpdateAssociatedContentSecurity(const PRInt32& high,
                                                        const PRInt32& low,
                                                        const PRInt32& broken,
                                                        const PRInt32& no)