Revert "Stop working around issue 6984."

utils/tests/pub/test_pub.dart

Index: utils/tests/pub/test_pub.dart
diff --git a/utils/tests/pub/test_pub.dart b/utils/tests/pub/test_pub.dart
index 7e5580e2a05ce2d70ad33e6212fb169c101b7aff..2dc9eff9c33ac6dcc9897a5356c20bc3518c3303 100644
--- a/utils/tests/pub/test_pub.dart
+++ b/utils/tests/pub/test_pub.dart
@@ -108,7 +108,7 @@ void serve([List<Descriptor> contents]) {
         } catch (e) {
           response.statusCode = 404;
           response.contentLength = 0;
-          response.outputStream.close();
+          closeHttpResponse(request, response);
           return;
         }
 
@@ -117,14 +117,14 @@ void serve([List<Descriptor> contents]) {
           response.statusCode = 200;
           response.contentLength = data.length;
           response.outputStream.write(data);
-          response.outputStream.close();
+          closeHttpResponse(request, response);
         });
 
         future.handleException((e) {
           print("Exception while handling ${request.uri}: $e");
           response.statusCode = 500;
           response.reasonPhrase = e.message;
-          response.outputStream.close();
+          closeHttpResponse(request, response);
         });
       };
       _server.listen("127.0.0.1", 0);