Stop using deprecated pkg/test APIs - throw an HttpException ...instead of a String

diff --git a/pkgs/package_config/lib/discovery.dart b/pkgs/package_config/lib/discovery.dart
index 4c09eec..2abf443 100644
--- a/pkgs/package_config/lib/discovery.dart
+++ b/pkgs/package_config/lib/discovery.dart

@@ -210,8 +210,8 @@
   HttpClientRequest request = await client.getUrl(uri);
   HttpClientResponse response = await request.close();
   if (response.statusCode != HttpStatus.OK) {
-    throw 'Failure getting $uri: '
-        '${response.statusCode} ${response.reasonPhrase}';
+    throw new HttpException('${response.statusCode} ${response.reasonPhrase}',
+        uri: uri);
   }
   List<List<int>> splitContent = await response.toList();
   int totalLength = 0;

diff --git a/pkgs/package_config/pubspec.yaml b/pkgs/package_config/pubspec.yaml
index a629eaf..89b1855 100644
--- a/pkgs/package_config/pubspec.yaml
+++ b/pkgs/package_config/pubspec.yaml

@@ -1,5 +1,5 @@
 name: package_config
-version: 1.0.2
+version: 1.0.3-dev
 description: Support for working with Package Resolution config files.
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/package_config

diff --git a/pkgs/package_config/test/discovery_analysis_test.dart b/pkgs/package_config/test/discovery_analysis_test.dart
index 0a28767..c819a90 100644
--- a/pkgs/package_config/test/discovery_analysis_test.dart
+++ b/pkgs/package_config/test/discovery_analysis_test.dart

@@ -78,7 +78,7 @@
   if (location.scheme == "file") {
     expect(resolver.packages, unorderedEquals(["foo", "bar", "baz"]));
   } else {
-    expect(() => resolver.packages, throws);
+    expect(() => resolver.packages, throwsUnsupportedError);
   }
 }
 

diff --git a/pkgs/package_config/test/discovery_test.dart b/pkgs/package_config/test/discovery_test.dart
index 897063f..cbbca9a 100644
--- a/pkgs/package_config/test/discovery_test.dart
+++ b/pkgs/package_config/test/discovery_test.dart

@@ -41,7 +41,7 @@
   if (location.scheme == "file") {
     expect(resolver.packages, unorderedEquals(["foo", "bar", "baz"]));
   } else {
-    expect(() => resolver.packages, throws);
+    expect(() => resolver.packages, throwsUnsupportedError);
   }
 }
 
@@ -228,13 +228,16 @@
 
   generalTest("loadPackagesFile not found", {}, (Uri directory) async {
     Uri file = directory.resolve(".packages");
-    expect(loadPackagesFile(file), throws);
+    expect(
+        loadPackagesFile(file),
+        throwsA(anyOf(new isInstanceOf<FileSystemException>(),
+            new isInstanceOf<HttpException>())));
   });
 
   generalTest("loadPackagesFile syntax error", {".packages": "syntax error"},
       (Uri directory) async {
     Uri file = directory.resolve(".packages");
-    expect(loadPackagesFile(file), throws);
+    expect(loadPackagesFile(file), throwsFormatException);
   });
 
   generalTest("getPackagesDir", {

diff --git a/pkgs/package_config/test/parse_test.dart b/pkgs/package_config/test/parse_test.dart
index 7a2fce7..fb3a6fa 100644
--- a/pkgs/package_config/test/parse_test.dart
+++ b/pkgs/package_config/test/parse_test.dart

@@ -102,16 +102,18 @@
     for (int i = 0; i <= 255; i++) {
       if (map[i] == true) continue;
       var char = new String.fromCharCode(i);
-      expect(() => doParse("x${char}x:x", null), throws);
+      expect(() => doParse("x${char}x:x", null),
+          anyOf(throwsNoSuchMethodError, throwsFormatException));
     }
   });
 
   test("no escapes", () {
-    expect(() => doParse("x%41x:x", base), throws);
+    expect(() => doParse("x%41x:x", base), throwsFormatException);
   });
 
   test("same name twice", () {
-    expect(() => doParse(singleRelativeSample * 2, base), throws);
+    expect(
+        () => doParse(singleRelativeSample * 2, base), throwsFormatException);
   });
 
   for (String invalidSample in invalid) {