Fix pub_lish_test.

utils/pub/command_lish.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 command_lish;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:json';
 import 'dart:uri';
@@ skipping 67 matching lines @@
         return client.send(request);
       }).then(http.Response.fromStream).then((response) {
         var location = response.headers['location'];
         if (location == null) throw new PubHttpException(response);
         return location;
       }).then((location) => client.get(location))
         .then(handleJsonSuccess);
     }).catchError((asyncError) {
       if (asyncError.error is! PubHttpException) throw asyncError;
       var url = asyncError.error.response.request.url;
-      if (uriEqual(url, cloudStorageUrl)) {
+      if (urisEqual(url, cloudStorageUrl)) {
         // TODO(nweiz): the response may have XML-formatted information about
         // the error. Try to parse that out once we have an easily-accessible
         // XML parser.
         throw 'Failed to upload the package.';
-      } else if (uriEqual(url.origin, server.origin)) {
+      } else if (urisEqual(Uri.parse(url.origin), Uri.parse(server.origin))) {
         handleJsonError(asyncError.error.response);
       } else {
         throw asyncError;
       }
     });
   }
 
   Future onRun() {
     if (force && dryRun) {
       log.error('Cannot use both --force and --dry-run.');
@@ skipping 95 matching lines @@
       return confirm(message).then((confirmed) {
         if (!confirmed) {
           log.error("Package upload canceled.");
           return false;
         }
         return true;
       });
     });
   }
 }