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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 27 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace {
 
 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
 
 namespace options {
 
 ClearBrowserDataHandler::ClearBrowserDataHandler()
     : remover_(nullptr),
       sync_service_(nullptr) {
 }
@@ skipping 393 matching lines @@
       base::StringValue(GetCounterTextFromResult(result.get())));
 }
 
 void ClearBrowserDataHandler::OnStateChanged() {
   web_ui()->CallJavascriptFunction(
       "ClearBrowserDataOverlay.updateSyncWarning",
       base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()));
 }
 
 }  // namespace options