Reapply "Fix URI encoding/decoding of + and space""

utils/tests/pub/curl_client_test.dart

Index: utils/tests/pub/curl_client_test.dart
diff --git a/utils/tests/pub/curl_client_test.dart b/utils/tests/pub/curl_client_test.dart
index 98432e0f0245aef1eb5d5b05855b89fe043c8628..5c94a72b0d1dcf66d32d622bec0758722e929bbf 100644
--- a/utils/tests/pub/curl_client_test.dart
+++ b/utils/tests/pub/curl_client_test.dart
@@ -58,11 +58,11 @@ void main() {
           'content-type': [
             'application/x-www-form-urlencoded; charset=UTF-8'
           ],
-          'content-length': ['42'],
+          'content-length': ['40'],
           'x-random-header': ['Value'],
           'x-other-header': ['Other Value']
         },
-        'body': 'some-field=value&other-field=other%20value'
+        'body': 'some-field=value&other-field=other+value'
       })));
     }), completes);
   });
@@ -102,11 +102,11 @@ void main() {
           'content-type': [
             'application/x-www-form-urlencoded; charset=UTF-8'
           ],
-          'content-length': ['42'],
+          'content-length': ['40'],
           'x-random-header': ['Value'],
           'x-other-header': ['Other Value']
         },
-        'body': 'some-field=value&other-field=other%20value'
+        'body': 'some-field=value&other-field=other+value'
       })));
     }), completes);
   });