Roll to pickup pool changes

packages/barback/test/stream_pool_test.dart

Index: packages/barback/test/stream_pool_test.dart
diff --git a/packages/barback/test/stream_pool_test.dart b/packages/barback/test/stream_pool_test.dart
index ed590f3a9f9617a587e52cb58998c1f0a9ad728b..b7f4bf95e2370a097585424cfe1c880f29772ce4 100644
--- a/packages/barback/test/stream_pool_test.dart
+++ b/packages/barback/test/stream_pool_test.dart
@@ -50,18 +50,21 @@ main() {
       controller1.add("fifth");
 
       expect(newFuture(() {
-        return pool.stream.transform(new StreamTransformer.fromHandlers(
-            handleData: (data, sink) => sink.add(["data", data]),
-            handleError: (error, stackTrace, sink) {
-          sink.add(["error", error]);
-        })).toList();
-      }), completion(equals([
-        ["data", "first"],
-        ["data", "second"],
-        ["error", "third"],
-        ["error", "fourth"],
-        ["data", "fifth"]
-      ])));
+        return pool.stream
+            .transform(new StreamTransformer.fromHandlers(
+                handleData: (data, sink) => sink.add(["data", data]),
+                handleError: (error, stackTrace, sink) {
+                  sink.add(["error", error]);
+                }))
+            .toList();
+      }),
+          completion(equals([
+            ["data", "first"],
+            ["data", "second"],
+            ["error", "third"],
+            ["error", "fourth"],
+            ["data", "fifth"]
+          ])));
 
       pumpEventQueue().then((_) => pool.close());
     });
@@ -113,9 +116,12 @@ main() {
       controller2.addError("second");
 
       expect(newFuture(() {
-        return pool.stream.transform(new StreamTransformer.fromHandlers(
-            handleData: (data, sink) => sink.add(data),
-            handleError: (error, stackTrace, sink) { sink.add(error); }))
+        return pool.stream
+            .transform(new StreamTransformer.fromHandlers(
+                handleData: (data, sink) => sink.add(data),
+                handleError: (error, stackTrace, sink) {
+                  sink.add(error);
+                }))
             .toList();
       }), completion(isEmpty));
 
@@ -140,10 +146,8 @@ main() {
     group(type, () {
       var pool;
       var bufferedController;
-      var bufferedStream;
       var bufferedSyncController;
       var broadcastController;
-      var broadcastStream;
       var broadcastSyncController;
 
       setUp(() {
@@ -163,7 +167,7 @@ main() {
         pool.add(broadcastController.stream);
 
         broadcastSyncController =
-          new StreamController<String>.broadcast(sync: true);
+            new StreamController<String>.broadcast(sync: true);
         pool.add(broadcastSyncController.stream);
       });
 
@@ -202,17 +206,19 @@ main() {
         expect(pool.stream.toList(), completion(equals(["first", "third"])));
 
         bufferedController.add("first");
-        expect(pumpEventQueue().then((_) {
-          pool.remove(bufferedController.stream);
-          bufferedController.add("second");
-        }).then((_) {
-          broadcastController.add("third");
-          return pumpEventQueue();
-        }).then((_) {
-          pool.remove(broadcastController.stream);
-          broadcastController.add("fourth");
-          pool.close();
-        }), completes);
+        expect(
+            pumpEventQueue().then((_) {
+              pool.remove(bufferedController.stream);
+              bufferedController.add("second");
+            }).then((_) {
+              broadcastController.add("third");
+              return pumpEventQueue();
+            }).then((_) {
+              pool.remove(broadcastController.stream);
+              broadcastController.add("fourth");
+              pool.close();
+            }),
+            completes);
       });
     });
   }