Refactoring analyzer_cli for code hygiene.

pkg/analyzer_cli/test/sdk_ext_test.dart

 // Copyright (c) 2015, 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.
 
 /// Test that sdk extensions are properly detected in various scenarios.
 library analyzer_cli.test.sdk_ext;
 
 import 'dart:io';
 
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/sdk.dart';
-import 'package:analyzer_cli/src/driver.dart' show Driver, errorSink, outSink;
-import 'package:analyzer_cli/src/options.dart';
+import 'package:analyzer_cli/src/analyzer_driver.dart'
+    show Driver, errorSink, outSink;
+import 'package:analyzer_cli/src/analyzer_options.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
 import 'utils.dart';
 
 main() {
   group('Sdk extensions', () {
     StringSink savedOutSink, savedErrorSink;
     int savedExitCode;
     ExitHandler savedExitHandler;
@@ skipping 24 matching lines @@
       ]);
 
       DartSdk sdk = driver.sdk;
       expect(sdk, new isInstanceOf<FolderBasedDartSdk>());
       expect((sdk as FolderBasedDartSdk).useSummary, isFalse);
 
       expect(exitCode, 0);
     });
   });
 }