[Bookmarks] Refactor search view to use SelectableListLayout paradigm

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
index 6d112660071ff10a001c29b5a6396e3b07d4689a..b66573deef7d6c07120d7e62f630592890d5f7d5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
@@ -47,7 +47,6 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
         inflateMenu(R.menu.bookmark_action_bar_menu);
         setOnMenuItemClickListener(this);
 
-        getMenu().findItem(R.id.search_menu_id).setTitle(R.string.bookmark_action_bar_search);
         getMenu().findItem(R.id.selection_mode_edit_menu_id).setTitle(R.string.edit_bookmark);
         getMenu().findItem(R.id.selection_mode_move_menu_id)
                 .setTitle(R.string.bookmark_action_bar_move);
@@ -57,6 +56,11 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
 
     @Override
     public void onNavigationBack() {
+        if (mIsSearching) {
+            super.onNavigationBack();
+            return;
+        }
+
         mDelegate.openFolder(mCurrentFolder.getParentId());
     }
 
@@ -156,6 +160,9 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
     }
 
     @Override
+    public void onSearchStateSet() {}
+
+    @Override
     public void onSelectionStateChange(List<BookmarkId> selectedBookmarks) {
         super.onSelectionStateChange(selectedBookmarks);