diff --git a/widget/android/GfxInfo.cpp b/widget/android/GfxInfo.cpp
index a72b7058707b..35923b149b70 100644
--- a/widget/android/GfxInfo.cpp
+++ b/widget/android/GfxInfo.cpp
@@ -393,22 +393,22 @@ NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t aVersion)
 
 #endif
 
-const nsAString& GfxInfo::Model() const
+nsString GfxInfo::Model() const
 {
   return mModel;
 }
 
-const nsAString& GfxInfo::Hardware() const
+nsString GfxInfo::Hardware() const
 {
   return mHardware;
 }
 
-const nsAString& GfxInfo::Product() const
+nsString GfxInfo::Product() const
 {
   return mProduct;
 }
 
-const nsAString& GfxInfo::Manufacturer() const
+nsString GfxInfo::Manufacturer() const
 {
   return mManufacturer;
 }
diff --git a/widget/android/GfxInfo.h b/widget/android/GfxInfo.h
index 64c832806dca..734a68d6bb86 100644
--- a/widget/android/GfxInfo.h
+++ b/widget/android/GfxInfo.h
@@ -48,10 +48,10 @@ public:
 
   void EnsureInitializedFromGfxInfoData();
 
-  virtual const nsAString& Model() const;
-  virtual const nsAString& Hardware() const;
-  virtual const nsAString& Product() const;
-  virtual const nsAString& Manufacturer() const;
+  virtual nsString Model() const;
+  virtual nsString Hardware() const;
+  virtual nsString Product() const;
+  virtual nsString Manufacturer() const;
 
 #ifdef DEBUG
   NS_DECL_ISUPPORTS_INHERITED
diff --git a/widget/xpwidgets/GfxInfoBase.h b/widget/xpwidgets/GfxInfoBase.h
index f818cea24f8a..6f343caf051a 100644
--- a/widget/xpwidgets/GfxInfoBase.h
+++ b/widget/xpwidgets/GfxInfoBase.h
@@ -68,10 +68,10 @@ public:
   static nsTArray<GfxDriverInfo>* mDriverInfo;
   static bool mDriverInfoObserverInitialized;
 
-  virtual const nsAString& Model() const { return EmptyString(); }
-  virtual const nsAString& Hardware() const { return EmptyString(); }
-  virtual const nsAString& Product() const { return EmptyString(); }
-  virtual const nsAString& Manufacturer() const { return EmptyString(); }
+  virtual nsString Model() const { return EmptyString(); }
+  virtual nsString Hardware() const { return EmptyString(); }
+  virtual nsString Product() const { return EmptyString(); }
+  virtual nsString Manufacturer() const { return EmptyString(); }
   virtual uint32_t OperatingSystemVersion() const { return 0; }
 
 protected: