Remove references to Engine classes from protocol.dart

pkg/analysis_server/test/services/correction/status_test.dart

 // Copyright (c) 2014, 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.
 
 library test.services.correction.status;
 
+import 'package:analysis_server/src/protocol_server.dart' hide Element;
+import 'package:analysis_server/src/services/correction/source_range.dart';
 import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
-import 'package:analysis_server/src/services/correction/source_range.dart';
-import '../../abstract_single_unit.dart';
-import '../../reflective_tests.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:unittest/unittest.dart';
-import 'package:analysis_server/src/protocol.dart' hide Element;
+
+import '../../abstract_single_unit.dart';
+import '../../reflective_tests.dart';
 
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(RefactoringLocationTest);
   runReflectiveTests(RefactoringStatusTest);
 }
 
 
 @ReflectiveTestCase()
 class RefactoringLocationTest extends AbstractSingleUnitTest {
   void test_createLocation_forElement() {
     resolveTestUnit('class MyClass {}');
     Element element = findElement('MyClass');
     // check
-    Location location = new Location.fromElement(element);
+    Location location = newLocation_fromElement(element);
     expect(location.file, '/test.dart');
     expect(location.offset, 6);
     expect(location.length, 7);
     expect(location.startLine, 1);
     expect(location.startColumn, 7);
   }
 
   void test_createLocation_forMatch() {
     resolveTestUnit('class MyClass {}');
     Element element = findElement('MyClass');
     SourceRange range = rangeElementName(element);
     SearchMatch match = new SearchMatch(null, element, range, true, false);
     // check
-    Location location = new Location.fromMatch(match);
+    Location location = newLocation_fromMatch(match);
     expect(location.file, '/test.dart');
     expect(location.offset, range.offset);
     expect(location.length, range.length);
   }
 
   void test_createLocation_forNode() {
     resolveTestUnit('''
 main() {
 }
 ''');
     AstNode node = findNodeAtString('main');
     // check
-    Location location = new Location.fromNode(node);
+    Location location = newLocation_fromNode(node);
     expect(location.file, '/test.dart');
     expect(location.offset, node.offset);
     expect(location.length, node.length);
   }
 
   void test_createLocation_forUnit() {
     resolveTestUnit('');
     SourceRange range = rangeStartLength(10, 20);
     // check
-    Location location = new Location.fromUnit(testUnit, range);
+    Location location = newLocation_fromUnit(testUnit, range);
     expect(location.file, '/test.dart');
     expect(location.offset, range.offset);
     expect(location.length, range.length);
   }
 }
 
 
 @ReflectiveTestCase()
 class RefactoringStatusTest {
   void test_addError() {
@@ skipping 139 matching lines @@
     expect(refactoringStatus.severity, RefactoringProblemSeverity.FATAL);
     expect(refactoringStatus.message, 'msg');
   }
 
   void test_newWarning() {
     RefactoringStatus refactoringStatus = new RefactoringStatus.warning('msg');
     expect(refactoringStatus.severity, RefactoringProblemSeverity.WARNING);
     expect(refactoringStatus.message, 'msg');
   }
 }