More clean-up in server

pkg/analysis_server/lib/src/single_context_manager.dart

 // Copyright (c) 2016, 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 analysis_server.src.single_context_manager;
 
 import 'dart:async';
 import 'dart:core';
 import 'dart:math' as math;
 
@@ skipping 182 matching lines @@
           }
           // Remember the subscription.
           newSubscriptions[includedPath] = subscription;
         }
         _cancelCurrentWatchSubscriptions();
         this.watchSubscriptions = newSubscriptions;
       }
     }
     // Create or update the analysis context.
     if (context == null) {
-      UriResolver packageResolver = packageResolverProvider(contextFolder);
-      context = callbacks.addContext(contextFolder, defaultContextOptions,
-          new CustomPackageResolverDisposition(packageResolver));
+      context = callbacks.addContext(contextFolder, defaultContextOptions);
       ChangeSet changeSet =
           _buildChangeSet(added: _includedFiles(includedPaths, excludedPaths));
       callbacks.applyChangesToContext(contextFolder, changeSet);
     } else {
       // TODO(brianwilkerson) Optimize this.
       List<File> oldFiles =
           _includedFiles(this.includedPaths, this.excludedPaths);
       List<File> newFiles = _includedFiles(includedPaths, excludedPaths);
       ChangeSet changeSet = _buildChangeSet(
           added: _diff(newFiles, oldFiles), removed: _diff(oldFiles, newFiles));
@@ skipping 283 matching lines @@
   static List<Resource> _getChildrenSafe(Folder folder) {
     try {
       return folder.getChildren();
     } on FileSystemException {
       // The folder either doesn't exist or cannot be read.
       // Either way, there are no children.
       return const <Resource>[];
     }
   }
 }