Separate state of basic and advanced tab in CBD dialog

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java
index 6fd0b20d4cbb998637375a53e0aa4ab9bf50f4ca..a2ae9ef1446c7d7a422ac9637a25b49de13b35d1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java
@@ -30,8 +30,14 @@ import java.util.Locale;
 public class ClearBrowsingDataTabsFragment extends Fragment {
     public static final int CBD_TAB_COUNT = 2;
 
-    public ClearBrowsingDataTabsFragment() {}
+    public ClearBrowsingDataTabsFragment() {
+        // TODO(dullweber): Remove this migration after after three milestones (probably M61)

[Theresa, 2017/03/01 17:45:45]

Typically migration paths cannot be removed after 3 milestones because users may
take a long time to upgrade. If the user is upgrading from an old version and
the migration is skipped, what happens?

[dullweber, 2017/03/02 09:24:38]

The migration only copies the prefs from the currently selected checkboxes to
the new prefs for the basic tab, so that they will initially be the same.
Nothing will break if this is not done, so we thought that this code is not
really needed in the long term.

+        PrefServiceBridge.getInstance().migrateBrowsingDataPreferences();
+    }
 
+    /**
+     * @return boolean Returns if the CBD dialog with tabs is enabled.

[Theresa, 2017/03/01 17:45:45]

nit: "Returns whether the..."

We also typically don't start the @return JavaDoc with the type. The description
makes it clear that it's returning a boolean.

[dullweber, 2017/03/02 09:24:38]

Done.

+     */
     public static boolean isFeatureEnabled() {
         return ChromeFeatureList.isEnabled(ChromeFeatureList.TABS_IN_CBD);
     }