Update flags used by offline pages and bookmarks

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java

Index: chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java
index 787fed9075db6b506b86096d4dc371d527ea6ffb..93417cda26bbf785a614a228e27f01949a0caebe 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java
@@ -15,7 +15,6 @@ import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.offlinepages.DeletePageResult;
-import org.chromium.components.offlinepages.FeatureMode;
 import org.chromium.components.offlinepages.SavePageResult;
 import org.chromium.content_public.browser.WebContents;
 
@@ -51,8 +50,8 @@ public class OfflinePageBridge {
     private final ObserverList<OfflinePageModelObserver> mObservers =
             new ObserverList<OfflinePageModelObserver>();
 
-    /** Mode of the offline pages feature */
-    private static Integer sFeatureMode;
+    /** Whether offline bookmarks feature is enabled or not */
+    private static Boolean sOfflineBookmarksEnabled;
 
     /**
      * Callback used when saving an offline page.
@@ -186,18 +185,21 @@ public class OfflinePageBridge {
      *     {@see org.chromium.components.offlinepages.FeatureMode} enum.
      */
     public static int getFeatureMode() {

[fgorski, 2016/04/18 17:09:36]

This method is gone from my patch par your request.

[jianli, 2016/04/18 21:17:00]

Acknowledged.

-        ThreadUtils.assertOnUiThread();
-        if (sFeatureMode == null) sFeatureMode = nativeGetFeatureMode();
-        return sFeatureMode;
+        // TODO(jianli): To be removed after syncing forski's patch.
+        return 1;
     }
 
     /**
      * @return True if the offline pages feature is enabled, regardless whether bookmark or saved
      *     page shown in UI strings.
      */
+    // TODO(jianli): To be renamed to isOfflineBookmarksEnabled.
     public static boolean isEnabled() {
         ThreadUtils.assertOnUiThread();
-        return getFeatureMode() != FeatureMode.DISABLED;
+        if (sOfflineBookmarksEnabled == null) {
+            sOfflineBookmarksEnabled = nativeIsOfflineBookmarksEnabled();
+        }
+        return sOfflineBookmarksEnabled;
     }
 
     /**
@@ -625,7 +627,7 @@ public class OfflinePageBridge {
         return new ClientId(clientNamespace, id);
     }
 
-    private static native int nativeGetFeatureMode();
+    private static native boolean nativeIsOfflineBookmarksEnabled();
     private static native boolean nativeCanSavePage(String url);
     private static native OfflinePageBridge nativeGetOfflinePageBridgeForProfile(Profile profile);