Add a change for r19194 that got eaten in a merge.

pkg/http/lib/src/multipart_file.dart

 // Copyright (c) 2012, 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 multipart_file;
 
 import 'dart:async';
 import 'dart:io';
 
 import '../../../../pkg/pathos/lib/path.dart' as path;
@@ skipping 62 matching lines @@
     var charset = contentType.charset;
     var encoding = encodingForCharset(contentType.charset, Encoding.UTF_8);
     contentType.charset = encoding.name;
 
     return new MultipartFile.fromBytes(field, encodeString(value, encoding),
         filename: filename,
         contentType: contentType);
   }
 
   // TODO(nweiz): Infer the content-type from the filename.
-  /// Creates a new [MultipartFile] from a [File].
+  /// Creates a new [MultipartFile] from a path to a file on disk.
   ///
-  /// [filename] defaults to the name of the file on disk. [contentType]
-  /// currently defaults to `application/octet-stream`, but in the future may be
-  /// inferred from [filename].
-  static Future<MultipartFile> fromFile(String field, File file,
+  /// [filename] defaults to the basename of [filePath]. [contentType] currently
+  /// defaults to `application/octet-stream`, but in the future may be inferred
+  /// from [filename].
+  static Future<MultipartFile> fromPath(String field, String filePath,
       {String filename, ContentType contentType}) {
-    if (filename == null) filename = new Path(file.name).filename;
+    if (filename == null) filename = path.basename(filePath);
+    var file = new File(filePath);
     return file.length().then((length) {
       var stream = new ByteStream(file.openRead());
       return new MultipartFile(field, stream, length,
           filename: filename,
           contentType: contentType);
     });
   }
 
   // Finalizes the file in preparation for it being sent as part of a
   // [MultipartRequest]. This returns a [ByteStream] that should emit the body
   // of the file. The stream may be closed to indicate an empty file.
   ByteStream finalize() {
     if (isFinalized) {
       throw new StateError("Can't finalize a finalized MultipartFile.");
     }
     _isFinalized = true;
     return _stream;
   }
 }