Reland "Enable 'Browsing data volume counters on Desktop' by default."

chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Index: chrome/browser/ui/webui/options/clear_browser_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index 444004df670f0c804b9da4076e7d61570fa15345..bcd8569461214555795cf14199e1e454d59d2a3a 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -45,8 +45,18 @@ const char kClearBrowsingDataLearnMoreUrl[] =
     "https://support.google.com/chrome/?p=settings_clear_browsing_data";
 
 bool AreCountersEnabled() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableClearBrowsingDataCounters);
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableClearBrowsingDataCounters)) {
+    return true;
+  }
+
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableClearBrowsingDataCounters)) {
+    return false;
+  }
+
+  // Enabled by default.
+  return true;
 }
 
 }  // namespace