Can you please include a link to mocks and some screenshots from the in-flight patch? It's a bit easier to review if I know what it's supposed to look like.

Sure, here are the mockups for the new UI: https://docs.google.com/a/google.com/presentation/d/1NI9SR2DpFKAsAmvB0-Bn1QydWKruwNzzTro_B88EsTo/edit?usp=sharing. I will add screenshots of the current state to the CL.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9da80076a5063f0f2d9c0dfb609a0948c841f4c3

commit 9da80076a5063f0f2d9c0dfb609a0948c841f4c3
Author: dullweber <dullweber@chromium.org>
Date: Tue Jan 24 10:31:25 2017

Create an initial version of the split CBD dialog. It contains a TabLayout with a basic and and advanced version of the CBD view. The basic version only has history, cache and cookies.
All changes are behind the new flag "TABS_IN_CBD".

BUG= 681523 

Review-Url: https://codereview.chromium.org/2644573003
Cr-Commit-Position: refs/heads/master@{#445691}

[add] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java/res/layout/clear_browsing_data_tabs.xml
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[add] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesAdvanced.java
[add] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasic.java
[add] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/android/java_sources.gni
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/app/generated_resources.grd
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/browser/about_flags.cc
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/browser/android/chrome_feature_list.cc
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/chrome/browser/android/chrome_feature_list.h
[modify] https://crrev.com/9da80076a5063f0f2d9c0dfb609a0948c841f4c3/tools/metrics/histograms/histograms.xml

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9a5f9879b084901c23318218fdc99dac9cc37bad

commit 9a5f9879b084901c23318218fdc99dac9cc37bad
Author: dullweber <dullweber@chromium.org>
Date: Thu Feb 02 09:58:01 2017

Implement additional parts of the new ui for CBD.

Change UI to use single-line time selector.
Move clear button to footer.
Fix RTL behavior of ViewPager.

All changes are behind the "tabs-in-cbd" flag

https://screenshot.googleplex.com/BwcNiqwedVf.png

BUG= 681523 

Review-Url: https://codereview.chromium.org/2646313005
Cr-Commit-Position: refs/heads/master@{#447733}

[add] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/res/layout/clear_browsing_data_tab_content.xml
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/res/layout/clear_browsing_data_tabs.xml
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/res/layout/divider_preference.xml
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/res/layout/preference_spinner.xml
[add] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/res/layout/preference_spinner_single_line.xml
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/res/values-v17/styles.xml
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/res/values/attrs.xml
[add] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/res/xml/clear_browsing_data_preferences_tab.xml
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/src/org/chromium/chrome/browser/preferences/SpinnerPreference.java
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesAdvanced.java
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasic.java
[add] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTab.java
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/android/java_sources.gni
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/chrome/browser/android/preferences/pref_service_bridge.cc
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/components/browsing_data/core/pref_names.cc
[modify] https://crrev.com/9a5f9879b084901c23318218fdc99dac9cc37bad/components/browsing_data/core/pref_names.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/525fa6787336cb9d251ca2c264755bc0625f9b74

commit 525fa6787336cb9d251ca2c264755bc0625f9b74
Author: dullweber <dullweber@chromium.org>
Date: Tue Feb 28 09:43:02 2017

Extract MockBrowsingDataRemover to separate file to make it possible to use it
from other tests.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2720723002
Cr-Commit-Position: refs/heads/master@{#453556}

[modify] https://crrev.com/525fa6787336cb9d251ca2c264755bc0625f9b74/chrome/browser/BUILD.gn
[add] https://crrev.com/525fa6787336cb9d251ca2c264755bc0625f9b74/chrome/browser/browsing_data/mock_browsing_data_remover.cc
[add] https://crrev.com/525fa6787336cb9d251ca2c264755bc0625f9b74/chrome/browser/browsing_data/mock_browsing_data_remover.h
[modify] https://crrev.com/525fa6787336cb9d251ca2c264755bc0625f9b74/chrome/browser/chrome_content_browser_client_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/303f444d68f7f76722c98987afbdc6bcb466fd67

commit 303f444d68f7f76722c98987afbdc6bcb466fd67
Author: dullweber <dullweber@chromium.org>
Date: Fri Mar 03 11:50:19 2017

Separate state of basic and advanced tab in CBD dialog.
 - Introduce ClearBrowsingDataTab enum
 - Add separate prefs for Basic and Advanced tab

Also
 - Change browsing_data::TimePeriod and browsing_data::BrowsingDataType to enum class

TBR=thakis@chromium.org
BUG= 681523 

Review-Url: https://codereview.chromium.org/2671743002
Cr-Commit-Position: refs/heads/master@{#454567}

[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/android/BUILD.gn
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/BrowsingDataCounterBridge.java
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesAdvanced.java
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasic.java
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/android/browsing_data/browsing_data_counter_bridge.h
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/android/preferences/pref_service_bridge.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/browsing_data/autofill_counter_browsertest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/browsing_data/browsing_data_counter_factory.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/browsing_data/browsing_data_counter_utils.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/browsing_data/cache_counter.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/browsing_data/cache_counter_browsertest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/browsing_data/downloads_counter_browsertest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/browsing_data/history_counter_browsertest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/browsing_data/hosted_apps_counter_unittest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/browsing_data/media_licenses_counter_browsertest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/browsing_data/passwords_counter_browsertest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/net/sdch_browsertest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/policy/configuration_policy_handler_list_factory.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/policy/policy_browsertest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/BUILD.gn
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/DEPS
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/browsing_data_utils.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/browsing_data_utils.h
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/browsing_data_utils_unittest.cc
[add] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/clear_browsing_data_tab.h
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/counters/browsing_data_counter.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/counters/browsing_data_counter.h
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/counters/browsing_data_counter_unittest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/counters/history_counter.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/pref_names.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/components/browsing_data/core/pref_names.h
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/ios/chrome/app/main_controller.mm
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/ios/chrome/browser/browsing_data/browsing_data_counter_wrapper.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/ios/chrome/browser/browsing_data/browsing_data_removal_controller.mm
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/ios/chrome/browser/browsing_data/cache_counter_unittest.cc
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.mm
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/ios/chrome/browser/signin/browser_state_data_remover.mm
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller.mm
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller_unittest.mm
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/ios/chrome/browser/ui/settings/time_range_selector_collection_view_controller.mm
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/ios/chrome/test/app/history_test_util.mm
[modify] https://crrev.com/303f444d68f7f76722c98987afbdc6bcb466fd67/tools/android/eclipse/.classpath

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/50c18ca66848657416f8f39451ae8bdfaa0da824

commit 50c18ca66848657416f8f39451ae8bdfaa0da824
Author: dullweber <dullweber@chromium.org>
Date: Tue Mar 07 22:09:41 2017

Add icons to redesigned CBD dialog.

Dialog with icons:
https://screenshot.googleplex.com/GQ0LeamyMkN.png

Dialog for phones with low DP (< 360dp):
https://screenshot.googleplex.com/CwuaYHVgdiF.png
(truncated spinner text still needs to be fixed)

BUG= 681523 

Review-Url: https://codereview.chromium.org/2652983002
Cr-Commit-Position: refs/heads/master@{#455241}

[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-hdpi/ic_collections_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-hdpi/ic_history_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-hdpi/ic_vpn_key_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-mdpi/ic_collections_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-mdpi/ic_history_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-mdpi/ic_vpn_key_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-xhdpi/ic_collections_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-xhdpi/ic_history_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-xhdpi/ic_vpn_key_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-xxhdpi/ic_collections_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-xxhdpi/ic_history_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-xxhdpi/ic_vpn_key_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-xxxhdpi/ic_collections_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-xxxhdpi/ic_history_grey600_24dp.png
[add] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/res/drawable-xxxhdpi/ic_vpn_key_grey600_24dp.png
[modify] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/50c18ca66848657416f8f39451ae8bdfaa0da824/tools/resources/optimize-png-files.sh

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/c454fad8104929e2624e221aeb2f7a27e9844671

commit c454fad8104929e2624e221aeb2f7a27e9844671
Author: dullweber <dullweber@chromium.org>
Date: Tue Mar 28 07:56:39 2017

Move code about browsing data from PrefServiceBridge to a new BrowsingDataBridge.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2756173002
Cr-Commit-Position: refs/heads/master@{#460038}

[modify] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java
[modify] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
[add] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/BrowsingDataBridge.java
[modify] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncUserDataWiper.java
[modify] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/android/java_sources.gni
[modify] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java
[modify] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
[modify] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/ManageSpaceActivityTest.java
[modify] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/browser/BUILD.gn
[add] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/browser/android/browsing_data/browsing_data_bridge.cc
[add] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/browser/android/browsing_data/browsing_data_bridge.h
[modify] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/browser/android/chrome_jni_registrar.cc
[modify] https://crrev.com/c454fad8104929e2624e221aeb2f7a27e9844671/chrome/browser/android/preferences/pref_service_bridge.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057

commit 53bf4e3a7fca5f9faa16e56ba7b8a3c280324057
Author: dullweber <dullweber@chromium.org>
Date: Thu Apr 06 09:53:13 2017

Change layout and texts for new CBD dialog.

- Improved spinner layout
- New spinner texts (1 day -> 24 hours, 1 week -> 7 days)
- Implement a way to show different counter texts for basic and advanced mode
- New counter texts for basic mode
- Clickable myactivity.google.com link in checkbox summary
- Add instrumentation test to verify that the right string is shown depending on sign in and sync state.

Screenshots for default display size (Nexus 6P):
https://screenshot.googleplex.com/P1hFk9v8V3k.png
https://screenshot.googleplex.com/zVjhJJWnXUo.png

Screenshots on largest display size (Nexus 6P):
https://screenshot.googleplex.com/m9nBDbQ5ra5.png
https://screenshot.googleplex.com/Gb6vA38rfOH.png

BUG= 681523 

Review-Url: https://codereview.chromium.org/2730703003
Cr-Commit-Position: refs/heads/master@{#462406}

[add] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/res/layout-sw360dp/preference_spinner_single_line.xml
[add] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/res/layout/divider_preference_with_bottom_padding.xml
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/res/layout/preference_spinner_single_line.xml
[add] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/res/layout/preference_spinner_single_line_item.xml
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/res/values/attrs.xml
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/res/xml/clear_browsing_data_preferences_tab.xml
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/src/org/chromium/chrome/browser/preferences/ClearBrowsingDataCheckBoxPreference.java
[add] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/src/org/chromium/chrome/browser/preferences/ClearBrowsingDataTabCheckBoxPreference.java
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/src/org/chromium/chrome/browser/preferences/SpinnerPreference.java
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasic.java
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTab.java
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/java_sources.gni
[add] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasicTest.java
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/browser/browsing_data/browsing_data_counter_factory.cc
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/chrome/browser/browsing_data/browsing_data_counter_utils.cc
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/components/browsing_data/core/browsing_data_utils.cc
[modify] https://crrev.com/53bf4e3a7fca5f9faa16e56ba7b8a3c280324057/components/browsing_data_strings.grdp

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ea3bd60b2f5f5b394bde861c15d3c865e47caf87

commit ea3bd60b2f5f5b394bde861c15d3c865e47caf87
Author: dullweber <dullweber@chromium.org>
Date: Fri Apr 07 07:55:54 2017

Move the clear button to the right and reduce its touch target to avoid
accidential clicks when the user actually wanted to press the back or home button.

https://screenshot.googleplex.com/evyLBUaowaG.png

BUG= 681523 

Review-Url: https://codereview.chromium.org/2805623003
Cr-Commit-Position: refs/heads/master@{#462803}

[modify] https://crrev.com/ea3bd60b2f5f5b394bde861c15d3c865e47caf87/chrome/android/java/res/layout/clear_browsing_data_tab_content.xml

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9f427ce4bfd95802a01ae0ac60e8a1b327f5ef53

commit 9f427ce4bfd95802a01ae0ac60e8a1b327f5ef53
Author: dullweber <dullweber@chromium.org>
Date: Mon Apr 10 08:20:36 2017

Improve single_line spinner ui

- Align label to the right
- Align arrow with checkboxes below
- Increase top padding
- change "Time period" to "Time range"

before:
https://screenshot.googleplex.com/P1hFk9v8V3k.png
after:
https://screenshot.googleplex.com/UrE3vtFdmy0.png

BUG= 681523 

Review-Url: https://codereview.chromium.org/2805003002
Cr-Commit-Position: refs/heads/master@{#463192}

[modify] https://crrev.com/9f427ce4bfd95802a01ae0ac60e8a1b327f5ef53/chrome/android/java/res/layout-sw360dp/preference_spinner_single_line.xml
[modify] https://crrev.com/9f427ce4bfd95802a01ae0ac60e8a1b327f5ef53/chrome/android/java/res/layout/preference_spinner_single_line.xml
[modify] https://crrev.com/9f427ce4bfd95802a01ae0ac60e8a1b327f5ef53/chrome/android/java/res/layout/preference_spinner_single_line_item.xml
[modify] https://crrev.com/9f427ce4bfd95802a01ae0ac60e8a1b327f5ef53/chrome/android/java/strings/android_chrome_strings.grd

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/83d87e7a1a0cd89eaa29e8806c8f959106eda34b

commit 83d87e7a1a0cd89eaa29e8806c8f959106eda34b
Author: dullweber <dullweber@chromium.org>
Date: Wed Apr 19 12:49:23 2017

Show password sync status in CBD

This adds "(synced)" to the password counter text if there is a stored password and password sync is activated.
I also removed all "browsing_data::" usages from browsing_data_utils.cc because this class is inside the browsing_data namespace.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2798243004
Cr-Commit-Position: refs/heads/master@{#465566}

[modify] https://crrev.com/83d87e7a1a0cd89eaa29e8806c8f959106eda34b/chrome/browser/browsing_data/browsing_data_counter_factory.cc
[modify] https://crrev.com/83d87e7a1a0cd89eaa29e8806c8f959106eda34b/chrome/browser/browsing_data/history_counter_browsertest.cc
[modify] https://crrev.com/83d87e7a1a0cd89eaa29e8806c8f959106eda34b/chrome/browser/browsing_data/passwords_counter_browsertest.cc
[modify] https://crrev.com/83d87e7a1a0cd89eaa29e8806c8f959106eda34b/components/browsing_data/core/BUILD.gn
[modify] https://crrev.com/83d87e7a1a0cd89eaa29e8806c8f959106eda34b/components/browsing_data/core/browsing_data_utils.cc
[modify] https://crrev.com/83d87e7a1a0cd89eaa29e8806c8f959106eda34b/components/browsing_data/core/browsing_data_utils_unittest.cc
[modify] https://crrev.com/83d87e7a1a0cd89eaa29e8806c8f959106eda34b/components/browsing_data/core/counters/browsing_data_counter.cc
[modify] https://crrev.com/83d87e7a1a0cd89eaa29e8806c8f959106eda34b/components/browsing_data/core/counters/passwords_counter.cc
[modify] https://crrev.com/83d87e7a1a0cd89eaa29e8806c8f959106eda34b/components/browsing_data/core/counters/passwords_counter.h
[modify] https://crrev.com/83d87e7a1a0cd89eaa29e8806c8f959106eda34b/components/browsing_data_strings.grdp
[modify] https://crrev.com/83d87e7a1a0cd89eaa29e8806c8f959106eda34b/ios/chrome/browser/browsing_data/ios_browsing_data_counter_factory.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/827d8ad5f022cbc1a904a159f0041b5fc5afca6c

commit 827d8ad5f022cbc1a904a159f0041b5fc5afca6c
Author: dullweber <dullweber@chromium.org>
Date: Thu Apr 20 09:00:41 2017

Fix tab width and icon padding in CBD

Change TabLayout to use the full width of the screen even in landscape
orientation and on larger screens.
Increase the padding of preference icons to match the padding of "Time
range". (like SiteSettingsPreference)

Before:
https://screenshot.googleplex.com/BZvpCHXTHqf.png

After:
https://screenshot.googleplex.com/ZOPvbyXz0AV.png

BUG= 681523 

Review-Url: https://codereview.chromium.org/2827653004
Cr-Commit-Position: refs/heads/master@{#465954}

[modify] https://crrev.com/827d8ad5f022cbc1a904a159f0041b5fc5afca6c/chrome/android/java/res/layout/clear_browsing_data_tabs.xml
[modify] https://crrev.com/827d8ad5f022cbc1a904a159f0041b5fc5afca6c/chrome/android/java/res/values/dimens.xml
[modify] https://crrev.com/827d8ad5f022cbc1a904a159f0041b5fc5afca6c/chrome/android/java/src/org/chromium/chrome/browser/preferences/ClearBrowsingDataTabCheckBoxPreference.java
[modify] https://crrev.com/827d8ad5f022cbc1a904a159f0041b5fc5afca6c/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreference.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9866fbdfef0d5a24dae8d0e2519a973a8262448f

commit 9866fbdfef0d5a24dae8d0e2519a973a8262448f
Author: dullweber <dullweber@chromium.org>
Date: Mon Apr 24 16:07:28 2017

Clear browsing data ui fixes

Increase PreferenceSpinner touch target
Increase PreferenceSpinner paddingEnd on tablets
Small changes of PreferenceSpinner paddings to match specs more closely
Increase clear button paddingEnd on tablets
Make divider preference non-selectable

Before (Nexus 9):
https://screenshot.googleplex.com/Xea6XfxNYWR.png

After:
https://screenshot.googleplex.com/yH4BVmjY6OP.png
BUG= 681523 

Review-Url: https://codereview.chromium.org/2841603002
Cr-Commit-Position: refs/heads/master@{#466637}

[modify] https://crrev.com/9866fbdfef0d5a24dae8d0e2519a973a8262448f/chrome/android/java/res/layout-sw360dp/preference_spinner_single_line.xml
[modify] https://crrev.com/9866fbdfef0d5a24dae8d0e2519a973a8262448f/chrome/android/java/res/layout/clear_browsing_data_tab_content.xml
[modify] https://crrev.com/9866fbdfef0d5a24dae8d0e2519a973a8262448f/chrome/android/java/res/values-sw600dp/dimens.xml
[modify] https://crrev.com/9866fbdfef0d5a24dae8d0e2519a973a8262448f/chrome/android/java/res/values/dimens.xml
[modify] https://crrev.com/9866fbdfef0d5a24dae8d0e2519a973a8262448f/chrome/android/java/res/xml/clear_browsing_data_preferences_tab.xml

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/7de4101a99fb5d1d2a03dc7bb9a6f18e30b04269

commit 7de4101a99fb5d1d2a03dc7bb9a6f18e30b04269
Author: dullweber <dullweber@chromium.org>
Date: Wed Apr 26 16:01:05 2017

Fix "Time range" label in CBD jumps around when rotating to landscape

Adding the same padding to the label that the spinner already has to keep
them on the same vertical position. For some reason the time range label was
initially in the right position but jumps up when rotating to landscape and
stays up when rotating back.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2842153002
Cr-Commit-Position: refs/heads/master@{#467334}

[modify] https://crrev.com/7de4101a99fb5d1d2a03dc7bb9a6f18e30b04269/chrome/android/java/res/layout-sw360dp/preference_spinner_single_line.xml

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ae41773373496eaa692beb85a20cade679127d58

commit ae41773373496eaa692beb85a20cade679127d58
Author: dullweber <dullweber@chromium.org>
Date: Tue May 02 12:28:48 2017

Show autofill sync status in CBD

This changes the AutofillCounter to indicate that autofill data is synced.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2828083003
Cr-Commit-Position: refs/heads/master@{#468606}

[modify] https://crrev.com/ae41773373496eaa692beb85a20cade679127d58/chrome/browser/browsing_data/autofill_counter_browsertest.cc
[modify] https://crrev.com/ae41773373496eaa692beb85a20cade679127d58/chrome/browser/browsing_data/browsing_data_counter_factory.cc
[modify] https://crrev.com/ae41773373496eaa692beb85a20cade679127d58/chrome/browser/browsing_data/history_counter_browsertest.cc
[modify] https://crrev.com/ae41773373496eaa692beb85a20cade679127d58/chrome/browser/browsing_data/passwords_counter_browsertest.cc
[modify] https://crrev.com/ae41773373496eaa692beb85a20cade679127d58/components/browsing_data/core/browsing_data_utils.cc
[modify] https://crrev.com/ae41773373496eaa692beb85a20cade679127d58/components/browsing_data/core/browsing_data_utils_unittest.cc
[modify] https://crrev.com/ae41773373496eaa692beb85a20cade679127d58/components/browsing_data/core/counters/autofill_counter.cc
[modify] https://crrev.com/ae41773373496eaa692beb85a20cade679127d58/components/browsing_data/core/counters/autofill_counter.h
[modify] https://crrev.com/ae41773373496eaa692beb85a20cade679127d58/components/browsing_data_strings.grdp
[modify] https://crrev.com/ae41773373496eaa692beb85a20cade679127d58/ios/chrome/browser/browsing_data/ios_browsing_data_counter_factory.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371

commit 39d6d5f89a382f3f6f23ae80a9c9c87c2f184371
Author: dullweber <dullweber@chromium.org>
Date: Wed May 03 12:54:25 2017

Write last_modified date to Content Settings in the PrefProvider

Introduce a last_modified timestamp for content settings stored inside the PrefProvider.
This timestamp will enable deleting content-settings by a selected time range from the clear browsing data dialog.
The timestamp will only be recorded if the tabs-in-cbd flag is activated because otherwise there would be no way to delete these history-like entries.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2812113004
Cr-Commit-Position: refs/heads/master@{#468950}

[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/about_flags.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/android/chrome_feature_list.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/android/chrome_feature_list.h
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/browsing_data/browsing_data_counter_utils.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/content_settings/host_content_settings_map_factory.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/content_settings/host_content_settings_map_unittest.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/extensions/api/content_settings/content_settings_store.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/permissions/permission_decision_auto_blocker_unittest.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/common/chrome_features.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/chrome/common/chrome_features.h
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/content_settings/core/browser/content_settings_origin_identifier_value_map.h
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/content_settings/core/browser/content_settings_policy_provider.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/content_settings/core/browser/content_settings_pref.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/content_settings/core/browser/content_settings_pref.h
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/content_settings/core/browser/content_settings_pref_provider.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/content_settings/core/browser/content_settings_pref_provider.h
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/content_settings/core/browser/cookie_settings_unittest.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/content_settings/core/browser/host_content_settings_map.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/content_settings/core/browser/host_content_settings_map.h
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/content_settings/core/test/content_settings_mock_provider.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/safe_browsing/password_protection/password_protection_service.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/safe_browsing/password_protection/password_protection_service_unittest.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/signin/core/browser/signin_header_helper_unittest.cc
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/components/signin/ios/browser/account_consistency_service_unittest.mm
[modify] https://crrev.com/39d6d5f89a382f3f6f23ae80a9c9c87c2f184371/ios/chrome/browser/content_settings/host_content_settings_map_factory.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b94383086bbb49474afd397fa447a8b940c84684

commit b94383086bbb49474afd397fa447a8b940c84684
Author: dullweber <dullweber@chromium.org>
Date: Tue May 09 09:13:34 2017

Add "Site Settings" option to Clear Browsing Data on Android

Implement site setting removal in BrowsingDataRemoverDelegate
Add preference for site settings checkbox
Add site settings counter
Add site settings ui to CBD dialog on Android

https://screenshot.googleplex.com/FJrhrqVtd6J.png

BUG= 681523 

Review-Url: https://codereview.chromium.org/2816723002
Cr-Commit-Position: refs/heads/master@{#470270}

[add] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/android/java/res/drawable/ic_tv_options_input_settings_rotated_grey.xml
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/android/java/res/xml/clear_browsing_data_preferences.xml
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/android/java/res/xml/clear_browsing_data_preferences_tab.xml
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesAdvanced.java
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/browser/android/browsing_data/browsing_data_bridge.cc
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/browser/browsing_data/browsing_data_counter_factory.cc
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
[add] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/browser/browsing_data/site_settings_counter_unittest.cc
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/browser/content_settings/host_content_settings_map_unittest.cc
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/chrome/test/BUILD.gn
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/browsing_data/core/BUILD.gn
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/browsing_data/core/DEPS
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/browsing_data/core/browsing_data_utils.cc
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/browsing_data/core/browsing_data_utils.h
[add] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/browsing_data/core/counters/site_settings_counter.cc
[add] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/browsing_data/core/counters/site_settings_counter.h
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/browsing_data/core/pref_names.cc
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/browsing_data/core/pref_names.h
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/browsing_data_strings.grdp
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/content_settings/core/browser/content_settings_pref.cc
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/content_settings/core/browser/content_settings_pref.h
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/content_settings/core/browser/content_settings_pref_provider.cc
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/content_settings/core/browser/content_settings_pref_provider.h
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/content_settings/core/browser/host_content_settings_map.cc
[modify] https://crrev.com/b94383086bbb49474afd397fa447a8b940c84684/components/content_settings/core/browser/host_content_settings_map.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9edd4edf6544c3bb139c638be7318ea4a7015f0a

commit 9edd4edf6544c3bb139c638be7318ea4a7015f0a
Author: dullweber <dullweber@chromium.org>
Date: Tue May 16 13:42:04 2017

Update CBD history descriptions

Change history summary in ClearBrowsingData to "... and autocompletions in the address bar" and "Manage other activity at..." according to discussion with UX and legal.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2887663003
Cr-Commit-Position: refs/heads/master@{#472086}

[modify] https://crrev.com/9edd4edf6544c3bb139c638be7318ea4a7015f0a/chrome/android/java/strings/android_chrome_strings.grd

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/af1c106f452b464753dfc1c4626151b28f8fa1ef

commit af1c106f452b464753dfc1c4626151b28f8fa1ef
Author: dullweber <dullweber@chromium.org>
Date: Tue May 23 09:59:12 2017

Make selected tab for CBD non-syncable

BUG= 681523 

Review-Url: https://codereview.chromium.org/2898903002
Cr-Commit-Position: refs/heads/master@{#473844}

[modify] https://crrev.com/af1c106f452b464753dfc1c4626151b28f8fa1ef/components/browsing_data/core/pref_names.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b8ccee5d81a839c22d62e4ea7aeec251f0772684

commit b8ccee5d81a839c22d62e4ea7aeec251f0772684
Author: dullweber <dullweber@chromium.org>
Date: Thu May 25 07:30:31 2017

Update strings for history description in CBD

Change history strings for the new Clear Browsing Data dialog
according to discussions with legal and UX.
Add a string with myactivity.google.com for history dialog and use
it depending on TABS_IN_CBD flag.
Use ActiveDataTypes instead of PreferredDataTypes with
HISTORY_DELETE_DIRECTIVES instead of TYPED_URLS to determine
history sync status.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2888313003
Cr-Commit-Position: refs/heads/master@{#474600}

[modify] https://crrev.com/b8ccee5d81a839c22d62e4ea7aeec251f0772684/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java
[modify] https://crrev.com/b8ccee5d81a839c22d62e4ea7aeec251f0772684/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasic.java
[modify] https://crrev.com/b8ccee5d81a839c22d62e4ea7aeec251f0772684/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/b8ccee5d81a839c22d62e4ea7aeec251f0772684/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasicTest.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/818885262b08d3e4439c8ae538cec8090b5cdf2c

commit 818885262b08d3e4439c8ae538cec8090b5cdf2c
Author: dullweber <dullweber@chromium.org>
Date: Mon May 29 14:07:28 2017

Improve and fix counter texts

Change all CBD counter texts to upper case first letter.
Replace cookie counter text for consistency with other counters.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2910983002
Cr-Commit-Position: refs/heads/master@{#475344}

[modify] https://crrev.com/818885262b08d3e4439c8ae538cec8090b5cdf2c/components/browsing_data_strings.grdp

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b57e420cea18ea14d1217a167868687679a89d3c

commit b57e420cea18ea14d1217a167868687679a89d3c
Author: guidou <guidou@chromium.org>
Date: Mon May 29 15:13:40 2017

Revert of Improve and fix counter texts (patchset #1 id:1 of https://codereview.chromium.org/2910983002/ )

Reason for revert:
Breaks Linux Tests bot.

See:
https://uberchromegw.corp.google.com/i/chromium.linux/builders/Linux%20Tests/builds/57247

Sample logs:
Google Test trace:
../../components/browsing_data/core/browsing_data_utils_unittest.cc:120: Test params: 0 password(s), 0 is_synced
../../components/browsing_data/core/browsing_data_utils_unittest.cc:122: Failure
      Expected: output
      Which is: None
To be equal to: base::

Original issue's description:
> Improve and fix counter texts
>
> Change all CBD counter texts to upper case first letter.
> Replace cookie counter text for consistency with other counters.
>
> BUG= 681523 
>
> Review-Url: https://codereview.chromium.org/2910983002
> Cr-Commit-Position: refs/heads/master@{#475344}
> Committed: https://chromium.googlesource.com/chromium/src/+/818885262b08d3e4439c8ae538cec8090b5cdf2c

TBR=msramek@chromium.org,maxwalker@chromium.org,dullweber@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 681523 

Review-Url: https://codereview.chromium.org/2911923002
Cr-Commit-Position: refs/heads/master@{#475353}

[modify] https://crrev.com/b57e420cea18ea14d1217a167868687679a89d3c/components/browsing_data_strings.grdp

I had to revert https://codereview.chromium.org/2910983002 because it broke lots of bots.

See for example,

https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.linux%2FLinux_Tests%2F57247%2F%2B%2Frecipes%2Fsteps%2Fcomponents_unittests%2F0%2Fstdout

and 

https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.mac%2Fios-simulator%2F17943%2F%2B%2Frecipes%2Fsteps%2Fios_chrome_unittests__iPhone_6s_Plus_iOS_10.0_%2F0%2Fstdout

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/67618346e22720b39a26ff20d7b94f9b10cd5f22

commit 67618346e22720b39a26ff20d7b94f9b10cd5f22
Author: dullweber <dullweber@chromium.org>
Date: Tue May 30 07:58:46 2017

Improve and fix counter texts

Change all CBD counter texts to upper case first letter.
Replace cookie counter text for consistency with other counters.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2910983002
Cr-Original-Commit-Position: refs/heads/master@{#475344}
Committed: https://chromium.googlesource.com/chromium/src/+/818885262b08d3e4439c8ae538cec8090b5cdf2c
Review-Url: https://codereview.chromium.org/2910983002
Cr-Commit-Position: refs/heads/master@{#475457}

[modify] https://crrev.com/67618346e22720b39a26ff20d7b94f9b10cd5f22/chrome/browser/browsing_data/browsing_data_counter_utils_unittest.cc
[modify] https://crrev.com/67618346e22720b39a26ff20d7b94f9b10cd5f22/components/browsing_data/core/browsing_data_utils_unittest.cc
[modify] https://crrev.com/67618346e22720b39a26ff20d7b94f9b10cd5f22/components/browsing_data_strings.grdp

This bug requires manual review: There is .grd file changes and we are only 62 days from stable.
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), josafat@(ChromeOS), bustamante@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

We would like to merge http://crrev.com/2910983002 because we noticed that a few strings were incorrect. This will affect a few strings that are already used in the Clear Browsing Data ui.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e34ebd44e401a8cf68522da72d9d75b9186e942c

commit e34ebd44e401a8cf68522da72d9d75b9186e942c
Author: kjellander <kjellander@chromium.org>
Date: Tue May 30 11:33:54 2017

Revert of Improve and fix counter texts (patchset #2 id:20001 of https://codereview.chromium.org/2910983002/ )

Reason for revert:
Breaks ios-simulator bots: https://build.chromium.org/p/chromium.mac/builders/ios-simulator/builds/17967

I'll file about about why analyze decided that ios_chrome_unittests could be skipped when running tryjobs when this was relanded.

Original issue's description:
> Improve and fix counter texts
>
> Change all CBD counter texts to upper case first letter.
> Replace cookie counter text for consistency with other counters.
>
> BUG= 681523 
>
> Review-Url: https://codereview.chromium.org/2910983002
> Cr-Original-Commit-Position: refs/heads/master@{#475344}
> Committed: https://chromium.googlesource.com/chromium/src/+/818885262b08d3e4439c8ae538cec8090b5cdf2c
> Review-Url: https://codereview.chromium.org/2910983002
> Cr-Commit-Position: refs/heads/master@{#475457}
> Committed: https://chromium.googlesource.com/chromium/src/+/67618346e22720b39a26ff20d7b94f9b10cd5f22

TBR=msramek@chromium.org,maxwalker@chromium.org,dullweber@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 681523 

Review-Url: https://codereview.chromium.org/2911003003
Cr-Commit-Position: refs/heads/master@{#475496}

[modify] https://crrev.com/e34ebd44e401a8cf68522da72d9d75b9186e942c/chrome/browser/browsing_data/browsing_data_counter_utils_unittest.cc
[modify] https://crrev.com/e34ebd44e401a8cf68522da72d9d75b9186e942c/components/browsing_data/core/browsing_data_utils_unittest.cc
[modify] https://crrev.com/e34ebd44e401a8cf68522da72d9d75b9186e942c/components/browsing_data_strings.grdp

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/8d654d3a72c612695257f5cc33ab1625488df780

commit 8d654d3a72c612695257f5cc33ab1625488df780
Author: dullweber <dullweber@chromium.org>
Date: Tue May 30 13:31:18 2017

Improve and fix counter texts

Change all CBD counter texts to upper case first letter.
Replace cookie counter text for consistency with other counters.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2910983002
Cr-Original-Original-Commit-Position: refs/heads/master@{#475344}
Committed: https://chromium.googlesource.com/chromium/src/+/818885262b08d3e4439c8ae538cec8090b5cdf2c
Review-Url: https://codereview.chromium.org/2910983002
Cr-Original-Commit-Position: refs/heads/master@{#475457}
Committed: https://chromium.googlesource.com/chromium/src/+/67618346e22720b39a26ff20d7b94f9b10cd5f22
Review-Url: https://codereview.chromium.org/2910983002
Cr-Commit-Position: refs/heads/master@{#475511}

[modify] https://crrev.com/8d654d3a72c612695257f5cc33ab1625488df780/chrome/browser/browsing_data/browsing_data_counter_utils_unittest.cc
[modify] https://crrev.com/8d654d3a72c612695257f5cc33ab1625488df780/components/browsing_data/core/browsing_data_utils.h
[modify] https://crrev.com/8d654d3a72c612695257f5cc33ab1625488df780/components/browsing_data/core/browsing_data_utils_unittest.cc
[modify] https://crrev.com/8d654d3a72c612695257f5cc33ab1625488df780/components/browsing_data_strings.grdp
[modify] https://crrev.com/8d654d3a72c612695257f5cc33ab1625488df780/ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller_unittest.mm

http://crrev.com/2910983002 approved for merge to branch 3112.  Note you must merge ASAP, if you do not process the merge soon we will have to reject the CL.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3e5b22f782de5cb8909dbca7936964d30514ff55

commit 3e5b22f782de5cb8909dbca7936964d30514ff55
Author: Martin Sramek <msramek@chromium.org>
Date: Wed May 31 08:48:45 2017

Improve and fix counter texts

Change all CBD counter texts to upper case first letter.
Replace cookie counter text for consistency with other counters.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2910983002
Cr-Original-Original-Original-Commit-Position: refs/heads/master@{#475344}
Committed: https://chromium.googlesource.com/chromium/src/+/818885262b08d3e4439c8ae538cec8090b5cdf2c
Review-Url: https://codereview.chromium.org/2910983002
Cr-Original-Original-Commit-Position: refs/heads/master@{#475457}
Committed: https://chromium.googlesource.com/chromium/src/+/67618346e22720b39a26ff20d7b94f9b10cd5f22
Review-Url: https://codereview.chromium.org/2910983002
Cr-Original-Commit-Position: refs/heads/master@{#475511}
Review-Url: https://codereview.chromium.org/2912333002 .
Cr-Commit-Position: refs/branch-heads/3112@{#49}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

[modify] https://crrev.com/3e5b22f782de5cb8909dbca7936964d30514ff55/chrome/browser/browsing_data/browsing_data_counter_utils_unittest.cc
[modify] https://crrev.com/3e5b22f782de5cb8909dbca7936964d30514ff55/components/browsing_data/core/browsing_data_utils.h
[modify] https://crrev.com/3e5b22f782de5cb8909dbca7936964d30514ff55/components/browsing_data/core/browsing_data_utils_unittest.cc
[modify] https://crrev.com/3e5b22f782de5cb8909dbca7936964d30514ff55/components/browsing_data_strings.grdp
[modify] https://crrev.com/3e5b22f782de5cb8909dbca7936964d30514ff55/ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller_unittest.mm

Merged the CL in #33 on dullweber@'s behalf in #35.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/47741c17bfe4bd58d0e92435f5b2c933fe3a0daa

commit 47741c17bfe4bd58d0e92435f5b2c933fe3a0daa
Author: dullweber <dullweber@chromium.org>
Date: Wed Jun 07 08:05:58 2017

Disable clickable links in checkbox summary for Talkback.

When discussing the UI for CBD, we decided that the main purpose of the checkbox control is to enable/disable the option and we would prefer not to expose the myactivity.google.com link to Talkback. The link will be read out and can be manually entered when required.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2805643002
Cr-Commit-Position: refs/heads/master@{#477578}

[modify] https://crrev.com/47741c17bfe4bd58d0e92435f5b2c933fe3a0daa/chrome/android/java/src/org/chromium/chrome/browser/preferences/ClearBrowsingDataTabCheckBoxPreference.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a82b3e3179a055144fab8894e03368700a7f153d

commit a82b3e3179a055144fab8894e03368700a7f153d
Author: dullweber <dullweber@chromium.org>
Date: Wed Jun 28 11:07:22 2017

Improve histogram and actions for CBD dialog

Add histogram for time spent in Clear Browsing Data dialog.
Add actions for tab changes.
Fix incorrect logging of timeperiod changes by registering listeners
after time picker is fully initialized.

CBD metrics: https://docs.google.com/presentation/d/1uWaHywa3UVkXecsDdhL-24C5iyqAT5UWdoPh5PSwkPA/edit#slide=id.g1e32513c06_0_1

BUG= 681523 

Review-Url: https://codereview.chromium.org/2962523003
Cr-Commit-Position: refs/heads/master@{#482942}

[modify] https://crrev.com/a82b3e3179a055144fab8894e03368700a7f153d/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/a82b3e3179a055144fab8894e03368700a7f153d/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java
[modify] https://crrev.com/a82b3e3179a055144fab8894e03368700a7f153d/tools/metrics/actions/actions.xml
[modify] https://crrev.com/a82b3e3179a055144fab8894e03368700a7f153d/tools/metrics/histograms/histograms.xml

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/72ce5d481f11212f8cbb99f13058a82f4f4a0d84

commit 72ce5d481f11212f8cbb99f13058a82f4f4a0d84
Author: dullweber <dullweber@chromium.org>
Date: Fri Jun 30 11:20:00 2017

Log basic/advanced tab action from java

Instead of logging the tab of a deletion from the BrowsingDataBridge,
it should be logged in Java because the C++ code is also used from a few
other places and the action would be recorded incorrectly.

BUG= 681523 

Review-Url: https://codereview.chromium.org/2963973002
Cr-Commit-Position: refs/heads/master@{#483676}

[modify] https://crrev.com/72ce5d481f11212f8cbb99f13058a82f4f4a0d84/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/72ce5d481f11212f8cbb99f13058a82f4f4a0d84/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesAdvanced.java
[modify] https://crrev.com/72ce5d481f11212f8cbb99f13058a82f4f4a0d84/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasic.java
[modify] https://crrev.com/72ce5d481f11212f8cbb99f13058a82f4f4a0d84/chrome/browser/android/browsing_data/browsing_data_bridge.cc
[modify] https://crrev.com/72ce5d481f11212f8cbb99f13058a82f4f4a0d84/components/browsing_data/core/browsing_data_utils.cc
[modify] https://crrev.com/72ce5d481f11212f8cbb99f13058a82f4f4a0d84/components/browsing_data/core/browsing_data_utils.h

The implementation work for Android is done