[Enhanced Bookmarks] Make enhanced bookmarks default for Android.

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java

Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
index 16dbe7e06fc8fdaa3f57d6ac88930eb9cc75c821..127a47beb37cf739c380254b1d0ccf594a180f96 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
@@ -22,7 +22,6 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeBrowserProviderClient;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.UrlConstants;
-import org.chromium.chrome.browser.bookmark.BookmarksBridge;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarksModel.AddBookmarkCallback;
 import org.chromium.chrome.browser.favicon.FaviconHelper;
@@ -50,13 +49,6 @@ public class EnhancedBookmarkUtils {
     private static final String PREF_LAST_USED_URL = "enhanced_bookmark_last_used_url";
 
     /**
-     * @return True if enhanced bookmark feature is enabled.
-     */
-    public static boolean isEnhancedBookmarkEnabled() {
-        return BookmarksBridge.isEnhancedBookmarksEnabled();
-    }
-
-    /**
      * If the tab has already been bookmarked, start {@link EnhancedBookmarkEditActivity} for the
      * bookmark. If not, add the bookmark to bookmarkmodel, and show a snackbar notifying the user.
      * @param idToAdd The bookmark ID if the tab has already been bookmarked.
@@ -259,14 +251,9 @@ public class EnhancedBookmarkUtils {
     }
 
     /**
-     * Shows enhanced bookmark main UI, if it is turned on. Does nothing if it is turned off.
-     * @return True if enhanced bookmark is on, false otherwise.
+     * Shows enhanced bookmark main UI.
      */
-    public static boolean showEnhancedBookmarkIfEnabled(Activity activity) {
-        if (!isEnhancedBookmarkEnabled()) {
-            return false;
-        }
-
+    public static void showEnhancedBookmarks(Activity activity) {

[Ian Wen, 2015/12/04 04:28:58]

Rename to showBookmarkManager() or startBookmarkManager()?

[Kibeom Kim (inactive), 2015/12/04 21:07:52]

Done.

         String url = getFirstUrlToLoad(activity);
 
         if (DeviceFormFactor.isTablet(activity)) {
@@ -276,7 +263,6 @@ public class EnhancedBookmarkUtils {
             intent.setData(Uri.parse(url));
             activity.startActivity(intent);
         }
-        return true;
     }
 
     /**