MD Bookmarks: Restore any previously selected folder when clearing search

chrome/browser/resources/md_bookmarks/reducers.js

Index: chrome/browser/resources/md_bookmarks/reducers.js
diff --git a/chrome/browser/resources/md_bookmarks/reducers.js b/chrome/browser/resources/md_bookmarks/reducers.js
index b5cfabe3c9bde4141b27aa4f5bedbffa8aa18112..b0d0a9267ba9acae843c3e8e6ce32962a99ce430 100644
--- a/chrome/browser/resources/md_bookmarks/reducers.js
+++ b/chrome/browser/resources/md_bookmarks/reducers.js
@@ -304,10 +304,10 @@ cr.define('bookmarks', function() {
   };
 
   /**
-   * @param {?string} selectedFolder
+   * @param {string} selectedFolder
    * @param {Action} action
    * @param {NodeList} nodes
-   * @return {?string}
+   * @return {string}
    */
   SelectedFolderState.updateSelectedFolder = function(
       selectedFolder, action, nodes) {
@@ -324,12 +324,6 @@ cr.define('bookmarks', function() {
           return action.id;
         }
         return selectedFolder;
-      case 'finish-search':
-        return null;
-      case 'clear-search':
-        // TODO(tsergeant): Return to the folder that was selected before the
-        // search.
-        return nodes[ROOT_NODE_ID].children[0];
       case 'remove-bookmark':
         // When deleting the selected folder (or its ancestor), select the
         // parent of the deleted node.