Remove references to Engine classes from protocol.dart

pkg/analysis_server/lib/src/services/completion/imported_computer.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.computer.dart.toplevel;
 
 import 'dart:async';
 
-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' hide Element, ElementKind;
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
 import 'package:analysis_server/src/services/completion/suggestion_builder.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/resolver.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 /**
  * A computer for calculating imported class and top level variable
@@ skipping 116 matching lines @@
             _addElementSuggestion(element, CompletionRelevance.LOW);
           }
         }
       });
       return true;
     });
   }
 
   void _addElementSuggestion(Element element, CompletionRelevance relevance) {
     CompletionSuggestionKind kind =
-        new CompletionSuggestionKind.fromElementKind(element.kind);
+        newCompletionSuggestionKind_fromElementKind(element.kind);
 
     String completion = element.displayName;
     CompletionSuggestion suggestion = new CompletionSuggestion(
         kind,
         relevance,
         completion,
         completion.length,
         0,
         element.isDeprecated,
         false);
 
-    suggestion.element = new protocol.Element.fromEngine(element);
+    suggestion.element = newElement_fromEngine(element);
 
     DartType type;
     if (element is FunctionElement) {
       type = element.returnType;
     } else if (element is PropertyAccessorElement && element.isGetter) {
       type = element.returnType;
     } else if (element is TopLevelVariableElement) {
       type = element.type;
     }
     if (type != null) {
@@ skipping 12 matching lines @@
       CompletionSuggestion suggestion = new CompletionSuggestion(
           CompletionSuggestionKind.LIBRARY_PREFIX,
           CompletionRelevance.DEFAULT,
           completion,
           completion.length,
           0,
           importElem.isDeprecated,
           false);
       LibraryElement lib = importElem.importedLibrary;
       if (lib != null) {
-        suggestion.element = new protocol.Element.fromEngine(lib);
+        suggestion.element = newElement_fromEngine(lib);
       }
       request.suggestions.add(suggestion);
     }
   }
 }