Roll to pickup pool changes

packages/package_config/lib/discovery.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.
 
 library package_config.discovery;
 
 import "dart:async";
 import "dart:io";
 import "dart:typed_data" show Uint8List;
 
@@ skipping 15 matching lines @@
 ///
 /// This function can be used to load an explicitly configured package
 /// resolution file, for example one specified using a `--packages`
 /// command-line parameter.
 Future<Packages> loadPackagesFile(Uri packagesFile,
     {Future<List<int>> loader(Uri uri)}) async {
   Packages parseBytes(List<int> bytes) {
     Map<String, Uri> packageMap = pkgfile.parse(bytes, packagesFile);
     return new MapPackages(packageMap);
   }
+
   if (packagesFile.scheme == "file") {
     File file = new File.fromUri(packagesFile);
     return parseBytes(await file.readAsBytes());
   }
   if (loader == null) {
     return parseBytes(await _httpGet(packagesFile));
   }
   return parseBytes(await loader(packagesFile));
 }
 
@@ skipping 72 matching lines @@
   if (!dir.existsSync()) {
     throw new ArgumentError.value(
         workingDirectory, "workingDirectory", "Directory does not exist.");
   }
   File checkForConfigFile(Directory directory) {
     assert(directory.isAbsolute);
     var file = new File(path.join(directory.path, ".packages"));
     if (file.existsSync()) return file;
     return null;
   }
+
   // Check for $cwd/.packages
   var packagesCfgFile = checkForConfigFile(dir);
   if (packagesCfgFile != null) return packagesCfgFile;
   // Check for $cwd/packages/
   var packagesDir = new Directory(path.join(dir.path, "packages"));
   if (packagesDir.existsSync()) return packagesDir;
   // Check for cwd(/..)+/.packages
   var parentDir = dir.parent;
   while (parentDir.path != dir.path) {
     packagesCfgFile = checkForConfigFile(parentDir);
@@ skipping 65 matching lines @@
     return new NonFilePackagesDirectoryPackages(packagesDirectoryUri);
   }
 }
 
 /// Fetches a file over http.
 Future<List<int>> _httpGet(Uri uri) async {
   HttpClient client = new HttpClient();
   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;
   for (var list in splitContent) {
     totalLength += list.length;
   }
   Uint8List result = new Uint8List(totalLength);
   int offset = 0;
   for (List<int> contentPart in splitContent) {
     result.setRange(offset, offset + contentPart.length, contentPart);
     offset += contentPart.length;
   }
   return result;
 }