Reapply "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 ebd06ecee7c3645a4ba9148c6c975e0881c5dc10..806ce3ee34d0a5a6cb5f46083b7e467d105ef267 100644
--- a/utils/tests/pub/test_pub.dart
+++ b/utils/tests/pub/test_pub.dart
@@ -109,7 +109,7 @@ void serve([List<Descriptor> contents]) {
         } catch (e) {
           response.statusCode = 404;
           response.contentLength = 0;
-          closeHttpResponse(request, response);
+          response.outputStream.close();
           return;
         }
 
@@ -118,14 +118,14 @@ void serve([List<Descriptor> contents]) {
           response.statusCode = 200;
           response.contentLength = data.length;
           response.outputStream.write(data);
-          closeHttpResponse(request, response);
+          response.outputStream.close();
         });
 
         future.handleException((e) {
           print("Exception while handling ${request.uri}: $e");
           response.statusCode = 500;
           response.reasonPhrase = e.message;
-          closeHttpResponse(request, response);
+          response.outputStream.close();
         });
       };
       _server.listen("127.0.0.1", 0);