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

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

Issue 1414793015: Use the async package's CancelableOperation. (Closed) Base URL: git@github.com:dart-lang/test@master
Patch Set: Created 5 years, 1 month 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/dartium.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 fc570d15b6a9dbe490fbd2a0c35074a1177b6cb2..1b1f4c94609676893e86b4616b2a9af547863e8a 100644
--- a/lib/src/runner/browser/browser_manager.dart
+++ b/lib/src/runner/browser/browser_manager.dart
@@ -15,7 +15,6 @@ import '../../backend/group.dart';
import '../../backend/metadata.dart';
import '../../backend/test.dart';
import '../../backend/test_platform.dart';
-import '../../util/cancelable_future.dart';
import '../../util/multi_channel.dart';
import '../../util/remote_exception.dart';
import '../../util/stack_trace_mapper.dart';
@@ -282,18 +281,21 @@ class BrowserManager {
}
/// An implementation of [Environment.displayPause].
- CancelableFuture _displayPause() {
- if (_pauseCompleter != null) return _pauseCompleter.future;
+ CancelableOperation _displayPause() {
+ if (_pauseCompleter != null) return _pauseCompleter.operation;
- _pauseCompleter = new CancelableCompleter(() {
+ _pauseCompleter = new CancelableCompleter(onCancel: () {
_channel.sink.add({"command": "resume"});
_pauseCompleter = null;
});
- _channel.sink.add({"command": "displayPause"});
- return _pauseCompleter.future.whenComplete(() {
+ _pauseCompleter.operation.value.whenComplete(() {
_pauseCompleter = null;
});
+
+ _channel.sink.add({"command": "displayPause"});
+
+ return _pauseCompleter.operation;
}
/// The callback for handling messages received from the host page.
@@ -327,5 +329,5 @@ class _BrowserEnvironment implements Environment {
_BrowserEnvironment(this._manager, this.observatoryUrl,
this.remoteDebuggerUrl);
- CancelableFuture displayPause() => _manager._displayPause();
+ CancelableOperation displayPause() => _manager._displayPause();
}
« no previous file with comments | « no previous file | lib/src/runner/browser/dartium.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698