Remove references to Engine classes from protocol.dart

pkg/analysis_server/lib/src/services/refactoring/extract_method.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.extract_method;
 
 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/name_suggestion.dart';
 import 'package:analysis_server/src/services/correction/selection_analyzer.dart';
 import 'package:analysis_server/src/services/correction/source_range.dart';
 import 'package:analysis_server/src/services/correction/statement_analyzer.dart';
 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/naming_conventions.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/refactoring/rename_class_member.dart';
@@ skipping 248 matching lines @@
           }
           sb.write(')');
         }
         invocationSource = sb.toString();
         // statements as extracted with their ";", so add new after invocation
         if (_selectionStatements != null) {
           invocationSource += ';';
         }
       }
       // add replace edit
-      SourceEdit edit = new SourceEdit.range(range, invocationSource);
-      change.addElementEdit(unitElement, edit);
+      SourceEdit edit = newSourceEdit_range(range, invocationSource);
+      doSourceChange_addElementEdit(change, unitElement, edit);
     }
     // add method declaration
     {
       // prepare environment
       String prefix = utils.getNodePrefix(_parentMember);
       String eol = utils.endOfLine;
       // prepare annotations
       String annotations = '';
       {
         // may be "static"
@@ skipping 36 matching lines @@
                 '${prefix}  return ${_returnVariableName};$eol';
           }
           declarationSource += '${prefix}}';
         }
       }
       // insert declaration
       if (declarationSource != null) {
         int offset = _parentMember.end;
         SourceEdit edit =
             new SourceEdit(offset, 0, '${eol}${eol}${prefix}${declarationSource}');
-        change.addElementEdit(unitElement, edit);
+        doSourceChange_addElementEdit(change, unitElement, edit);
       }
     }
     // done
     return new Future.value(change);
   }
 
   @override
   bool requiresPreview() => false;
 
   /**
@@ skipping 376 matching lines @@
             'Extend selection to a valid range.');
   }
 
   @override
   Object visitAssignmentExpression(AssignmentExpression node) {
     super.visitAssignmentExpression(node);
     Expression lhs = node.leftHandSide;
     if (_isFirstSelectedNode(lhs)) {
       invalidSelection(
           'Cannot extract the left-hand side of an assignment.',
-          new Location.fromNode(lhs));
+          newLocation_fromNode(lhs));
     }
     return null;
   }
 
   @override
   Object visitConstructorInitializer(ConstructorInitializer node) {
     super.visitConstructorInitializer(node);
     if (_isFirstSelectedNode(node)) {
       invalidSelection(
           'Cannot extract a constructor initializer. '
               'Select expression part of initializer.',
-          new Location.fromNode(node));
+          newLocation_fromNode(node));
     }
     return null;
   }
 
   @override
   Object visitForStatement(ForStatement node) {
     super.visitForStatement(node);
     if (identical(node.variables, firstSelectedNode)) {
       invalidSelection(
           "Cannot extract initialization part of a 'for' statement.");
@@ skipping 34 matching lines @@
     return null;
   }
 
   @override
   Object visitVariableDeclaration(VariableDeclaration node) {
     super.visitVariableDeclaration(node);
     if (_isFirstSelectedNode(node)) {
       invalidSelection(
           'Cannot extract a variable declaration fragment. '
               'Select whole declaration statement.',
-          new Location.fromNode(node));
+          newLocation_fromNode(node));
     }
     return null;
   }
 
   void _checkParent(AstNode node) {
     AstNode firstParent = firstSelectedNode.parent;
     do {
       node = node.parent;
       if (identical(node, firstParent)) {
         return;
@@ skipping 287 matching lines @@
 
 /**
  * Generalized version of some source, in which references to the specific
  * variables are replaced with pattern variables, with back mapping from the
  * pattern to the original variable names.
  */
 class _SourcePattern {
   String patternSource;
   Map<String, String> originalToPatternNames = {};
 }