From d5cccf5cd6e66328ade7cbbbb9b70f18f3e09e6c Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Wed, 30 Mar 2016 09:10:50 -0700
Subject: [PATCH] rev mockito; remove deprecated uses

---
 packages/flutter_driver/lib/src/extension.dart | 6 +++---
 packages/flutter_driver/pubspec.yaml           | 2 +-
 packages/flutter_tools/pubspec.yaml            | 2 +-
 packages/flx/test/bundle_test.dart             | 3 +--
 packages/flx/test/signing_test.dart            | 5 ++---
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/flutter_driver/lib/src/extension.dart b/packages/flutter_driver/lib/src/extension.dart
index e99e50fb20..b4326f8638 100644
--- a/packages/flutter_driver/lib/src/extension.dart
+++ b/packages/flutter_driver/lib/src/extension.dart
@@ -85,7 +85,7 @@ class FlutterDriverExtension {
 
       if (commandHandler == null || commandDeserializer == null) {
         return new ServiceExtensionResponse.error(
-          ServiceExtensionResponse.kInvalidParams,
+          ServiceExtensionResponse.invalidParams,
           'Extension $_extensionMethod does not support command $commandKind'
         );
       }
@@ -95,13 +95,13 @@ class FlutterDriverExtension {
         return new ServiceExtensionResponse.result(JSON.encode(result.toJson()));
       }, onError: (e, s) {
         _log.warning('$e:\n$s');
-        return new ServiceExtensionResponse.error(ServiceExtensionResponse.kExtensionError, '$e');
+        return new ServiceExtensionResponse.error(ServiceExtensionResponse.extensionError, '$e');
       });
     } catch(error, stackTrace) {
       String message = 'Uncaught extension error: $error\n$stackTrace';
       _log.error(message);
       return new ServiceExtensionResponse.error(
-        ServiceExtensionResponse.kExtensionError, message);
+        ServiceExtensionResponse.extensionError, message);
     }
   }
 
diff --git a/packages/flutter_driver/pubspec.yaml b/packages/flutter_driver/pubspec.yaml
index c4ba57007b..e7b52d11d4 100644
--- a/packages/flutter_driver/pubspec.yaml
+++ b/packages/flutter_driver/pubspec.yaml
@@ -18,5 +18,5 @@ dependencies:
 
 dev_dependencies:
   test: '>=0.12.6 <1.0.0'
-  mockito: ^0.10.1
+  mockito: ^0.11.0
   quiver: '>=0.21.4 <0.22.0'
diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml
index 84fa2dcfdb..abef85cd87 100644
--- a/packages/flutter_tools/pubspec.yaml
+++ b/packages/flutter_tools/pubspec.yaml
@@ -41,4 +41,4 @@ dependencies:
 # See also https://github.com/dart-lang/pub/issues/1356
 
 dev_dependencies:
-  mockito: ^0.10.1
+  mockito: ^0.11.0
diff --git a/packages/flx/test/bundle_test.dart b/packages/flx/test/bundle_test.dart
index 89d7d856ec..fc6d2070a9 100644
--- a/packages/flx/test/bundle_test.dart
+++ b/packages/flx/test/bundle_test.dart
@@ -1,9 +1,8 @@
 import 'dart:async';
-import 'dart:convert' hide BASE64;
+import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:crypto/crypto.dart';
 import 'package:flx/bundle.dart';
 import 'package:flx/signing.dart';
 import 'package:test/test.dart';
diff --git a/packages/flx/test/signing_test.dart b/packages/flx/test/signing_test.dart
index e1c8f7cee9..50fe7068ed 100644
--- a/packages/flx/test/signing_test.dart
+++ b/packages/flx/test/signing_test.dart
@@ -1,11 +1,10 @@
 import 'dart:async';
-import 'dart:convert' hide BASE64;
+import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:bignum/bignum.dart';
-import 'package:pointycastle/pointycastle.dart' hide CipherParameters;
-import 'package:crypto/crypto.dart';
 import 'package:flx/signing.dart';
+import 'package:pointycastle/pointycastle.dart' hide CipherParameters;
 import 'package:test/test.dart';
 
 Future<Null> main() async {