Add BrowsingDataCounterFactory

chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc

 // Copyright 2015 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/settings/settings_clear_browsing_data_handler.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.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_factory.h"
 #include "chrome/browser/browsing_data/cache_counter.h"

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

None of the .*counter\.h includes is needed anymore.

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

Done.

 #include "chrome/browser/browsing_data/downloads_counter.h"
 #include "chrome/browser/browsing_data/history_counter.h"
 #include "chrome/browser/browsing_data/hosted_apps_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/sync/profile_sync_service_factory.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/browsing_data/pref_names.h"
@@ skipping 180 matching lines @@
       "cr.webUIListenerCallback",
       base::StringValue("browsing-history-pref-changed"),
       base::FundamentalValue(
           profile_->GetPrefs()->GetBoolean(
               prefs::kAllowDeletingBrowserHistory)));
 }
 
 void ClearBrowsingDataHandler::HandleInitialize(const base::ListValue* args) {
   AllowJavascript();
 
   // TODO(msramek): Simplify this using a factory.

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

We're already using a factory, but (apart from removing includes) this didn't
simplify things much.

Consider using the following pattern:

std::string prefs = {
  prefs::kDeleteBrowsingHistory,
  ...
}

for (const std::string& pref : prefs)
  AddCounter(...)

This already improves things by explicitly listing the preferences instead of
the counters. The last thing that would remain (out of the scope of this CL) is
to auto-generate the list of preferences from the HTML/JS instead of hardcoding
it. So please update the TODO for me:

// TODO(msramek): Get the list of deletion preferences from the JS side.

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

Thank you! 

Done.

-  AddCounter(base::WrapUnique(new AutofillCounter(profile_)));
-  AddCounter(base::WrapUnique(new CacheCounter(profile_)));
-  AddCounter(base::WrapUnique(new DownloadsCounter(profile_)));
-  AddCounter(base::WrapUnique(new HistoryCounter(profile_)));
-  AddCounter(base::WrapUnique(new HostedAppsCounter(profile_)));
-  AddCounter(base::WrapUnique(new PasswordsCounter(profile_)));
-  AddCounter(base::WrapUnique(new MediaLicensesCounter(profile_)));
+  AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+      prefs::kDeleteFormData, profile_)));
+  AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+      prefs::kDeleteCache, profile_)));
+  AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+      prefs::kDeleteDownloadHistory, profile_)));
+  AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+      prefs::kDeleteBrowsingHistory, profile_)));
+  AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+      prefs::kDeleteHostedAppsData, profile_)));
+  AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+      prefs::kDeletePasswords, profile_)));
+  AddCounter(base::WrapUnique(BrowsingDataCounterFactory::GetForPreference(
+      prefs::kDeleteMediaLicenses, profile_)));
 
   OnStateChanged();
   RefreshHistoryNotice();
 }
 
 void ClearBrowsingDataHandler::OnStateChanged() {
   CallJavascriptFunction(
       "cr.webUIListenerCallback",
       base::StringValue("update-footer"),
       base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()),
@@ skipping 49 matching lines @@
 void ClearBrowsingDataHandler::UpdateCounterText(
     std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) {
   CallJavascriptFunction(
       "cr.webUIListenerCallback",
       base::StringValue("update-counter-text"),
       base::StringValue(result->source()->GetPrefName()),
       base::StringValue(GetCounterTextFromResult(result.get())));
 }
 
 }  // namespace settings