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

This reverts commit b3f105f17cb6ff224dc8892f2bde7b4cb4b24388.

Bisect show it fails for chromeos=1 (static_library)
Failed test is here: https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/12407/steps/browser_tests
Failed compile is built here:
https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Builder/builds/32209

Failed test is GuestModeOptionsBrowserTest.LoadOptionsByURL

BUG=553640
TBR=msramek@chromium.org, robliao@chromium.org
NOTREECHECKS=True
NOTRY=True

Review URL: https://codereview.chromium.org/1423373006

Cr-Commit-Position: refs/heads/master@{#358685}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 83bb3b8..720aff7d 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2018,8 +2018,7 @@
      IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME,
      IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION,
      kOsAll,
-     ENABLE_DISABLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters,
-                               switches::kDisableClearBrowsingDataCounters)
+     SINGLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters)
     },
 #if defined(ENABLE_TASK_MANAGER)
     {"disable-new-task-manager",
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 bcd8569..444004d 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -45,18 +45,8 @@
     "https://support.google.com/chrome/?p=settings_clear_browsing_data";
 
 bool AreCountersEnabled() {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableClearBrowsingDataCounters)) {
-    return true;
-  }
-
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableClearBrowsingDataCounters)) {
-    return false;
-  }
-
-  // Enabled by default.
-  return true;
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableClearBrowsingDataCounters);
 }
 
 }  // namespace
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index c04a5f9e..a76cc80 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -232,10 +232,6 @@
 const char kDisableChildAccountDetection[] =
     "disable-child-account-detection";
 
-// Disables data volume counters in the Clear Browsing Data dialog.
-const char kDisableClearBrowsingDataCounters[] =
-    "disable-clear-browsing-data-counters";
-
 // Disables the client-side phishing detection feature. Note that even if
 // client-side phishing detection is enabled, it will only be active if the
 // user has opted in to UMA stats and SafeBrowsing is enabled in the
@@ -394,7 +390,8 @@
 const char kEnableChildAccountDetection[] =
     "enable-child-account-detection";
 
-// Enables data volume counters in the Clear Browsing Data dialog.
+// If true, the clear browsing data dialog will show data volume counters,
+// where available.
 const char kEnableClearBrowsingDataCounters[] =
     "enable-clear-browsing-data-counters";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index c4b8da3c..bb2ccde 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -67,7 +67,6 @@
 extern const char kDisableBundledPpapiFlash[];
 extern const char kDisableCastStreamingHWEncoding[];
 extern const char kDisableChildAccountDetection[];
-extern const char kDisableClearBrowsingDataCounters[];
 extern const char kDisableClientSidePhishingDetection[];
 extern const char kDisableComponentExtensionsWithBackgroundPages[];
 extern const char kDisableComponentUpdate[];
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index ea1bf2cd..527278b 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -65462,7 +65462,6 @@
   <int value="-1662447331" label="wake-on-packets"/>
   <int value="-1660972490" label="gpu-rasterization-msaa-sample-count"/>
   <int value="-1654344175" label="disable-extension-info-dialog"/>
-  <int value="-1649778035" label="disable-clear-browsing-data-counters"/>
   <int value="-1630419335" label="enable-download-notification"/>
   <int value="-1619757314" label="touch-scrolling-mode"/>
   <int value="-1614912400" label="enable-link-disambiguation-popup"/>