Remove the non-driver versions of several tests

pkg/analysis_server/test/services/search/hierarchy_test.dart

Index: pkg/analysis_server/test/services/search/hierarchy_test.dart
diff --git a/pkg/analysis_server/test/services/search/hierarchy_test.dart b/pkg/analysis_server/test/services/search/hierarchy_test.dart
index 9f23cf795ce56951bc063433e2b6c3c35fd6f79c..26a1c7df739210e17aae3d17756420ed05e7edae 100644
--- a/pkg/analysis_server/test/services/search/hierarchy_test.dart
+++ b/pkg/analysis_server/test/services/search/hierarchy_test.dart
@@ -6,13 +6,9 @@ library test.services.src.search.hierarchy;
 
 import 'dart:async';
 
-import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/search/hierarchy.dart';
-import 'package:analysis_server/src/services/search/search_engine.dart';
-import 'package:analysis_server/src/services/search/search_engine_internal.dart';
 import 'package:analysis_server/src/services/search/search_engine_internal2.dart';
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/src/dart/analysis/ast_provider_context.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -21,13 +17,20 @@ import '../../abstract_single_unit.dart';
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(HierarchyTest);
-    defineReflectiveTests(HierarchyTest_Driver);
   });
 }
 
 @reflectiveTest
-abstract class AbstractHierarchyTest extends AbstractSingleUnitTest {
-  SearchEngine get searchEngine;
+class HierarchyTest extends AbstractSingleUnitTest {
+  SearchEngineImpl2 searchEngine;
+
+  @override
+  bool get enableNewAnalysisDriver => true;
+
+  void setUp() {
+    super.setUp();
+    searchEngine = new SearchEngineImpl2([driver]);
+  }
 
   test_getClassMembers() async {
     await _indexTestUnit('''
@@ -358,40 +361,6 @@ class F implements A {}
     }
   }
 
-  Future<Null> _indexTestUnit(String code);
-}
-
-@reflectiveTest
-class HierarchyTest extends AbstractHierarchyTest {
-  Index index;
-  SearchEngineImpl searchEngine;
-
-  void setUp() {
-    super.setUp();
-    index = createMemoryIndex();
-    searchEngine =
-        new SearchEngineImpl(index, (_) => new AstProviderForContext(context));
-  }
-
-  Future<Null> _indexTestUnit(String code) async {
-    await resolveTestUnit(code);
-    index.indexUnit(testUnit);
-  }
-}
-
-@reflectiveTest
-class HierarchyTest_Driver extends AbstractHierarchyTest {
-  SearchEngineImpl2 searchEngine;
-
-  @override
-  bool get enableNewAnalysisDriver => true;
-
-  void setUp() {
-    super.setUp();
-    searchEngine = new SearchEngineImpl2([driver]);
-  }
-
-  @override
   Future<Null> _indexTestUnit(String code) async {
     await resolveTestUnit(code);
   }