Use FileContentOverlay instead of ContentCache in the new driver.

pkg/analyzer/lib/src/dart/analysis/driver.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.
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/file_system.dart';
@@ skipping 62 matching lines @@
    * The byte storage to get and put serialized data.
    *
    * It can be shared with other [AnalysisDriver]s.
    */
   final ByteStore _byteStore;
 
   /**
    * This [ContentCache] is consulted for a file content before reading
    * the content from the file.
    */
-  final ContentCache _contentCache;
+  final FileContentOverlay _contentOverlay;
 
   /**
    * The [SourceFactory] is used to resolve URIs to paths and restore URIs
    * from file paths.
    */
   final SourceFactory _sourceFactory;
 
   /**
    * The analysis options to analyze with.
    */
@@ skipping 57 matching lines @@
    */
   AnalysisStatus _currentStatus = AnalysisStatus.IDLE;
 
   /**
    * Create a new instance of [AnalysisDriver].
    *
    * The given [SourceFactory] is cloned to ensure that it does not contain a
    * reference to a [AnalysisContext] in which it could have been used.
    */
   AnalysisDriver(this._logger, this._resourceProvider, this._byteStore,
-      this._contentCache, SourceFactory sourceFactory, this._analysisOptions)
+      this._contentOverlay, SourceFactory sourceFactory, this._analysisOptions)
       : _sourceFactory = sourceFactory.clone() {
     _sdkBundle = sourceFactory.dartSdk.getLinkedBundle();
-    _fsState = new FileSystemState(_logger, _byteStore, _contentCache,
+    _fsState = new FileSystemState(_logger, _byteStore, _contentOverlay,
         _resourceProvider, _sourceFactory, _analysisOptions);
   }
 
   /**
    * Set the list of files that the driver should try to analyze sooner.
    *
    * Every path in the list must be absolute and normalized.
    *
    * The driver will produce the results through the [results] stream. The
    * exact order in which results are produced is not defined, neither
@@ skipping 796 matching lines @@
   /**
    * Complete the [signal] future if it is not completed yet. It is safe to
    * call this method multiple times, but the [signal] will complete only once.
    */
   void notify() {
     if (!_completer.isCompleted) {
       _completer.complete(null);
     }
   }
 }