Remove references to Engine classes from protocol.dart

pkg/analysis_server/lib/src/services/completion/suggestion_builder.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.completion.suggestion.builder;
 
-import 'package:analysis_server/src/protocol.dart' as protocol show Element, ElementKind;
-import 'package:analysis_server/src/protocol.dart' hide Element, ElementKind;
+import 'package:analysis_server/src/protocol_server.dart' as protocol;
+import 'package:analysis_server/src/protocol_server.dart' hide Element, ElementKind;
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
 import 'package:analyzer/src/generated/element.dart';
 
 /**
  * This class visits elements in a class and provides suggestions based upon
  * the visible members in that class. Clients should call
  * [ClassElementSuggestionBuilder.suggestionsFor].
  */
 class ClassElementSuggestionBuilder extends GeneralizingElementVisitor {
   final DartCompletionRequest request;
@@ skipping 70 matching lines @@
       return;
     }
     CompletionSuggestion suggestion = new CompletionSuggestion(
         kind,
         CompletionRelevance.DEFAULT,
         completion,
         completion.length,
         0,
         element.isDeprecated,
         false);
-    suggestion.element = new protocol.Element.fromEngine(element);
+    suggestion.element = newElement_fromEngine(element);
     if (suggestion.element != null) {
       if (element is FieldElement) {
         suggestion.element.kind = protocol.ElementKind.GETTER;
         suggestion.element.returnType =
             element.type != null ? element.type.displayName : 'dynamic';
       }
     }
     if (enclosingElement != null) {
       suggestion.declaringType = enclosingElement.displayName;
     }
@@ skipping 50 matching lines @@
   @override
   visitTopLevelVariableElement(TopLevelVariableElement element) {
     _addSuggestion(element);
   }
 
   void _addSuggestion(Element element) {
     if (element != null) {
       String completion = element.name;
       if (completion != null && completion.length > 0) {
         CompletionSuggestion suggestion = new CompletionSuggestion(
-            new CompletionSuggestionKind.fromElementKind(element.kind),
+            protocol.newCompletionSuggestionKind_fromElementKind(element.kind),
             CompletionRelevance.DEFAULT,
             completion,
             completion.length,
             0,
             element.isDeprecated,
             false);
 
-        suggestion.element = new protocol.Element.fromEngine(element);
+        suggestion.element = newElement_fromEngine(element);
 
         request.suggestions.add(suggestion);
       }
     }
   }
 
   /**
    * Add suggestions for the visible members in the given library
    */
   static void suggestionsFor(DartCompletionRequest request,
       LibraryElement library) {
     if (library != null) {
       library.visitChildren(new LibraryElementSuggestionBuilder(request));
     }
   }
 }