Merge IO v2 branch to bleeding edge

tests/standalone/io/url_encoding_test.dart

Index: tests/standalone/io/url_encoding_test.dart
diff --git a/tests/standalone/io/url_encoding_test.dart b/tests/standalone/io/url_encoding_test.dart
index cee5022bf83efb49e7443cc1c5dfefd8e948b840..cfeefe596ff4e104699f6314747aa46fdd7bf4cd 100644
--- a/tests/standalone/io/url_encoding_test.dart
+++ b/tests/standalone/io/url_encoding_test.dart
@@ -1,18 +1,16 @@
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2013, 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.
 
 import "dart:async";
 import "dart:utf";
-part "../../../sdk/lib/io/input_stream.dart";
-part "../../../sdk/lib/io/output_stream.dart";
-part "../../../sdk/lib/io/chunked_stream.dart";
-part "../../../sdk/lib/io/string_stream.dart";
-part "../../../sdk/lib/io/stream_util.dart";
+
+part '../../../sdk/lib/io/io_stream_consumer.dart';
 part "../../../sdk/lib/io/http.dart";
 part "../../../sdk/lib/io/http_impl.dart";
 part "../../../sdk/lib/io/http_parser.dart";
 part "../../../sdk/lib/io/http_utils.dart";
+part "../../../sdk/lib/io/socket.dart";
 
 void testParseEncodedString() {
   String encodedString = 'foo+bar%20foobar%25%26';