[ImportantSites] Adding usage metrics.

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 ae0ad9c391d31a3321fad1a0a5dab00048ca8ebd..e4952f976829503003a27e3ac81d5cf0ce0292ce 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
@@ -213,6 +213,7 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
     private ProgressDialog mProgressDialog;
     private Item[] mItems;
 
+    private int mMaxImportantSites;
     // This is the sorted list of important registerable domains. If null, then we haven't finished
     // fetching them yet.
     private String[] mSortedImportantDomains;
@@ -344,11 +345,17 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
      * </ol>
      */
     private boolean shouldShowImportantSitesDialog() {
-        if (mSortedImportantDomains == null || mSortedImportantDomains.length == 0) return false;
+        if (!ChromeFeatureList.isEnabled(ChromeFeatureList.IMPORTANT_SITES_IN_CBD)) return false;
         EnumSet<DialogOption> selectedOptions = getSelectedOptions();
-        return ChromeFeatureList.isEnabled(ChromeFeatureList.IMPORTANT_SITES_IN_CBD)
-                && (selectedOptions.contains(DialogOption.CLEAR_CACHE)
-                           || selectedOptions.contains(DialogOption.CLEAR_COOKIES_AND_SITE_DATA));
+        if (!selectedOptions.contains(DialogOption.CLEAR_CACHE)
+                && !selectedOptions.contains(DialogOption.CLEAR_COOKIES_AND_SITE_DATA)) {
+            return false;
+        }
+        boolean haveImportantSites =

[Ted C, 2016/06/29 15:59:14]

this looks like it reversed the meaning of this function...shouldn't this be
this now?

mSortedImportantDomains != null && mSortedImportantDomains.length > 0

[Theresa, 2016/06/29 18:25:30]

Ah, yes.. seems so to me as well. Is there a test that catches this? If not, I
think there should be.

[dmurph, 2016/06/29 19:17:39]

Thanks! Yes there is, I just didn't run tests, my bad.

+                mSortedImportantDomains == null || mSortedImportantDomains.length == 0;
+        RecordHistogram.recordBooleanHistogram(
+                "History.ClearBrowsingData.ImportantSitesPresent", haveImportantSites);
+        return haveImportantSites;
     }
 
     @Override
@@ -395,6 +402,9 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        RecordHistogram.recordBooleanHistogram(
+                "History.ClearBrowsingData.OnCreate", savedInstanceState == null);
+        mMaxImportantSites = PrefServiceBridge.getMaxImportantSites();
         PrefServiceBridge.getInstance().requestInfoAboutOtherFormsOfBrowsingHistory(this);
         getActivity().setTitle(R.string.clear_browsing_data_title);
         addPreferencesFromResource(R.xml.clear_browsing_data_preferences);
@@ -565,6 +575,8 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
 
     @Override
     public void onImportantRegisterableDomainsReady(String[] domains, String[] exampleOrigins) {
+        RecordHistogram.recordCustomCountHistogram("History.ClearBrowsingData.NumImportant",
+                mSortedImportantDomains.length, 0, mMaxImportantSites + 1, mMaxImportantSites + 1);
         mSortedImportantDomains = Arrays.copyOf(domains, domains.length);
         mSortedExampleOrigins = Arrays.copyOf(exampleOrigins, exampleOrigins.length);
     }
@@ -579,6 +591,9 @@ public class ClearBrowsingDataPreferences extends PreferenceFragment
             // Deselected means that the user is excluding the domain from being cleared.
             String[] deselectedDomains = data.getStringArrayExtra(
                     ConfirmImportantSitesDialogFragment.DESELECTED_DOMAINS_TAG);
+            RecordHistogram.recordCustomCountHistogram(
+                    "History.ClearBrowsingData.NumImportantDeselected", deselectedDomains.length, 0,
+                    mMaxImportantSites + 1, mMaxImportantSites + 1);
             clearBrowsingData(getSelectedOptions(), deselectedDomains);
         }
     }