Remove references to Engine classes from protocol.dart

pkg/analysis_server/lib/src/services/refactoring/inline_local.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 services.src.refactoring.inline_local;
 
 import 'dart:async';
 
-import 'package:analysis_server/src/protocol.dart' hide Element;
+import 'package:analysis_server/src/protocol_server.dart' hide Element;
 import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:analysis_server/src/services/correction/util.dart';
 import 'package:analysis_server/src/services/refactoring/refactoring.dart';
 import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/generated/scanner.dart';
 import 'package:analyzer/src/generated/source.dart';
@@ skipping 71 matching lines @@
           'Local variable declared in '
               'statement should be selected to activate this refactoring.');
       return new Future.value(result);
     }
     // should have initializer at declaration
     if (_variableNode.initializer == null) {
       String message = format(
           "Local variable '{0}' is not initialized at declaration.",
           _variableElement.displayName);
       result =
-          new RefactoringStatus.fatal(message, new Location.fromNode(_variableNode));
+          new RefactoringStatus.fatal(message, newLocation_fromNode(_variableNode));
       return new Future.value(result);
     }
     // prepare references
     return searchEngine.searchReferences(_variableElement).then((references) {
       this._references = references;
       // should not have assignments
       for (SearchMatch reference in _references) {
         if (reference.kind != MatchKind.READ) {
           String message = format(
               "Local variable '{0}' is assigned more than once.",
               [_variableElement.displayName]);
           return new RefactoringStatus.fatal(
               message,
-              new Location.fromMatch(reference));
+              newLocation_fromMatch(reference));
         }
       }
       // done
       return result;
     });
   }
 
   @override
   Future<SourceChange> createChange() {
     SourceChange change = new SourceChange(refactoringName);
     // remove declaration
     {
       Statement declarationStatement =
           _variableNode.getAncestor((node) => node is VariableDeclarationStatement);
       SourceRange range = utils.getLinesRangeStatements([declarationStatement]);
-      change.addElementEdit(unitElement, new SourceEdit.range(range, ''));
+      doSourceChange_addElementEdit(
+          change,
+          unitElement,
+          newSourceEdit_range(range, ''));
     }
     // prepare initializer
     Expression initializer = _variableNode.initializer;
     String initializerSource = utils.getNodeText(initializer);
     int initializerPrecedence = getExpressionPrecedence(initializer);
     // replace references
     for (SearchMatch reference in _references) {
       SourceRange range = reference.sourceRange;
       String sourceForReference =
           _getSourceForReference(range, initializerSource, initializerPrecedence);
-      change.addElementEdit(
+      doSourceChange_addElementEdit(
+          change,
           unitElement,
-          new SourceEdit.range(range, sourceForReference));
+          newSourceEdit_range(range, sourceForReference));
     }
     // done
     return new Future.value(change);
   }
 
   @override
   bool requiresPreview() => false;
 
   /**
    * Returns the source which should be used to replace the reference with the
@@ skipping 22 matching lines @@
    */
   bool _isIdentifierStringInterpolation(AstNode parent) {
     if (parent is InterpolationExpression) {
       InterpolationExpression element = parent;
       return element.beginToken.type ==
           TokenType.STRING_INTERPOLATION_IDENTIFIER;
     }
     return false;
   }
 }