Revert "Fix remaining strong-mode warnings and errors in dart:io."

sdk/lib/io/io_resource_info.dart

Index: sdk/lib/io/io_resource_info.dart
diff --git a/sdk/lib/io/io_resource_info.dart b/sdk/lib/io/io_resource_info.dart
index 317cf13f0d39d1182262d5e87724f7df5a1886f4..7cea2312493e5bd29eb6d4798d0cd5838717d79d 100644
--- a/sdk/lib/io/io_resource_info.dart
+++ b/sdk/lib/io/io_resource_info.dart
@@ -19,11 +19,11 @@ abstract class _IOResourceInfo {
 
   /// Get the full set of values for a specific implementation. This is normally
   /// looked up based on an id from a referenceValueMap.
-  Map<String, dynamic> get fullValueMap;
+  Map<String, String> get fullValueMap;
 
   /// The reference map, used to return a list of values, e.g., getting
   /// all open sockets. The structure of this is shared among all subclasses.
-  Map<String, dynamic> get referenceValueMap =>
+  Map<String, String> get referenceValueMap =>
       {
         // The type for a reference object is prefixed with @ in observatory.
         'type': '@$type',
@@ -71,7 +71,7 @@ abstract class _ReadWriteResourceInfo extends _IOResourceInfo {
     lastWrite = 0.0,
     super(type);
 
-  Map<String, dynamic> get fullValueMap =>
+  Map<String, String> get fullValueMap =>
     {
       'type': type,
       'id': id,
@@ -118,8 +118,9 @@ class _FileResourceInfo extends _ReadWriteResourceInfo {
     return new Future.value(new ServiceExtensionResponse.result(json));
   }
 
-  Map<String, dynamic> getFileInfoMap() {
-    return fullValueMap;
+  Map<String, String> getFileInfoMap() {
+    var result = fullValueMap;
+    return result;
   }
 
   static Future<ServiceExtensionResponse> getFileInfoMapByID(function, params) {
@@ -154,7 +155,7 @@ class _ProcessResourceInfo extends _IOResourceInfo{
 
   void stopped() { ProcessStopped(this); }
 
-  Map<String, dynamic> get fullValueMap =>
+  Map<String, String> get fullValueMap =>
     {
       'type': type,
       'id': id,
@@ -203,7 +204,7 @@ class _SocketResourceInfo extends _ReadWriteResourceInfo {
   static const String UDP_STRING = 'UDP';
   static const String TYPE = '_socket';
 
-  final /*_NativeSocket|*/ socket;
+  final socket;
 
   static Map<int, _SocketResourceInfo> openSockets =
       new Map<int, _SocketResourceInfo>();
@@ -229,7 +230,7 @@ class _SocketResourceInfo extends _ReadWriteResourceInfo {
     return new List.from(openSockets.values.map((e) => e.referenceValueMap));
   }
 
-  Map<String, dynamic> getSocketInfoMap() {
+  Map<String, String> getSocketInfoMap() {
     var result = fullValueMap;
     result['socketType'] = socket.isTcp ? TCP_STRING : UDP_STRING;
     result['listening'] = socket.isListening;
@@ -278,4 +279,5 @@ class _SocketResourceInfo extends _ReadWriteResourceInfo {
     assert(openSockets.containsKey(info.id));
     openSockets.remove(info.id);
   }
+
 }