Remove child Lb policy listener used only in test now after the backoff timer changes.

Fix failing tests.

Author: kannanjgithub

rls/src/main/java/io/grpc/rls/LbPolicyConfiguration.java

@@ -401,13 +401,6 @@ public void updateBalancingState(ConnectivityState newState, SubchannelPicker ne
     }
   }
 
-  /** Listener for child lb status change events. */
-  interface ChildLbStatusListener {
-
-    /** Notifies when child lb status changes. */
-    void onStatusChanged(ConnectivityState newState);
-  }
-
   private static final class RefCountedChildPolicyWrapper
       implements ObjectPool<ChildPolicyWrapper> {
 

rls/src/test/java/io/grpc/rls/LbPolicyConfigurationTest.java

@@ -39,7 +39,6 @@
 import io.grpc.Status;
 import io.grpc.SynchronizationContext;
 import io.grpc.rls.ChildLoadBalancerHelper.ChildLoadBalancerHelperProvider;
-import io.grpc.rls.LbPolicyConfiguration.ChildLbStatusListener;
 import io.grpc.rls.LbPolicyConfiguration.ChildLoadBalancingPolicy;
 import io.grpc.rls.LbPolicyConfiguration.ChildPolicyWrapper;
 import io.grpc.rls.LbPolicyConfiguration.ChildPolicyWrapper.ChildPolicyReportingHelper;
@@ -61,7 +60,6 @@ public class LbPolicyConfigurationTest {
   private final LoadBalancer lb = mock(LoadBalancer.class);
   private final SubchannelStateManager subchannelStateManager = new SubchannelStateManagerImpl();
   private final SubchannelPicker picker = mock(SubchannelPicker.class);
-  private final ChildLbStatusListener childLbStatusListener = mock(ChildLbStatusListener.class);
   private final ResolvedAddressFactory resolvedAddressFactory =
       new ResolvedAddressFactory() {
         @Override
@@ -184,7 +182,6 @@ public void updateBalancingState_triggersListener() {
 
     childPolicyReportingHelper.updateBalancingState(ConnectivityState.READY, childPicker);
 
-    verify(childLbStatusListener).onStatusChanged(ConnectivityState.READY);
     assertThat(childPolicyWrapper.getPicker()).isEqualTo(childPicker);
     // picker governs childPickers will be reported to parent LB
     verify(helper).updateBalancingState(ConnectivityState.READY, picker);

rls/src/test/java/io/grpc/rls/RlsLoadBalancerTest.java

@@ -456,8 +456,7 @@ public void lb_working_withDefaultTarget_noRlsResponse() throws Exception {
         (FakeSubchannel) markReadyAndGetPickResult(inOrder, searchSubchannelArgs).getSubchannel();
     assertThat(searchSubchannel).isNotNull();
     assertThat(searchSubchannel).isNotSameInstanceAs(fallbackSubchannel);
-    times = PickFirstLoadBalancerProvider.isEnabledNewPickFirst() ? 1 : 2;
-    verifyLongCounterAdd("grpc.lb.rls.target_picks", times, 1, "wilderness", "complete");
+    verifyLongCounterAdd("grpc.lb.rls.target_picks", 1, 1, "wilderness", "complete");
 
     // create rescue subchannel
     picker.pickSubchannel(rescueSubchannelArgs);