Added patch to support JSON_ALLOW_TRAILING_COMMAS

brave · Mar 24, 2022 · 0e8834b · 0e8834b
1 parent 4555187
commit 0e8834b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/chromium_src/services/data_decoder/public/cpp/data_decoder.cc b/chromium_src/services/data_decoder/public/cpp/data_decoder.cc
@@ -0,0 +1,12 @@
+/* Copyright (c) 2022 The Brave Authors. All rights reserved.
+ * 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/. */
+
+#include "base/json/json_reader.h"
+
+#include "src/services/data_decoder/public/cpp/data_decoder.h"
+
+#define JSON_PARSE_RFC JSON_PARSE_RFC | base::JSON_ALLOW_TRAILING_COMMAS
+#include "src/services/data_decoder/public/cpp/data_decoder.cc"
+#undef JSON_PARSE_RFC
diff --git a/components/api_request_helper/api_request_helper_unittest.cc b/components/api_request_helper/api_request_helper_unittest.cc
@@ -110,7 +110,10 @@ TEST_F(ApiRequestHelperUnitTest, SanitizedRequest) {
   SendRequest("{", "");
   SendRequest("0", "");
   SendRequest("a", "");
-  SendRequest("{\"a\":1,}", "");
+  // Android's sanitizer doesn't support trailing commas.
+#if !BUILDFLAG(IS_ANDROID)
+  SendRequest("{\"a\":1,}", "{\"a\":1}");
+#endif
 }
 
 TEST_F(ApiRequestHelperUnitTest, RequestWithConversion) {