Migrate test block 30 + corelib portion of block 31 to Dart 2.0.

tests/corelib_2/uri_query_test.dart

Index: tests/corelib_2/uri_query_test.dart
diff --git a/tests/corelib_strong/uri_query_test.dart b/tests/corelib_2/uri_query_test.dart
similarity index 89%
rename from tests/corelib_strong/uri_query_test.dart
rename to tests/corelib_2/uri_query_test.dart
index e015cb3245badce6cbbe3b7b62a320449626d4f6..01b4c51b31ebc0bbb0821918a388b2febf0f4599 100644
--- a/tests/corelib_strong/uri_query_test.dart
+++ b/tests/corelib_2/uri_query_test.dart
@@ -100,21 +100,21 @@ void testQueryParameters() {
     }
     unencoded.writeCharCode(i);
   }
-  encoded = encoded.toString();
-  unencoded = unencoded.toString();
-  test("a=$encoded", {"a": unencoded});
-  test("a=$encoded&b=$encoded", {"a": unencoded, "b": unencoded});
+  var encodedStr = encoded.toString();
+  var unencodedStr = unencoded.toString();
+  test("a=$encodedStr", {"a": unencodedStr});
+  test("a=$encodedStr&b=$encodedStr", {"a": unencodedStr, "b": unencodedStr});
 
   var map = new Map();
-  map[unencoded] = unencoded;
-  test("$encoded=$encoded", map);
-  test("$encoded=$allEncoded", map, "$encoded=$encoded");
-  test("$allEncoded=$encoded", map, "$encoded=$encoded");
-  test("$allEncoded=$allEncoded", map, "$encoded=$encoded");
-  map[unencoded] = null;
-  test("$encoded", map);
-  map[unencoded] = "";
-  test("$encoded", map);
+  map[unencodedStr] = unencodedStr;
+  test("$encodedStr=$encodedStr", map);
+  test("$encodedStr=$allEncoded", map, "$encodedStr=$encodedStr");
+  test("$allEncoded=$encodedStr", map, "$encodedStr=$encodedStr");
+  test("$allEncoded=$allEncoded", map, "$encodedStr=$encodedStr");
+  map[unencodedStr] = null;
+  test("$encodedStr", map);
+  map[unencodedStr] = "";
+  test("$encodedStr", map);
 }
 
 testInvalidQueryParameters() {