[Bookmarks] Refactor search view to use SelectableListLayout paradigm

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
index 5cb69e78ea7d565aa16cca55a40107bce32567e2..40e949ac0205bd2ce83fd54739cc68d75fcda5b2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
@@ -11,6 +11,7 @@ import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.ViewGroup;
 
 import org.chromium.base.ContextUtils;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.browser.signin.SigninAccessPoint;
 import org.chromium.chrome.browser.signin.SigninAndSyncView;
@@ -43,6 +44,8 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver,
     // TODO(kkimlabs): Figure out the optimal number based on UMA data.
     private static final int MAX_SIGNIN_PROMO_SHOW_COUNT = 5;
 
+    private static boolean sShouldShowForTests;
+
     private Context mContext;
     private SigninManager mSignInManager;
     private boolean mShouldShow;
@@ -86,7 +89,7 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver,
      * @return Whether it should be showing.
      */
     boolean shouldShow() {
-        return mShouldShow;
+        return mShouldShow || sShouldShowForTests;
     }
 
     /**
@@ -154,4 +157,12 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver,
     public void onSignedOut() {
         updateShouldShow(true);
     }
+
+    /**
+     * Forces the promo to show for testing purposes.
+     */
+    @VisibleForTesting
+    public static void setShouldShowForTests() {
+        sShouldShowForTests = true;
+    }
 }