Unify the server and plugin versions of the generators

pkg/analysis_server/test/integration/support/integration_test_methods.dart

Index: pkg/analysis_server/test/integration/support/integration_test_methods.dart
diff --git a/pkg/analysis_server/test/integration/integration_test_methods.dart b/pkg/analysis_server/test/integration/support/integration_test_methods.dart
similarity index 99%
rename from pkg/analysis_server/test/integration/integration_test_methods.dart
rename to pkg/analysis_server/test/integration/support/integration_test_methods.dart
index 81fd25c9a45d155ccfeabe480713dda213b489e1..66dda3730d1a35f162ebb5fef564b27e8dd55f71 100644
--- a/pkg/analysis_server/test/integration/integration_test_methods.dart
+++ b/pkg/analysis_server/test/integration/support/integration_test_methods.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2017, 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.
 //
@@ -9,11 +9,9 @@
 /**
  * Convenience methods for running integration tests
  */
-library test.integration.methods;
-
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/protocol/protocol_internal.dart';
 import 'package:test/test.dart';