Remove the non-driver versions of several tests

pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart

Index: pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart
diff --git a/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart
index 834cda608104ba55d5511f70afe777936eeb1ebf..59a949e3ccc13498039238c75f138383b180d012 100644
--- a/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart
@@ -15,13 +15,15 @@ import 'completion_contributor_util.dart';
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(InheritedContributorTest);
-    defineReflectiveTests(InheritedContributorTest_Driver);
   });
 }
 
 @reflectiveTest
 class InheritedContributorTest extends DartCompletionContributorTest {
   @override
+  bool get enableNewAnalysisDriver => true;
+
+  @override
   bool get isNullExpectedReturnTypeConsideredDynamic => false;
 
   @override
@@ -29,6 +31,30 @@ class InheritedContributorTest extends DartCompletionContributorTest {
     return new InheritedReferenceContributor();
   }
 
+  /// Sanity check.  Permutations tested in local_ref_contributor.
+  test_ArgDefaults_inherited_method_with_required_named() async {
+    addMetaPackageSource();
+    resolveSource(
+        '/testB.dart',
+        '''
+import 'package:meta/meta.dart';
+
+lib libB;
+class A {
+   bool foo(int bar, {bool boo, @required int baz}) => false;
+}''');
+    addTestSource('''
+import "/testB.dart";
+class B extends A {
+  b() => f^
+}
+''');
+    await computeSuggestions();
+
+    assertSuggestMethod('foo', 'A', 'bool',
+        defaultArgListString: 'bar, baz: null');
+  }
+
   test_AwaitExpression_inherited() async {
     // SimpleIdentifier  AwaitExpression  ExpressionStatement
     resolveSource(
@@ -618,33 +644,3 @@ class B extends A1 with A2 {
     assertNotSuggested('y2');
   }
 }
-
-@reflectiveTest
-class InheritedContributorTest_Driver extends InheritedContributorTest {
-  @override
-  bool get enableNewAnalysisDriver => true;
-
-  /// Sanity check.  Permutations tested in local_ref_contributor.
-  test_ArgDefaults_inherited_method_with_required_named() async {
-    addMetaPackageSource();
-    resolveSource(
-        '/testB.dart',
-        '''
-import 'package:meta/meta.dart';
-
-lib libB;
-class A {
-   bool foo(int bar, {bool boo, @required int baz}) => false;
-}''');
-    addTestSource('''
-import "/testB.dart";
-class B extends A {
-  b() => f^
-}
-''');
-    await computeSuggestions();
-
-    assertSuggestMethod('foo', 'A', 'bool',
-        defaultArgListString: 'bar, baz: null');
-  }
-}