Make server use the common protocol classes

pkg/analysis_server/lib/src/plugin/result_merger.dart

Index: pkg/analysis_server/lib/src/plugin/result_merger.dart
diff --git a/pkg/analysis_server/lib/src/plugin/result_merger.dart b/pkg/analysis_server/lib/src/plugin/result_merger.dart
index e83cc61ed27b3ce615a4912ba737655f566bfa6a..5b262c1eb59003d6136602c683afd2a93191e8f4 100644
--- a/pkg/analysis_server/lib/src/plugin/result_merger.dart
+++ b/pkg/analysis_server/lib/src/plugin/result_merger.dart
@@ -4,9 +4,8 @@
 
 import 'dart:collection';
 
-import 'package:analysis_server/protocol/protocol_generated.dart'
-    hide AnalysisErrorFixes;
-import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin;
+import 'package:analysis_server/protocol/protocol_generated.dart';
+import 'package:analyzer_plugin/protocol/protocol_common.dart';
 import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
 import 'package:meta/meta.dart';
 
@@ -32,7 +31,7 @@ class ResultMerger {
     /**
      * Return a key encoding the unique attributes of the given [error].
      */
-    String computeKey(plugin.AnalysisError error) {
+    String computeKey(AnalysisError error) {
       StringBuffer buffer = new StringBuffer();
       buffer.write(error.location.offset);
       buffer.write(';');