[Bookmarks] Refactor search view to use SelectableListLayout paradigm

chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.widget.selection;
 
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.support.annotation.CallSuper;
@@ skipping 60 matching lines @@
     protected static final int NAVIGATION_BUTTON_NONE = 0;
     /** Button to open the DrawerLayout. Only valid if mDrawerLayout is set. **/
     protected static final int NAVIGATION_BUTTON_MENU = 1;
     /** Button to navigate back. This calls {@link #onNavigationBack()}. **/
     protected static final int NAVIGATION_BUTTON_BACK = 2;
     /** Button to clear the selection. **/
     protected static final int NAVIGATION_BUTTON_SELECTION_BACK = 3;
 
     protected boolean mIsSelectionEnabled;
     protected SelectionDelegate<E> mSelectionDelegate;
+    protected boolean mIsSearching;
 
     private boolean mHasSearchView;
-    private boolean mIsSearching;
     private LinearLayout mSearchView;
     private EditText mSearchEditText;
     private TintedImageButton mClearTextButton;
     private SearchDelegate mSearchDelegate;
 
     protected NumberRollView mNumberRollView;
     private DrawerLayout mDrawerLayout;
     private ActionBarDrawerToggle mActionBarDrawerToggle;
     private TintedDrawable mNormalMenuButton;
     private TintedDrawable mSelectionMenuButton;
@@ skipping 212 matching lines @@
         }
 
         if (mNavigationButton == NAVIGATION_BUTTON_MENU) {
             initActionBarDrawerToggle();
             // ActionBarDrawerToggle will take care of icon and content description, so just return.
             return;
         }
 
         if (mActionBarDrawerToggle != null) {
             mActionBarDrawerToggle.setDrawerIndicatorEnabled(false);
-            mDrawerLayout.addDrawerListener(null);
+            mDrawerLayout.removeDrawerListener(mActionBarDrawerToggle);
+            mActionBarDrawerToggle = null;
         }
 
         setNavigationOnClickListener(this);
 
         switch (mNavigationButton) {
             case NAVIGATION_BUTTON_NONE:
                 break;
             case NAVIGATION_BUTTON_BACK:
                 // TODO(twellington): use ic_arrow_back_white_24dp and tint it.
                 iconResId = R.drawable.back_normal;
@@ skipping 197 matching lines @@
 
     private void updateDisplayStyleIfNecessary() {
         if (mUiConfig != null) onDisplayStyleChanged(mUiConfig.getCurrentDisplayStyle());
     }
 
     @VisibleForTesting
     public View getSearchViewForTests() {
         return mSearchView;
     }
 }