Move CLI options to a top-level class UiOptions

Remove the now-unused BlazeCommandEventHandler.

PiperOrigin-RevId: 259940495

src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java

diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java b/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
index 8762d59..a0c48d6 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
@@ -40,7 +40,6 @@
 import com.google.devtools.build.lib.profiler.Profiler;
 import com.google.devtools.build.lib.profiler.SilentCloseable;
 import com.google.devtools.build.lib.runtime.BlazeCommand;
-import com.google.devtools.build.lib.runtime.BlazeCommandEventHandler;
 import com.google.devtools.build.lib.runtime.BlazeCommandResult;
 import com.google.devtools.build.lib.runtime.BlazeModule;
 import com.google.devtools.build.lib.runtime.BlazeRuntime;
@@ -52,6 +51,7 @@
 import com.google.devtools.build.lib.runtime.GotOptionsEvent;
 import com.google.devtools.build.lib.runtime.KeepGoingOption;
 import com.google.devtools.build.lib.runtime.LoadingPhaseThreadsOption;
+import com.google.devtools.build.lib.runtime.UiOptions;
 import com.google.devtools.build.lib.runtime.commands.BuildCommand;
 import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.InvocationPolicy;
 import com.google.devtools.build.lib.sandbox.SandboxOptions;
@@ -150,7 +150,7 @@
                 LoadingPhaseThreadsOption.class,
                 PackageCacheOptions.class,
                 StarlarkSemanticsOptions.class,
-                BlazeCommandEventHandler.Options.class,
+                UiOptions.class,
                 SandboxOptions.class));
 
     for (BlazeModule module : runtime.getBlazeModules()) {

src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java b/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java
index 9fb518d..e84ec4b 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java
@@ -132,7 +132,7 @@
   private Collection<Class<?>> optionClassesWithDefault(Class<?>... optionClasses) {
     List<Class<?>> result = new ArrayList<>();
     Collections.addAll(result, optionClasses);
-    result.add(BlazeCommandEventHandler.Options.class);
+    result.add(UiOptions.class);
     result.add(CommonCommandOptions.class);
     result.add(ClientOptions.class);
     result.add(StarlarkSemanticsOptions.class);

src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java
index ad5c0cf..cce15bc 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java
@@ -24,7 +24,6 @@
 import com.google.devtools.build.lib.pkgcache.LoadingOptions;
 import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
 import com.google.devtools.build.lib.runtime.BlazeCommand;
-import com.google.devtools.build.lib.runtime.BlazeCommandEventHandler.Options;
 import com.google.devtools.build.lib.runtime.BlazeCommandResult;
 import com.google.devtools.build.lib.runtime.ClientOptions;
 import com.google.devtools.build.lib.runtime.Command;
@@ -32,6 +31,7 @@
 import com.google.devtools.build.lib.runtime.CommonCommandOptions;
 import com.google.devtools.build.lib.runtime.KeepGoingOption;
 import com.google.devtools.build.lib.runtime.StarlarkOptionsParser;
+import com.google.devtools.build.lib.runtime.UiOptions;
 import com.google.devtools.build.lib.skylark.util.SkylarkTestCase;
 import com.google.devtools.build.lib.util.ExitCode;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -59,7 +59,7 @@
           KeepGoingOption.class,
           LoadingOptions.class,
           ClientOptions.class,
-          Options.class,
+          UiOptions.class,
           CommonCommandOptions.class);
 
   @Before
@@ -84,7 +84,7 @@
         KeepGoingOption.class,
         LoadingOptions.class,
         ClientOptions.class,
-        Options.class,
+        UiOptions.class,
       },
       allowResidue = true,
       shortDescription =