Prepare ClearBrowsingDataDialogFragment for browsing data counters.

chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ClearSyncDataDialogFragment.java

Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ClearSyncDataDialogFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ClearSyncDataDialogFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ClearSyncDataDialogFragment.java
index 56cd8e763909fd22f2ff697b2d21e6529287c0fa..14ad82c823ccbc679471ff9a32a9f760663bf7ba 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ClearSyncDataDialogFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ClearSyncDataDialogFragment.java
@@ -12,8 +12,6 @@ import org.chromium.chrome.browser.ChromeBrowserProviderClient;
 import org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataDialogFragment;
 import org.chromium.chrome.browser.signin.SigninManager;
 
-import java.util.EnumSet;
-
 /**
  * Modal dialog for clearing sync data. This allows the user to clear browsing data as well as

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

In a later CL, you'll probably want to merge this class into
ClearBrowsingDataDialogFragment.

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

SGTM.

  * other synced data types like bookmarks.
@@ -33,12 +31,12 @@ public class ClearSyncDataDialogFragment extends ClearBrowsingDataDialogFragment
     }
 
     @Override
-    protected EnumSet<DialogOption> getDefaultDialogOptionsSelections() {
-        return EnumSet.allOf(DialogOption.class);
+    protected boolean isOptionSelectedByDefault(DialogOption option) {
+        return true;
     }
 
     @Override
-    protected void onOptionSelected(final EnumSet<DialogOption> optionsSelected) {
+    protected void onOptionSelected() {
         if (mApplicationContext == null) return;
 
         showProgressDialog();
@@ -51,7 +49,7 @@ public class ClearSyncDataDialogFragment extends ClearBrowsingDataDialogFragment
         new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... arg0) {
-                if (optionsSelected.contains(DialogOption.CLEAR_BOOKMARKS_DATA)) {
+                if (getSelectedOptions().contains(DialogOption.CLEAR_BOOKMARKS_DATA)) {
                     ChromeBrowserProviderClient.removeAllUserBookmarks(mApplicationContext);
                 }
                 return null;
@@ -59,9 +57,9 @@ public class ClearSyncDataDialogFragment extends ClearBrowsingDataDialogFragment
 
             @Override
             protected void onPostExecute(Void result) {
-                clearBrowsingData(optionsSelected);
+                clearBrowsingData();
 
-                if (optionsSelected.contains(DialogOption.CLEAR_BOOKMARKS_DATA)) {
+                if (getSelectedOptions().contains(DialogOption.CLEAR_BOOKMARKS_DATA)) {
                     // onPostExecute is back in the UI thread.
                     SigninManager.get(mApplicationContext).clearLastSignedInUser();
                 }