Add BrowsingDataCounterFactory

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 <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/autofill_counter.h"
+#include "chrome/browser/browsing_data/browsing_data_counter_factory.h"
 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
 #include "chrome/browser/browsing_data/cache_counter.h"

[msramek, 2016/07/07 11:55:33]

Ditto here - please remove the unnecessary includes.

[ioanap, 2016/07/07 16:30:48]

Done.

 #include "chrome/browser/browsing_data/history_counter.h"
 #include "chrome/browser/browsing_data/media_licenses_counter.h"
 #include "chrome/browser/browsing_data/passwords_counter.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/accelerator_utils.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
@@ skipping 46 matching lines @@
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled, prefs);
   allow_deleting_browser_history_.Init(
       prefs::kAllowDeletingBrowserHistory,
       prefs,
       base::Bind(&ClearBrowserDataHandler::OnBrowsingHistoryPrefChanged,
                  base::Unretained(this)));
 
   if (AreCountersEnabled()) {
     Profile* profile = Profile::FromWebUI(web_ui());
-    AddCounter(base::WrapUnique(new PasswordsCounter(profile)));
-    AddCounter(base::WrapUnique(new HistoryCounter(profile)));
-    AddCounter(base::WrapUnique(new CacheCounter(profile)));
-    AddCounter(base::WrapUnique(new AutofillCounter(profile)));
-    AddCounter(base::WrapUnique(new MediaLicensesCounter(profile)));
+    AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+        prefs::kDeletePasswords, profile)));
+    AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+        prefs::kDeleteBrowsingHistory, profile)));
+    AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+        prefs::kDeleteCache, profile)));
+    AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+        prefs::kDeleteFormData, profile)));
+    AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+        prefs::kDeleteMediaLicenses, profile)));
 
     sync_service_ = ProfileSyncServiceFactory::GetForProfile(profile);
     if (sync_service_)
       sync_service_->AddObserver(this);
   }
 }
 
 void ClearBrowserDataHandler::InitializePage() {
   web_ui()->CallJavascriptFunctionUnsafe(
       "ClearBrowserDataOverlay.createFooter",
@@ skipping 309 matching lines @@
       "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated",
       should_show_history_notice_);
 }
 
 void ClearBrowserDataHandler::UpdateHistoryDeletionDialog(bool show) {
   // This is used by OnBrowsingDataRemoverDone (when the deletion finishes).
   should_show_history_deletion_dialog_ = show;
 }
 
 }  // namespace options