Improve histogram and actions for 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 59814cb10ce16da8ca45d7e5c830158f29f5bcde..baa595e9f013b34d88f3bbbf503a1ca96f47f2b0 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
@@ -20,6 +20,7 @@ import android.view.ViewGroup;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
+import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTab;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.Preferences;
 
@@ -80,13 +81,13 @@ public class ClearBrowsingDataTabsFragment extends Fragment {
         // Give the TabLayout the ViewPager.
         TabLayout tabLayout = (TabLayout) view.findViewById(R.id.clear_browsing_data_tabs);
         tabLayout.setupWithViewPager(viewPager);
-        tabLayout.addOnTabSelectedListener(new TabSelectListener());
         int tabIndex = adjustIndexForDirectionality(
                 PrefServiceBridge.getInstance().getLastSelectedClearBrowsingDataTab());
         TabLayout.Tab tab = tabLayout.getTabAt(tabIndex);
         if (tab != null) {
             tab.select();
         }
+        tabLayout.addOnTabSelectedListener(new TabSelectListener());
 
         // Remove elevation to avoid shadow between title and tabs.
         Preferences activity = (Preferences) getActivity();
@@ -140,6 +141,11 @@ public class ClearBrowsingDataTabsFragment extends Fragment {
         public void onTabSelected(TabLayout.Tab tab) {
             int tabIndex = adjustIndexForDirectionality(tab.getPosition());
             PrefServiceBridge.getInstance().setLastSelectedClearBrowsingDataTab(tabIndex);
+            if (tabIndex == ClearBrowsingDataTab.BASIC) {
+                RecordUserAction.record("ClearBrowsingData_SwitchTo_BasicTab");

[dullweber, 2017/06/27 15:39:56]

Theresa: Do you know if there is any way to write tests in Java that can verify
that the right actions are emitted from either Java or C++ code? This would help
us to check that the right deletions are performed and that we don't make
mistakes with the metrics code. On the C++ side there is UserActionTester but I
couldn't find a bridge, that does something similar

[Theresa, 2017/06/27 15:48:01]

It looks like we a helper method in RecordHistogram --
#getHistogramValueCountForTesting() that's used in some tests. You could add
something similar to RecordUserAction or otherwise create a bridge that exposes
similar functionality to the C++ UserActionTester, but it doesn't appear there's
anything Java-side yet.

[dullweber, 2017/06/28 09:09:33]

Thanks, getHistogramValueCountForTesting looks useful. I will see if it works
for what I would like to do and create another CL with some tests for our
actions.

+            } else {
+                RecordUserAction.record("ClearBrowsingData_SwitchTo_AdvancedTab");
+            }
         }
 
         @Override