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

utils/tests/pub/oauth2_test.dart

Index: utils/tests/pub/oauth2_test.dart
diff --git a/utils/tests/pub/oauth2_test.dart b/utils/tests/pub/oauth2_test.dart
index 08d97fe4861c15f5956ac259827f7f6579e595ec..f3d38e04a089f9052ab68f4754830da5312915b6 100644
--- a/utils/tests/pub/oauth2_test.dart
+++ b/utils/tests/pub/oauth2_test.dart
@@ -71,7 +71,7 @@ main() {
       return consumeInputStream(request.inputStream).transform((bytes) {
         var body = new String.fromCharCodes(bytes);
         expect(body, matches(
-            new RegExp(r'(^|&)refresh_token=refresh%20token(&|$)')));
+            new RegExp(r'(^|&)refresh_token=refresh\+token(&|$)')));
 
         response.headers.contentType = new ContentType("application", "json");
         response.outputStream.writeString(JSON.stringify({
@@ -211,7 +211,7 @@ void handleAccessTokenRequest(ScheduledServer server, String accessToken) {
   server.handle('POST', '/token', (request, response) {
     return consumeInputStream(request.inputStream).transform((bytes) {
       var body = new String.fromCharCodes(bytes);
-      expect(body, matches(new RegExp(r'(^|&)code=access%20code(&|$)')));
+      expect(body, matches(new RegExp(r'(^|&)code=access\+code(&|$)')));
 
       response.headers.contentType = new ContentType("application", "json");
       response.outputStream.writeString(JSON.stringify({