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

sdk/lib/io/io_resource_info.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.
 
 part of dart.io;
 
 abstract class _IOResourceInfo {
   final String type;
   final int id;
   String get name;
   static int _count = 0;
 
   static final Stopwatch _sw = new Stopwatch()..start();
   static final _startTime = new DateTime.now().millisecondsSinceEpoch;
 
   static double get timestamp => _startTime + _sw.elapsedMicroseconds/1000;
 
   _IOResourceInfo(this.type) : id = _IOResourceInfo.getNextID();
 
   /// 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',
         'id': id,
         'name': name,
       };
 
   static int getNextID() => _count++;
 }
 
@@ skipping 27 matching lines @@
 
   _ReadWriteResourceInfo(String type) :
     totalRead = 0,
     totalWritten = 0,
     readCount = 0,
     writeCount = 0,
     lastRead = 0.0,
     lastWrite = 0.0,
     super(type);
 
-  Map<String, dynamic> get fullValueMap =>
+  Map<String, String> get fullValueMap =>
     {
       'type': type,
       'id': id,
       'name': name,
       'totalRead': totalRead,
       'totalWritten': totalWritten,
       'readCount': readCount,
       'writeCount': writeCount,
       'lastRead': lastRead,
       'lastWrite': lastWrite
@@ skipping 26 matching lines @@
     return new List.from(openFiles.values.map((e) => e.referenceValueMap));
   }
 
   static Future<ServiceExtensionResponse> getOpenFiles(function, params) {
     assert(function == 'ext.dart.io.getOpenFiles');
     var data = {'type': '_openfiles', 'data': getOpenFilesList()};
     var json = JSON.encode(data);
     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) {
     assert(params.containsKey('id'));
     var id = int.parse(params['id']);
     var result =
       openFiles.containsKey(id) ? openFiles[id].getFileInfoMap() : {};
     var json = JSON.encode(result);
     return new Future.value(new ServiceExtensionResponse.result(json));
   }
@@ skipping 14 matching lines @@
   _ProcessResourceInfo(this.process) :
       startedAt = _IOResourceInfo.timestamp,
       super(TYPE) {
     ProcessStarted(this);
   }
 
   String get name => process._path;
 
   void stopped() { ProcessStopped(this); }
 
-  Map<String, dynamic> get fullValueMap =>
+  Map<String, String> get fullValueMap =>
     {
       'type': type,
       'id': id,
       'name': name,
       'pid': process.pid,
       'startedAt': startedAt,
       'arguments': process._arguments,
       'workingDirectory':
           process._workingDirectory == null ? '.' : process._workingDirectory,
     };
@@ skipping 28 matching lines @@
     var json = JSON.encode(result);
     return new Future.value(new ServiceExtensionResponse.result(json));
   }
 }
 
 class _SocketResourceInfo extends _ReadWriteResourceInfo {
   static const String TCP_STRING = 'TCP';
   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>();
 
   _SocketResourceInfo(this.socket) : super(TYPE) {
     SocketOpened(this);
   }
 
   String get name {
     if (socket.isListening) {
       return 'listening:${socket.address.host}:${socket.port}';
     }
     var remote = '';
     try {
       var remoteHost = socket.remoteAddress.host;
       var remotePort = socket.remotePort;
       remote = ' -> $remoteHost:$remotePort';
     } catch (e) { } // ignored if we can't get the information
     return '${socket.address.host}:${socket.port}$remote';
   }
 
   static Iterable<Map<String, String>> getOpenSocketsList() {
     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;
     result['host'] = socket.address.host;
     result['port'] = socket.port;
     if (!socket.isListening) {
       try {
         result['remoteHost'] = socket.remoteAddress.host;
         result['remotePort'] = socket.remotePort;
       } catch (e) {
@@ skipping 28 matching lines @@
 
   static SocketOpened(_SocketResourceInfo info) {
     assert(!openSockets.containsKey(info.id));
     openSockets[info.id] = info;
   }
 
   static SocketClosed(_SocketResourceInfo info) {
     assert(openSockets.containsKey(info.id));
     openSockets.remove(info.id);
   }
+
 }