Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: lib/src/runner/browser/browser_manager.dart

Issue 1664433002: Support shelf 0.7.0. (Closed) Base URL: git@github.com:dart-lang/test@master
Patch Set: Code review changes Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | lib/src/runner/browser/iframe_listener.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/runner/browser/browser_manager.dart
diff --git a/lib/src/runner/browser/browser_manager.dart b/lib/src/runner/browser/browser_manager.dart
index 22f5e97e0e05244531ee4a2b48b85c7dbe0f3784..a0242a03c79229b6bb1b93e725c657a228d62d42 100644
--- a/lib/src/runner/browser/browser_manager.dart
+++ b/lib/src/runner/browser/browser_manager.dart
@@ -8,12 +8,11 @@ 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';
@@ -82,7 +81,7 @@ class BrowserManager {
/// 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();
@@ -134,10 +133,8 @@ class BrowserManager {
/// 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);
}
« no previous file with comments | « no previous file | lib/src/runner/browser/iframe_listener.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698