Bug 568271 - e10s: remote nsIPrefBranch::GetComplexValue(). Part 2: assert on pref set. r=jdm

modules/libpref/src/nsPrefBranch.cpp

@@ -198,6 +198,13 @@ NS_IMETHODIMP nsPrefBranch::GetBoolPref(const char *aPrefName, PRBool *_retval)
 
 NS_IMETHODIMP nsPrefBranch::SetBoolPref(const char *aPrefName, PRInt32 aValue)
 {
+#ifdef MOZ_IPC
+    if (XRE_GetProcessType() == GeckoProcessType_Content) {
+      NS_ERROR("cannot set pref from content process");
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+#endif
+
   const char *pref;
   nsresult   rv;
 
@@ -238,6 +245,13 @@ NS_IMETHODIMP nsPrefBranch::GetCharPref(const char *aPrefName, char **_retval)
 
 NS_IMETHODIMP nsPrefBranch::SetCharPref(const char *aPrefName, const char *aValue)
 {
+#ifdef MOZ_IPC
+    if (XRE_GetProcessType() == GeckoProcessType_Content) {
+      NS_ERROR("cannot set pref from content process");
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+#endif
+
   const char *pref;
   nsresult   rv;
 
@@ -277,6 +291,13 @@ NS_IMETHODIMP nsPrefBranch::GetIntPref(const char *aPrefName, PRInt32 *_retval)
 
 NS_IMETHODIMP nsPrefBranch::SetIntPref(const char *aPrefName, PRInt32 aValue)
 {
+#ifdef MOZ_IPC
+    if (XRE_GetProcessType() == GeckoProcessType_Content) {
+      NS_ERROR("cannot set pref from content process");
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+#endif
+
   const char *pref;
   nsresult   rv;
 
@@ -438,6 +459,13 @@ NS_IMETHODIMP nsPrefBranch::GetComplexValue(const char *aPrefName, const nsIID &
 
 NS_IMETHODIMP nsPrefBranch::SetComplexValue(const char *aPrefName, const nsIID & aType, nsISupports *aValue)
 {
+#ifdef MOZ_IPC
+    if (XRE_GetProcessType() == GeckoProcessType_Content) {
+      NS_ERROR("cannot set pref from content process");
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+#endif
+
   nsresult   rv = NS_NOINTERFACE;
 
   if (aType.Equals(NS_GET_IID(nsILocalFile))) {
@@ -520,6 +548,13 @@ NS_IMETHODIMP nsPrefBranch::SetComplexValue(const char *aPrefName, const nsIID &
 
 NS_IMETHODIMP nsPrefBranch::ClearUserPref(const char *aPrefName)
 {
+#ifdef MOZ_IPC
+    if (XRE_GetProcessType() == GeckoProcessType_Content) {
+      NS_ERROR("cannot set pref from content process");
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+#endif
+
   const char *pref;
   nsresult   rv;
 
@@ -560,6 +595,13 @@ NS_IMETHODIMP nsPrefBranch::PrefHasUserValue(const char *aPrefName, PRBool *_ret
 
 NS_IMETHODIMP nsPrefBranch::LockPref(const char *aPrefName)
 {
+#ifdef MOZ_IPC
+    if (XRE_GetProcessType() == GeckoProcessType_Content) {
+      NS_ERROR("cannot lock pref from content process");
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+#endif
+
   const char *pref;
   nsresult   rv;
 
@@ -600,6 +642,13 @@ NS_IMETHODIMP nsPrefBranch::PrefIsLocked(const char *aPrefName, PRBool *_retval)
 
 NS_IMETHODIMP nsPrefBranch::UnlockPref(const char *aPrefName)
 {
+#ifdef MOZ_IPC
+    if (XRE_GetProcessType() == GeckoProcessType_Content) {
+      NS_ERROR("cannot unlock pref from content process");
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+#endif
+
   const char *pref;
   nsresult   rv;
 
@@ -618,6 +667,13 @@ NS_IMETHODIMP nsPrefBranch::ResetBranch(const char *aStartingAt)
 
 NS_IMETHODIMP nsPrefBranch::DeleteBranch(const char *aStartingAt)
 {
+#ifdef MOZ_IPC
+    if (XRE_GetProcessType() == GeckoProcessType_Content) {
+      NS_ERROR("cannot set pref from content process");
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+#endif
+
   const char *pref;
   nsresult   rv;