Remove the non-driver versions of several tests

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

Index: pkg/analysis_server/test/services/completion/dart/uri_contributor_test.dart
diff --git a/pkg/analysis_server/test/services/completion/dart/uri_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/uri_contributor_test.dart
index c476fea29236ba72f0421d22d9f979b053f777c7..cfed83c955ed0855d304c86ae8820ab060e0d453 100644
--- a/pkg/analysis_server/test/services/completion/dart/uri_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/uri_contributor_test.dart
@@ -16,14 +16,15 @@ main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(UriContributorTest);
     defineReflectiveTests(UriContributorWindowsTest);
-    defineReflectiveTests(UriContributorTest_Driver);
-    defineReflectiveTests(UriContributorWindowsTest_Driver);
   });
 }
 
 @reflectiveTest
 class UriContributorTest extends DartCompletionContributorTest {
   @override
+  bool get enableNewAnalysisDriver => true;
+
+  @override
   DartCompletionContributor createContributor() {
     return new UriContributor();
   }
@@ -463,13 +464,10 @@ class UriContributorTest extends DartCompletionContributorTest {
 }
 
 @reflectiveTest
-class UriContributorTest_Driver extends UriContributorTest {
+class UriContributorWindowsTest extends DartCompletionContributorTest {
   @override
   bool get enableNewAnalysisDriver => true;
-}
 
-@reflectiveTest
-class UriContributorWindowsTest extends DartCompletionContributorTest {
   @override
   DartCompletionContributor createContributor() {
     return new UriContributor();
@@ -634,12 +632,6 @@ class UriContributorWindowsTest extends DartCompletionContributorTest {
   }
 }
 
-@reflectiveTest
-class UriContributorWindowsTest_Driver extends UriContributorWindowsTest {
-  @override
-  bool get enableNewAnalysisDriver => true;
-}
-
 class _TestWinResourceProvider extends MemoryResourceProvider {
   @override
   Context get pathContext => windows;