Prepare ClearBrowsingDataDialogFragment for browsing data counters.

chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
index 360e2686cbd53ab8fb3c800936eb9f08c7d9e374..00319da7a6c9ab9f00ed4f93cc0d00ecb798a20c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
@@ -12,6 +12,7 @@ import android.util.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.ContentSettingsType;
+import org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataDialogFragment;
 import org.chromium.chrome.browser.preferences.website.ContentSetting;
 import org.chromium.chrome.browser.preferences.website.ContentSettingException;
 import org.chromium.chrome.browser.preferences.website.GeolocationInfo;
@@ -630,6 +631,14 @@ public final class PrefServiceBridge {
         public abstract void onBrowsingDataCleared();
     }
 
+    public boolean getBrowsingDataDeletionPreference(int index) {

[newt (away), 2015/12/17 22:54:58]

Methods related to clearing browsing data should be pulled out into a separate
class.

PrefServiceBridge is intended for simple forwarding between Java and the C++
PrefService and for one-off cases where it's not worth creating a new class. The
clear browsing data methods don't fit either of these criteria. I think that
putting them in a separate class will create a clearer and more focused API.

For an example of how to create a new Java class with native methods, see
FeatureUtilities.java and feature_utilities.cc. In particular, see how those
classes are used in chrome_jni_registrar.cc and in chrome_browser.gypi and note
the RegisterFeatureUtilities() method in feature_utilities.cc.

[msramek, 2016/01/11 11:39:40]

Done. Thanks for the explanation, this is very helpful!

+        return nativeGetBrowsingDataDeletionPreference(index);
+    }
+
+    public void setBrowsingDataDeletionPreference(int index, boolean value) {
+        nativeSetBrowsingDataDeletionPreference(index, value);
+    }
+
     /**
      * Clear the specified types of browsing data asynchronously.
      * |listener| is an object to be notified when clearing completes.
@@ -659,6 +668,21 @@ public final class PrefServiceBridge {
         }
     }
 
+    public long createBrowsingDataCounter(

[newt (away), 2015/12/17 22:54:58]

Code at this level shouldn't know about or depend on
ClearBrowsingDataDialogFragment. Instead, I'd define an interface, say,
ClearBrowsingDataCounterCallback, with a single method onCounterFinished(), and
make ClearBrowsingDataDialogFragment.Item implement that interface.

[msramek, 2016/01/11 11:39:40]

Done.

+            ClearBrowsingDataDialogFragment.Item owner, int index) {
+        return nativeCreateBrowsingDataCounter(owner, index);
+    }
+
+    public void destroyBrowsingDataCounter(long counter) {
+        nativeDestroyBrowsingDataCounter(counter);
+    }
+
+    @CalledByNative
+    private void onBrowsingDataCounterFinished(Object owner, String result) {
+        ((ClearBrowsingDataDialogFragment.Item) owner)
+            .onCounterFinished(result);
+    }
+
     public void setAllowCookiesEnabled(boolean allow) {
         nativeSetAllowCookiesEnabled(allow);
     }
@@ -949,9 +973,13 @@ public final class PrefServiceBridge {
     private native void nativeResetTranslateDefaults();
     private native void nativeMigrateJavascriptPreference();
     private native void nativeSetJavaScriptAllowed(String pattern, int setting);
+    private native boolean nativeGetBrowsingDataDeletionPreference(int index);
+    private native void nativeSetBrowsingDataDeletionPreference(int index, boolean value);
     private native void nativeClearBrowsingData(boolean history, boolean cache,
             boolean cookiesAndSiteData, boolean passwords, boolean formData);
     private native boolean nativeCanDeleteBrowsingHistory();
+    private native long nativeCreateBrowsingDataCounter(Object owner, int index);
+    private native void nativeDestroyBrowsingDataCounter(long counter);
     private native void nativeSetAllowCookiesEnabled(boolean allow);
     private native void nativeSetBlockThirdPartyCookiesEnabled(boolean enabled);
     private native void nativeSetDoNotTrackEnabled(boolean enabled);