[Media Router WebUI] Fix search focus handlers when search is enabled

chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js

Index: chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
diff --git a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
index 26362e10a694143a51d0fba9b523a486a1fd99af..a10eaac20d8376ec76a8aa4c566a534292a9fb56 100644
--- a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
+++ b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
@@ -455,7 +455,6 @@ Polymer({
         this.$$('#focus-placeholder').remove();
 
       document.addEventListener('keydown', this.onKeydown_.bind(this), true);
-      this.setSearchFocusHandlers_();
       this.listen(this, 'focus', 'onFocus_');
       this.listen(this, 'header-height-changed', 'updateElementPositioning_');
       this.listen(this, 'header-or-arrow-click', 'toggleCastModeHidden_');
@@ -2054,6 +2053,7 @@ Polymer({
   searchEnabledChanged_: function(searchEnabled) {
     if (searchEnabled) {
       this.async(function() {
+        this.setSearchFocusHandlers_();
         this.putSearchAtBottom_();
       });
     }
@@ -2079,7 +2079,6 @@ Polymer({
    * @private
    */
   setSearchFocusHandlers_: function() {
-    var search = this.$$('#sink-search');
     var searchInput = this.$$('#sink-search-input');
     var that = this;
 
@@ -2095,15 +2094,13 @@ Polymer({
     // |showSearchResults_()|.
     window.addEventListener('blur', function() {
       that.isSearchFocusedOnWindowBlur_ =
-          that.shadowRoot.activeElement == search;
+          that.shadowRoot.activeElement == searchInput;
+    });
+    searchInput.addEventListener('focus', function() {
+      if (!that.isSearchFocusedOnWindowBlur_) {
+        that.showSearchResults_();
+      }
     });
-    if (this.hasConditionalElement_(search)) {
-      searchInput.addEventListener('focus', function() {
-        if (!that.isSearchFocusedOnWindowBlur_) {
-          that.showSearchResults_();
-        }
-      });
-    }
   },
 
   /**