Fix a few breakages with Pub's oauth2 test.

utils/pub/utils.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// Generic utility functions. Stuff that should possibly be in core.
 library utils;
 
 import 'dart:async';
 import 'dart:crypto';
 import 'dart:isolate';
@@ skipping 119 matching lines @@
   },
       onError: (e) => completer.completeError(e.error, e.stackTrace),
       onDone: () => completer.completeError(new StateError("No elements")),
       unsubscribeOnError: true);
   return completer.future;
 }
 
 /// Returns a wrapped version of [stream] along with a [StreamSubscription] that
 /// can be used to control the wrapped stream.
 Pair<Stream, StreamSubscription> streamWithSubscription(Stream stream) {
-  var controller = stream.isSingleSubscription ?
-      new StreamController() :
-      new StreamController.multiSubscription();
+  var controller = stream.isBroadcast ?
+      new StreamController.broadcast() :
+      new StreamController();
   var subscription = stream.listen(controller.add,
       onError: controller.signalError,
       onDone: controller.close);
   return new Pair<Stream, StreamSubscription>(controller.stream, subscription);
 }
 
 // TODO(nweiz): remove this when issue 7787 is fixed.
 /// Creates two single-subscription [Stream]s that each emit all values and
 /// errors from [stream]. This is useful if [stream] is single-subscription but
 /// multiple subscribers are necessary.
@@ skipping 106 matching lines @@
 
 /// Add all key/value pairs from [source] to [destination], overwriting any
 /// pre-existing values.
 void mapAddAll(Map destination, Map source) =>
   source.forEach((key, value) => destination[key] = value);
 
 /// Decodes a URL-encoded string. Unlike [decodeUriComponent], this includes
 /// replacing `+` with ` `.
 String urlDecode(String encoded) =>
   decodeUriComponent(encoded.replaceAll("+", " "));