Change CBD layout and texts

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

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
index 58eeac8e73fc8d5704e3f333d7251533a7534b7d..32af297876a37086c36d0251b86f37086d666ead 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
@@ -121,9 +121,11 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
 
         @Override
         public void onCounterFinished(String result) {
-            mCheckbox.setSummaryOn(result);
+            // The new dialog will always show the summary, the old one only when checked.
             if (ClearBrowsingDataTabsFragment.isFeatureEnabled()) {
-                mCheckbox.setSummaryOff(result);
+                mCheckbox.setSummary(result);
+            } else {
+                mCheckbox.setSummaryOn(result);
             }
             if (mShouldAnnounceCounterResult) {
                 mCheckbox.announceForAccessibility(result);
@@ -234,7 +236,7 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
     /**
      * An option to be shown in the time period spiner.
      */
-    private static class TimePeriodSpinnerOption {
+    protected static class TimePeriodSpinnerOption {
         private int mTimePeriod;
         private String mTitle;
 
@@ -356,7 +358,7 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
      * Returns the Array of time periods. Options are displayed in the same order as they appear
      * in the array.
      */
-    private TimePeriodSpinnerOption[] getTimePeriodSpinnerOptions() {
+    protected TimePeriodSpinnerOption[] getTimePeriodSpinnerOptions() {
         Activity activity = getActivity();
 
         TimePeriodSpinnerOption[] options = new TimePeriodSpinnerOption[] {