Support shelf 0.7.0.

lib/src/runner/browser/browser_manager.dart

 // Copyright (c) 2015, 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.
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:async/async.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:pool/pool.dart';
+import 'package:stream_channel/stream_channel.dart';
 
 import '../../backend/metadata.dart';
 import '../../backend/test_platform.dart';
-import '../../util/multi_channel.dart';
 import '../../util/stack_trace_mapper.dart';
-import '../../utils.dart';
 import '../application_exception.dart';
 import '../environment.dart';
 import '../runner_suite.dart';
 import 'browser.dart';
 import 'chrome.dart';
 import 'content_shell.dart';
 import 'dartium.dart';
 import 'firefox.dart';
 import 'internet_explorer.dart';
 import 'phantom_js.dart';
@@ skipping 48 matching lines @@
   /// Starts the browser identified by [platform] and has it connect to [url].
   ///
   /// [url] should serve a page that establishes a WebSocket connection with
   /// this process. That connection, once established, should be emitted via
   /// [future]. If [debug] is true, starts the browser in debug mode, with its
   /// debugger interfaces on and detected.
   ///
   /// Returns the browser manager, or throws an [ApplicationException] if a
   /// connection fails to be established.
   static Future<BrowserManager> start(TestPlatform platform, Uri url,
-      Future<CompatibleWebSocket> future, {bool debug: false}) {
+      Future<WebSocketChannel> future, {bool debug: false}) {
     var browser = _newBrowser(url, platform, debug: debug);
 
     var completer = new Completer();
 
     // TODO(nweiz): Gracefully handle the browser being killed before the
     // tests complete.
     browser.onExit.then((_) {
       throw new ApplicationException(
           "${platform.name} exited before connecting.");
     }).catchError((error, stackTrace) {
@@ skipping 31 matching lines @@
       case TestPlatform.firefox: return new Firefox(url);
       case TestPlatform.safari: return new Safari(url);
       case TestPlatform.internetExplorer: return new InternetExplorer(url);
       default:
         throw new ArgumentError("$browser is not a browser.");
     }
   }
 
   /// Creates a new BrowserManager that communicates with [browser] over
   /// [webSocket].
-  BrowserManager._(this._browser, this._platform, CompatibleWebSocket webSocket)
-      : _channel = new MultiChannel(
-          webSocket.map(JSON.decode),
-          mapSink(webSocket, JSON.encode)) {
+  BrowserManager._(this._browser, this._platform, WebSocketChannel webSocket)
+      : _channel = new MultiChannel(webSocket.transform(jsonDocument)) {
     _environment = _loadBrowserEnvironment();
     _channel.stream.listen(_onMessage, onDone: close);
   }
 
   /// Loads [_BrowserEnvironment].
   Future<_BrowserEnvironment> _loadBrowserEnvironment() async {
     var observatoryUrl;
     if (_platform.isDartVM) observatoryUrl = await _browser.observatoryUrl;
 
     var remoteDebuggerUrl;
@@ skipping 95 matching lines @@
 
   final Uri observatoryUrl;
 
   final Uri remoteDebuggerUrl;
 
   _BrowserEnvironment(this._manager, this.observatoryUrl,
       this.remoteDebuggerUrl);
 
   CancelableOperation displayPause() => _manager._displayPause();
 }