Get more pub tests working.

utils/pub/oauth2.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 oauth2;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:uri';
 
@@ skipping 63 matching lines @@
       try {
         client.close();
         // Be sure to save the credentials even when an error happens. Also be
         // sure to pipe the exception from `future` to `completer`.
         chainToCompleter(
             _saveCredentials(cache, client.credentials).then((_) => future),
             completer);
       } catch (e, stackTrace) {
         // whenComplete will drop exceptions on the floor. We want to ensure
         // that any programming errors here don't go un-noticed. See issue 4127.
-        completer.completeException(e, stackTrace);
+        completer.completeError(e, stackTrace);
       }
     });
     return completer.future;
   }).catchError((e) {
     if (e is ExpirationException) {
       log.error("Pub's authorization to upload packages has expired and "
           "can't be automatically refreshed.");
       return withClient(cache, fn);
     } else if (e is AuthorizationException) {
       var message = "OAuth2 authorization failed";
@@ skipping 114 matching lines @@
       'Pub needs your authorization to upload packages on your behalf.\n'
       'In a web browser, go to $authUrl\n'
       'Then click "Allow access".\n\n'
       'Waiting for your authorization...');
 
   return completer.future.then((client) {
     log.message('Successfully authorized.\n');
     return client;
   });
 }