commit 462e350a6aa6cda0db625a4d45652dba957c860f
author Paul Berry <paulberry@google.com> Fri May 25 19:02:03 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Fri May 25 19:02:03 2018 +0000
tree 3db5d01c7adc527123de3f70391aaa0f01006ca9
parent 6ed3b162d66a3f261ba3f5bc8ce430fefcbef4a0

Observatory strong mode fixes: Change types of InstanceMock/Instance members.

The types now correspond in the two classes, so we avoid invalid
override errors.

Change-Id: Iceeb324e6adf7573ae39d7250184f7eb58656498
Reviewed-on: https://dart-review.googlesource.com/56021
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>

runtime/observatory/lib/src/models/objects/instance.dart

diff --git a/runtime/observatory/lib/src/models/objects/instance.dart b/runtime/observatory/lib/src/models/objects/instance.dart
index 982d6d8..1a1b8d4 100644
--- a/runtime/observatory/lib/src/models/objects/instance.dart
+++ b/runtime/observatory/lib/src/models/objects/instance.dart
@@ -420,37 +420,37 @@
   ///
   /// Provided for instance kinds:
   ///   RegExp
-  Function get oneByteFunction;
+  FunctionRef get oneByteFunction;
 
   /// [optional]
   ///
   /// Provided for instance kinds:
   ///   RegExp
-  Function get twoByteFunction;
+  FunctionRef get twoByteFunction;
 
   /// [optional]
   ///
   /// Provided for instance kinds:
   ///   RegExp
-  Function get externalOneByteFunction;
+  FunctionRef get externalOneByteFunction;
 
   /// [optional]
   ///
   /// Provided for instance kinds:
   ///   RegExp
-  Function get externalTwoByteFunction;
+  FunctionRef get externalTwoByteFunction;
 
   /// [optional]
   ///
   /// Provided for instance kinds:
   ///   RegExp
-  Instance get oneByteBytecode;
+  InstanceRef get oneByteBytecode;
 
   /// [optional]
   ///
   /// Provided for instance kinds:
   ///   RegExp
-  Instance get twoByteBytecode;
+  InstanceRef get twoByteBytecode;
 }
 
 abstract class BoundField {

runtime/observatory/tests/observatory_ui/mocks/objects/instance.dart

diff --git a/runtime/observatory/tests/observatory_ui/mocks/objects/instance.dart b/runtime/observatory/tests/observatory_ui/mocks/objects/instance.dart
index aa72df2..df07d2c 100644
--- a/runtime/observatory/tests/observatory_ui/mocks/objects/instance.dart
+++ b/runtime/observatory/tests/observatory_ui/mocks/objects/instance.dart
@@ -50,7 +50,7 @@
   final M.ContextRef closureContext;
   final int offset;
   final int count;
-  final Iterable<dynamic> typedElements;
+  final List<dynamic> typedElements;
   final Iterable<M.BoundField> fields;
   final Iterable<M.NativeField> nativeFields;
   final Iterable<M.Guarded<M.ObjectRef>> elements;