Update the analysis server integration tests to always run on the analysis driver.

pkg/analysis_server/test/integration/analysis/analysis_options_test.dart

Index: pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart b/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
index 3216977f944b100eb3935687865bcc60315f6d09..49a165a24cece79aa022ec03fc13958fe98f8251 100644
--- a/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
@@ -12,13 +12,16 @@ import '../integration_tests.dart';
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(OptionsIntegrationTest);
-    defineReflectiveTests(OptionsIntegrationTest_Driver);
   });
 }
 
-class AbstractOptionsIntegrationTest
-    extends AbstractAnalysisServerIntegrationTest {
+@reflectiveTest
+class OptionsIntegrationTest extends AbstractAnalysisServerIntegrationTest {
+  @failingTest
   test_option_warning_newOptionFile() async {
+    // Test timed out after 30 seconds (#28868).
+    fail('Test timed out');
+
     String options = sourcePath(AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE);
     writeFile(
         options,
@@ -45,7 +48,11 @@ linter:
     expect(error.location.startColumn, 7);
   }
 
+  @failingTest
   test_option_warning_oldOptionFile() async {
+    // Test timed out after 30 seconds (#28868).
+    fail('Test timed out');
+
     String options = sourcePath(AnalysisEngine.ANALYSIS_OPTIONS_FILE);
     writeFile(
         options,
@@ -72,26 +79,3 @@ linter:
     expect(error.location.startColumn, 7);
   }
 }
-
-@reflectiveTest
-class OptionsIntegrationTest extends AbstractOptionsIntegrationTest {}
-
-@reflectiveTest
-class OptionsIntegrationTest_Driver extends AbstractOptionsIntegrationTest {
-  @override
-  bool get enableNewAnalysisDriver => true;
-
-  @failingTest
-  test_option_warning_newOptionFile() async {
-    //   TimeoutException after 0:00:30.000000: Test timed out after 30 seconds.
-    //return super.test_option_warning_newOptionFile();
-    fail('Test timed out');
-  }
-
-  @failingTest
-  test_option_warning_oldOptionFile() async {
-    //   TimeoutException after 0:00:30.000000: Test timed out after 30 seconds.
-    //return super.test_option_warning_oldOptionFile();
-    fail('Test timed out');
-  }
-}