Refactoring analyzer_cli for code hygiene.

pkg/analyzer_cli/test/driver_test.dart

Index: pkg/analyzer_cli/test/driver_test.dart
diff --git a/pkg/analyzer_cli/test/driver_test.dart b/pkg/analyzer_cli/test/driver_test.dart
index a9884623084d33d0a538d45f11874e5a4e34e571..0031600e23d21889dd4741b126f9fd7ce508dde8 100644
--- a/pkg/analyzer_cli/test/driver_test.dart
+++ b/pkg/analyzer_cli/test/driver_test.dart
@@ -15,9 +15,9 @@ import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/services/lint.dart';
 import 'package:analyzer/src/summary/idl.dart';
+import 'package:analyzer_cli/src/analyzer_driver.dart';
+import 'package:analyzer_cli/src/analyzer_options.dart';
 import 'package:analyzer_cli/src/ansi.dart' as ansi;
-import 'package:analyzer_cli/src/driver.dart';
-import 'package:analyzer_cli/src/options.dart';
 import 'package:cli_util/cli_util.dart' show getSdkDir;
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';