Carry ListenerManager changes forward

Change-Id: Icdc6996b1a259b4cb62d1b8dc2ce2e89e2cbb550
diff --git a/android-studio-plugin/src/com/google/gct/studio/samples/SampleBrowserStep.java b/android-studio-plugin/src/com/google/gct/studio/samples/SampleBrowserStep.java
index d84ff83..d7eb196 100644
--- a/android-studio-plugin/src/com/google/gct/studio/samples/SampleBrowserStep.java
+++ b/android-studio-plugin/src/com/google/gct/studio/samples/SampleBrowserStep.java
@@ -25,9 +25,9 @@
 import com.android.tools.idea.ui.properties.core.StringValueProperty;
 import com.android.tools.idea.ui.properties.expressions.value.TransformOptionalExpression;
 import com.android.tools.idea.ui.properties.swing.TextProperty;
-import com.android.tools.idea.ui.wizard.StudioWizardStepPanel;
 import com.android.tools.idea.ui.validation.Validator;
 import com.android.tools.idea.ui.validation.ValidatorPanel;
+import com.android.tools.idea.ui.wizard.StudioWizardStepPanel;
 import com.android.tools.idea.wizard.model.ModelWizard;
 import com.android.tools.idea.wizard.model.ModelWizardStep;
 import com.android.utils.HtmlBuilder;
@@ -43,13 +43,11 @@
 import com.intellij.ui.SearchTextField;
 import com.intellij.ui.components.JBScrollPane;
 import com.intellij.ui.treeStructure.Tree;
-import com.intellij.util.Consumer;
 import com.intellij.util.ui.SwingHelper;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import javax.swing.event.MouseInputAdapter;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import java.awt.event.MouseEvent;
@@ -184,12 +182,7 @@
     });
 
     TextProperty searchValue = new TextProperty(mySearchBox.getTextEditor());
-    myListeners.listenAndFire(searchValue, new Consumer<String>() {
-      @Override
-      public void consume(String keyword) {
-        mySampleTreeManager.filterTree(keyword);
-      }
-    });
+    myListeners.receiveAndFire(searchValue, keyword -> mySampleTreeManager.filterTree(keyword));
 
     myValidatorPanel.registerValidator(sample, new Validator<Optional<Sample>>() {
       @NotNull