| Index: pkg/analysis_server/lib/starter.dart | 
| diff --git a/pkg/analysis_server/lib/starter.dart b/pkg/analysis_server/lib/starter.dart | 
| index 031501712c05b9f344bf3fd8874a88fa37cb9fbd..087074dc2f18ea6a4a640a284ece40dca00b602e 100644 | 
| --- a/pkg/analysis_server/lib/starter.dart | 
| +++ b/pkg/analysis_server/lib/starter.dart | 
| @@ -2,10 +2,8 @@ | 
| // 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 analysis_server.starter; | 
| - | 
| -import 'package:analysis_server/src/server/driver.dart'; | 
| import 'package:analysis_server/src/analysis_server.dart'; | 
| +import 'package:analysis_server/src/server/driver.dart'; | 
| import 'package:analyzer/instrumentation/instrumentation.dart'; | 
| import 'package:analyzer/plugin/resolver_provider.dart'; | 
| import 'package:plugin/plugin.dart'; | 
| @@ -23,11 +21,6 @@ abstract class ServerStarter { | 
| factory ServerStarter() = Driver; | 
|  | 
| /** | 
| -   * Set the instrumentation [server] that is to be used by the analysis server. | 
| -   */ | 
| -  void set instrumentationServer(InstrumentationServer server); | 
| - | 
| -  /** | 
| * Set the file resolver provider used to override the way file URI's | 
| * are resolved in some contexts. The provider should return `null` if the | 
| * default file resolution scheme should be used instead. | 
| @@ -35,6 +28,11 @@ abstract class ServerStarter { | 
| void set fileResolverProvider(ResolverProvider provider); | 
|  | 
| /** | 
| +   * Set the instrumentation [server] that is to be used by the analysis server. | 
| +   */ | 
| +  void set instrumentationServer(InstrumentationServer server); | 
| + | 
| +  /** | 
| * Set the package resolver provider used to override the way package URI's | 
| * are resolved in some contexts. The provider should return `null` if the | 
| * default package resolution scheme should be used instead. | 
|  |