Bug 1752332: Remove the shouldSanitizeFunction member r=KrisWright

In the following patch we are going to change the signature of
ShouldSanitizePreference to take a Pref object.  Pref is only
known to the Preferences compilation unit; so to keep this member
(whose signature will change) we would need to expose the Pref
class. However it will only be a forward declaration, one could
not construct a Pref object in e.g. the gtest.

It is simpler to just remove the member entirely and call
ShouldSanitizePreference unconditionally - the member was only
used for the gtest, and while the gtest will be less robust
because of this change, it will still do some testing.

Depends on D141419

Differential Revision: https://phabricator.services.mozilla.com/D141420

dom/ipc/ContentParent.cpp

@@ -2532,8 +2532,7 @@ bool ContentParent::BeginSubprocessLaunch(ProcessPriority aPriority) {
 
   // Instantiate the pref serializer. It will be cleaned up in
   // `LaunchSubprocessReject`/`LaunchSubprocessResolve`.
-  mPrefSerializer = MakeUnique<mozilla::ipc::SharedPreferenceSerializer>(
+  mPrefSerializer = MakeUnique<mozilla::ipc::SharedPreferenceSerializer>();
-      ShouldSanitizePreference);
   if (!mPrefSerializer->SerializeToSharedMemory(GeckoProcessType_Content,
                                                 GetRemoteType())) {
     NS_WARNING("SharedPreferenceSerializer::SerializeToSharedMemory failed");

dom/media/ipc/RDDProcessHost.cpp

@@ -46,8 +46,7 @@ bool RDDProcessHost::Launch(StringVector aExtraOpts) {
   MOZ_ASSERT(mLaunchPhase == LaunchPhase::Unlaunched);
   MOZ_ASSERT(!mRDDChild);
 
-  mPrefSerializer =
+  mPrefSerializer = MakeUnique<ipc::SharedPreferenceSerializer>();
-      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSanitizePreference);
   if (!mPrefSerializer->SerializeToSharedMemory(GeckoProcessType_RDD,
                                                 /* remoteType */ ""_ns)) {
     return false;

gfx/ipc/GPUProcessHost.cpp

@@ -42,8 +42,7 @@ bool GPUProcessHost::Launch(StringVector aExtraOpts) {
   MOZ_ASSERT(!mGPUChild);
   MOZ_ASSERT(!gfxPlatform::IsHeadless());
 
-  mPrefSerializer =
+  mPrefSerializer = MakeUnique<ipc::SharedPreferenceSerializer>();
-      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSanitizePreference);
   if (!mPrefSerializer->SerializeToSharedMemory(GeckoProcessType_GPU,
                                                 /* remoteType */ ""_ns)) {
     return false;

gfx/vr/ipc/VRProcessParent.cpp

@@ -55,8 +55,7 @@ bool VRProcessParent::Launch() {
   std::vector<std::string> extraArgs;
   ProcessChild::AddPlatformBuildID(extraArgs);
 
-  mPrefSerializer =
+  mPrefSerializer = MakeUnique<ipc::SharedPreferenceSerializer>();
-      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSanitizePreference);
   if (!mPrefSerializer->SerializeToSharedMemory(GeckoProcessType_VR,
                                                 /* remoteType */ ""_ns)) {
     return false;

ipc/glue/ProcessUtils.h

@@ -27,8 +27,7 @@ void SetThisProcessName(const char* aName);
 
 class SharedPreferenceSerializer final {
  public:
-  explicit SharedPreferenceSerializer(
+  explicit SharedPreferenceSerializer();
-      std::function<bool(const char*, bool)>&& aShouldSanitizeFn);
   SharedPreferenceSerializer(SharedPreferenceSerializer&& aOther);
   ~SharedPreferenceSerializer();
 
@@ -51,7 +50,6 @@ class SharedPreferenceSerializer final {
   size_t mPrefsLength;
   UniqueFileHandle mPrefMapHandle;
   UniqueFileHandle mPrefsHandle;
-  std::function<bool(const char*, bool)> mShouldSanitizeFn;
 };
 
 class SharedPreferenceDeserializer final {

ipc/glue/ProcessUtils_common.cpp

@@ -18,9 +18,8 @@
 namespace mozilla {
 namespace ipc {
 
-SharedPreferenceSerializer::SharedPreferenceSerializer(
+SharedPreferenceSerializer::SharedPreferenceSerializer()
-    std::function<bool(const char*, bool)>&& aShouldSanitizeFn)
+    : mPrefMapSize(0), mPrefsLength(0) {
-    : mPrefMapSize(0), mPrefsLength(0), mShouldSanitizeFn(aShouldSanitizeFn) {
   MOZ_COUNT_CTOR(SharedPreferenceSerializer);
 }
 
@@ -50,7 +49,7 @@ bool SharedPreferenceSerializer::SerializeToSharedMemory(
 
   // Serialize the early prefs.
   nsAutoCStringN<1024> prefs;
-  Preferences::SerializePreferences(prefs, mShouldSanitizeFn, destIsWebContent);
+  Preferences::SerializePreferences(prefs, destIsWebContent);
   mPrefsLength = prefs.Length();
 
   base::SharedMemory shm;

ipc/glue/UtilityProcessHost.cpp

@@ -60,8 +60,7 @@ bool UtilityProcessHost::Launch(StringVector aExtraOpts) {
   MOZ_ASSERT(mLaunchPhase == LaunchPhase::Unlaunched);
   MOZ_ASSERT(!mUtilityProcessParent);
 
-  mPrefSerializer =
+  mPrefSerializer = MakeUnique<ipc::SharedPreferenceSerializer>();
-      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSanitizePreference);
   if (!mPrefSerializer->SerializeToSharedMemory(GeckoProcessType_Utility,
                                                 /* remoteType */ ""_ns)) {
     return false;

ipc/ipdl/test/gtest/IPDLUnitTest.cpp

@@ -49,8 +49,7 @@ already_AddRefed<IPDLUnitTestParent> IPDLUnitTestParent::CreateCrossProcess() {
 
   std::vector<std::string> extraArgs;
 
-  auto prefSerializer =
+  auto prefSerializer = MakeUnique<ipc::SharedPreferenceSerializer>();
-      MakeUnique<ipc::SharedPreferenceSerializer>(ShouldSanitizePreference);
   if (!prefSerializer->SerializeToSharedMemory(GeckoProcessType_IPDLUnitTest,
                                                /* remoteType */ ""_ns)) {
     ADD_FAILURE()

modules/libpref/Preferences.cpp

@@ -3611,10 +3611,8 @@ NS_IMPL_ISUPPORTS(Preferences, nsIPrefService, nsIObserver, nsIPrefBranch,
                   nsISupportsWeakReference)
 
 /* static */
-void Preferences::SerializePreferences(
+void Preferences::SerializePreferences(nsCString& aStr,
-    nsCString& aStr,
+                                       bool aIsDestinationWebContentProcess) {
-    const std::function<bool(const char*, bool)>& aShouldSanitizeFn,
-    bool aIsDestinationContentProcess) {
   MOZ_RELEASE_ASSERT(InitStaticMembers());
 
   aStr.Truncate();
@@ -3623,7 +3621,8 @@ void Preferences::SerializePreferences(
     Pref* pref = iter.get().get();
     if (!pref->IsTypeNone() && pref->HasAdvisablySizedValues()) {
       pref->SerializeAndAppend(
-          aStr, aShouldSanitizeFn(pref->Name(), aIsDestinationContentProcess));
+          aStr,
+          ShouldSanitizePreference(pref, aIsDestinationWebContentProcess));
     }
   }
 

modules/libpref/Preferences.h

@@ -400,10 +400,8 @@ class Preferences final : public nsIPrefService,
 
   // When a content process is created these methods are used to pass changed
   // prefs in bulk from the parent process, via shared memory.
-  static void SerializePreferences(
+  static void SerializePreferences(nsCString& aStr,
-      nsCString& aStr,
+                                   bool aIsDestinationWebContentProcess);
-      const std::function<bool(const char*, bool)>& aShouldSanitizeFn,
-      bool aIsDestinationContentProcess);
   static void DeserializePreferences(char* aStr, size_t aPrefsLen);
 
   static mozilla::ipc::FileDescriptor EnsureSnapshot(size_t* aSize);

modules/libpref/test/gtest/Basics.cpp

@@ -43,17 +43,13 @@ TEST(PrefsBasics, Serialize)
             true);
 
   nsCString str;
-  Preferences::SerializePreferences(
+  Preferences::SerializePreferences(str, true);
-      str, [](const char* aPref, bool) -> bool { return true; }, true);
+  fprintf(stderr, "%s\n", str.Data());
-  // Assert everything was marked sanitized
+  // Assert that some prefs were not sanitized
-  ASSERT_EQ(nullptr, strstr(str.Data(), "--:"));
+  ASSERT_NE(nullptr, strstr(str.Data(), "B--:"));
-
+  ASSERT_NE(nullptr, strstr(str.Data(), "I--:"));
-  Preferences::SerializePreferences(
+  ASSERT_NE(nullptr, strstr(str.Data(), "S--:"));
-      str,
+  // Assert that something was sanitized
-      [](const char* aPref, bool) -> bool {
+  ASSERT_NE(nullptr,
-        return strncmp(aPref, "foo.bool", 8) == 0;
+            strstr(str.Data(), "I-S:56/datareporting.policy.dataSubmissionPolicyAcceptedVersion"));
-      },
-      true);
-  // Assert the sanitized serializtion was found
-  ASSERT_NE(nullptr, strstr(str.Data(), "B-S:8/foo.bool:T:\n"));
 }

netwerk/ipc/SocketProcessHost.cpp

@@ -68,7 +68,7 @@ bool SocketProcessHost::Launch() {
   std::vector<std::string> extraArgs;
   ProcessChild::AddPlatformBuildID(extraArgs);
 
-  SharedPreferenceSerializer prefSerializer(ShouldSanitizePreference);
+  SharedPreferenceSerializer prefSerializer;
   if (!prefSerializer.SerializeToSharedMemory(GeckoProcessType_VR,
                                               /* remoteType */ ""_ns)) {
     return false;