Add an about flag to toggle the visibility of "All bookmarks"

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
index ec8851c19b9ae701bfe25f90413af925441e513d..ae7e3112d5891e9471db34353f95fbd24f5081ee 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
@@ -62,7 +62,11 @@ class BookmarkUIState {
         state.mUrl = uri.toString();
 
         if (state.mUrl.equals(UrlConstants.BOOKMARKS_URL)) {
-            state.mState = STATE_ALL_BOOKMARKS;
+            if (BookmarkUtils.isAllBookmarksViewEnabled()) {
+                state.mState = STATE_ALL_BOOKMARKS;
+            } else {
+                return createFolderState(bookmarkModel.getDefaultFolder(), bookmarkModel);
+            }
         } else if (state.mUrl.startsWith(UrlConstants.BOOKMARKS_FOLDER_URL)) {
             String path = uri.getLastPathSegment();
             if (!path.isEmpty()) {
@@ -72,8 +76,7 @@ class BookmarkUIState {
         }
 
         if (!state.isValid(bookmarkModel)) {
-            state.mState = STATE_ALL_BOOKMARKS;
-            state.mUrl = UrlConstants.BOOKMARKS_URL;
+            return createAllBookmarksState(bookmarkModel);

[gone, 2016/05/05 21:50:14]

Why does this differ from the one above?  Should the state.mState =
STATE_ALL_BOOKMARKS above do this too?

[Ian Wen, 2016/05/05 23:27:07]

Will talk offline to explain this.

         }
 
         return state;