Hook for overriding the ContextManager and some code clean-up (with more to follow)

pkg/analysis_server/lib/src/domain_analysis.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 domain.analysis;
 
 import 'dart:async';
 import 'dart:core' hide Resource;
 
 import 'package:analysis_server/src/analysis_server.dart';
@@ skipping 124 matching lines @@
   }
 
   /**
    * Implement the 'analysis.reanalyze' request.
    */
   Response reanalyze(Request request) {
     AnalysisReanalyzeParams params =
         new AnalysisReanalyzeParams.fromRequest(request);
     List<String> roots = params.roots;
     if (roots == null || roots.isNotEmpty) {
-      List<String> includedPaths = server.contextDirectoryManager.includedPaths;
+      List<String> includedPaths = server.contextManager.includedPaths;
       List<Resource> rootResources = null;
       if (roots != null) {
         rootResources = <Resource>[];
         for (String rootPath in roots) {
           if (!includedPaths.contains(rootPath)) {
             return new Response.invalidAnalysisRoot(request, rootPath);
           }
           rootResources.add(server.resourceProvider.getResource(rootPath));
         }
       }
@@ skipping 68 matching lines @@
     }
     if (newOptions.generateLints != null) {
       updaters.add((engine.AnalysisOptionsImpl options) {
         options.lint = newOptions.generateLints;
       });
     }
     server.updateOptions(updaters);
     return new AnalysisUpdateOptionsResult().toResponse(request.id);
   }
 }