Remove unused implementation of SearchEngine and rename the driver-based implementation

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

 // Copyright (c) 2016, 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.
 
 import 'dart:async';
 
 import 'package:analysis_server/src/services/search/search_engine.dart';
-import 'package:analysis_server/src/services/search/search_engine_internal2.dart';
+import 'package:analysis_server/src/services/search/search_engine_internal.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/dart/analysis/file_state.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:front_end/src/base/performace_logger.dart';
 import 'package:front_end/src/incremental/byte_store.dart';
@@ skipping 38 matching lines @@
 class B extends A {}
 class C implements B {}
 ''');
 
     var driver = _newDriver();
     driver.addFile(p);
 
     var resultA = await driver.getResult(p);
     ClassElement element = resultA.unit.element.types[0];
 
-    var searchEngine = new SearchEngineImpl2([driver]);
+    var searchEngine = new SearchEngineImpl([driver]);
     Set<ClassElement> subtypes = await searchEngine.searchAllSubtypes(element);
     expect(subtypes, hasLength(3));
     expect(subtypes, contains(predicate((ClassElement e) => e.name == 'A')));
     expect(subtypes, contains(predicate((ClassElement e) => e.name == 'B')));
     expect(subtypes, contains(predicate((ClassElement e) => e.name == 'C')));
   }
 
   test_searchAllSubtypes_acrossDrivers() async {
     var a = _p('/test/a.dart');
     var b = _p('/test/b.dart');
@@ skipping 14 matching lines @@
 
     var driver1 = _newDriver();
     var driver2 = _newDriver();
 
     driver1.addFile(a);
     driver2.addFile(b);
 
     var resultA = await driver1.getResult(a);
     ClassElement element = resultA.unit.element.types[0];
 
-    var searchEngine = new SearchEngineImpl2([driver1, driver2]);
+    var searchEngine = new SearchEngineImpl([driver1, driver2]);
     Set<ClassElement> subtypes = await searchEngine.searchAllSubtypes(element);
     expect(subtypes, hasLength(3));
     expect(subtypes, contains(predicate((ClassElement e) => e.name == 'A')));
     expect(subtypes, contains(predicate((ClassElement e) => e.name == 'B')));
     expect(subtypes, contains(predicate((ClassElement e) => e.name == 'C')));
   }
 
   test_searchMemberDeclarations() async {
     var a = _p('/test/a.dart');
     var b = _p('/test/b.dart');
@@ skipping 18 matching lines @@
     var driver1 = _newDriver();
     var driver2 = _newDriver();
 
     driver1.addFile(a);
     driver2.addFile(b);
 
     while (scheduler.isAnalyzing) {
       await new Future.delayed(new Duration(milliseconds: 1));
     }
 
-    var searchEngine = new SearchEngineImpl2([driver1, driver2]);
+    var searchEngine = new SearchEngineImpl([driver1, driver2]);
     List<SearchMatch> matches =
         await searchEngine.searchMemberDeclarations('test');
     expect(matches, hasLength(2));
 
     void assertHasElement(String name, int nameOffset) {
       expect(
           matches,
           contains(predicate((SearchMatch m) =>
               m.kind == MatchKind.DECLARATION &&
               m.element.name == name &&
@@ skipping 26 matching lines @@
   p.test = 1;
 }
 ''');
 
     var driver1 = _newDriver();
     var driver2 = _newDriver();
 
     driver1.addFile(a);
     driver2.addFile(b);
 
-    var searchEngine = new SearchEngineImpl2([driver1, driver2]);
+    var searchEngine = new SearchEngineImpl([driver1, driver2]);
     List<SearchMatch> matches =
         await searchEngine.searchMemberReferences('test');
     expect(matches, hasLength(2));
     expect(
         matches,
         contains(predicate((SearchMatch m) =>
             m.element.name == 'foo' || m.kind == MatchKind.READ)));
     expect(
         matches,
         contains(predicate((SearchMatch m) =>
@@ skipping 19 matching lines @@
 
     var driver1 = _newDriver();
     var driver2 = _newDriver();
 
     driver1.addFile(a);
     driver2.addFile(b);
 
     var resultA = await driver1.getResult(a);
     ClassElement element = resultA.unit.element.types[0];
 
-    var searchEngine = new SearchEngineImpl2([driver1, driver2]);
+    var searchEngine = new SearchEngineImpl([driver1, driver2]);
     List<SearchMatch> matches = await searchEngine.searchReferences(element);
     expect(matches, hasLength(2));
     expect(
         matches, contains(predicate((SearchMatch m) => m.element.name == 'a')));
     expect(
         matches, contains(predicate((SearchMatch m) => m.element.name == 'b')));
   }
 
   test_searchTopLevelDeclarations() async {
     var a = _p('/test/a.dart');
@@ skipping 15 matching lines @@
     var driver1 = _newDriver();
     var driver2 = _newDriver();
 
     driver1.addFile(a);
     driver2.addFile(b);
 
     while (scheduler.isAnalyzing) {
       await new Future.delayed(new Duration(milliseconds: 1));
     }
 
-    var searchEngine = new SearchEngineImpl2([driver1, driver2]);
+    var searchEngine = new SearchEngineImpl([driver1, driver2]);
     List<SearchMatch> matches =
         await searchEngine.searchTopLevelDeclarations('.*');
     expect(
         matches.where((match) => !match.libraryElement.isInSdk), hasLength(4));
 
     void assertHasElement(String name) {
       expect(
           matches,
           contains(predicate((SearchMatch m) =>
               m.kind == MatchKind.DECLARATION && m.element.name == name)));
@@ skipping 13 matching lines @@
       contentOverlay,
       null,
       new SourceFactory(
           [new DartUriResolver(sdk), new ResourceUriResolver(provider)],
           null,
           provider),
       new AnalysisOptionsImpl()..strongMode = true);
 
   String _p(String path) => provider.convertPath(path);
 }