Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 10 insertions, 4 deletions

diff --git a/toolkit/components/resistfingerprinting/nsUserCharacteristics.h b/toolkit/components/resistfingerprinting/nsUserCharacteristics.h
index a52bc9aea7..7d78dcd965 100644
--- a/toolkit/components/resistfingerprinting/nsUserCharacteristics.h
+++ b/toolkit/components/resistfingerprinting/nsUserCharacteristics.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #ifndef __nsUserCharacteristics_h__
 #define __nsUserCharacteristics_h__
@@ -12,9 +12,15 @@ class nsUserCharacteristics {
  public:
   static void MaybeSubmitPing();
 
-  // Public For testing
-  static nsresult PopulateData(bool aTesting = false);
-  static nsresult SubmitPing();
+  /*
+   * These APIs are public only for testing using the gtest
+   * When PopulateDataAndEventuallySubmit is called with aTesting = true
+   *   it will not submit the data, and SubmitPing must be called explicitly.
+   *   This is perfect because that's what we want for the gtest.
+   */
+  static void PopulateDataAndEventuallySubmit(bool aUpdatePref = true,
+                                              bool aTesting = false);
+  static void SubmitPing();
 };
 
 namespace testing {