Change CBD layout and texts

chrome/android/java/res/xml/clear_browsing_data_preferences_tab.xml

Index: chrome/android/java/res/xml/clear_browsing_data_preferences_tab.xml
diff --git a/chrome/android/java/res/xml/clear_browsing_data_preferences_tab.xml b/chrome/android/java/res/xml/clear_browsing_data_preferences_tab.xml
index f3725a3243cbaff7717a42e6c06abcbf6edae9b0..a016ed967fbb13130bc17cc188b2205432237466 100644
--- a/chrome/android/java/res/xml/clear_browsing_data_preferences_tab.xml
+++ b/chrome/android/java/res/xml/clear_browsing_data_preferences_tab.xml
@@ -10,34 +10,34 @@
     <org.chromium.chrome.browser.preferences.SpinnerPreference
         android:key="time_period_spinner"
         android:persistent="false"
-        android:title="@string/clear_browsing_data_period_title"
-        chrome:singleLine="true" />
+        android:title="@string/clear_browsing_data_tab_period_title"
+        chrome:customLayout="true" />
 
-    <Preference android:layout="@layout/divider_preference" />
+    <Preference android:layout="@layout/divider_preference_with_bottom_padding" />
 
-    <org.chromium.chrome.browser.preferences.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.preferences.ClearBrowsingDataTabCheckBoxPreference
         android:key="clear_history_checkbox"
         android:persistent="false"
-        android:title="@string/clear_history_title" />
+        android:title="@string/clear_history_title"
+        android:summary="@string/clear_browsing_history_summary" />
 
-    <org.chromium.chrome.browser.preferences.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.preferences.ClearBrowsingDataTabCheckBoxPreference
         android:key="clear_cookies_checkbox"
         android:persistent="false"
         android:title="@string/clear_cookies_and_site_data_title"
-        android:summaryOn="@string/clear_cookies_and_site_data_summary"
-        android:summaryOff="@string/clear_cookies_and_site_data_summary" />
+        android:summary="@string/clear_cookies_and_site_data_summary_basic" />
 
-    <org.chromium.chrome.browser.preferences.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.preferences.ClearBrowsingDataTabCheckBoxPreference
         android:key="clear_cache_checkbox"
         android:persistent="false"
         android:title="@string/clear_cache_title" />
 
-    <org.chromium.chrome.browser.preferences.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.preferences.ClearBrowsingDataTabCheckBoxPreference
         android:key="clear_passwords_checkbox"
         android:persistent="false"
         android:title="@string/clear_passwords_title" />
 
-    <org.chromium.chrome.browser.preferences.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.preferences.ClearBrowsingDataTabCheckBoxPreference
         android:key="clear_form_data_checkbox"
         android:persistent="false"
         android:title="@string/clear_form_data_title" />