Index: chrome/browser/browsing_data/browsing_data_counter_factory.cc |
diff --git a/chrome/browser/browsing_data/browsing_data_counter_factory.cc b/chrome/browser/browsing_data/browsing_data_counter_factory.cc |
index 020a70d3acd10e931bd8ad2ed6ad3fc27b7b0e73..f8efef419d3440f1ce4aeb230769d1f3eabb793d 100644 |
--- a/chrome/browser/browsing_data/browsing_data_counter_factory.cc |
+++ b/chrome/browser/browsing_data/browsing_data_counter_factory.cc |
@@ -4,22 +4,37 @@ |
#include "chrome/browser/browsing_data/browsing_data_counter_factory.h" |
+#include "base/bind.h" |
+#include "base/bind_helpers.h" |
#include "base/memory/ptr_util.h" |
-#include "chrome/browser/browsing_data/autofill_counter.h" |
#include "chrome/browser/browsing_data/browsing_data_counter_utils.h" |
#include "chrome/browser/browsing_data/cache_counter.h" |
#include "chrome/browser/browsing_data/downloads_counter.h" |
-#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/history_service_factory.h" |
+#include "chrome/browser/history/web_history_service_factory.h" |
+#include "chrome/browser/password_manager/password_store_factory.h" |
#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/sync/profile_sync_service_factory.h" |
+#include "chrome/browser/web_data_service_factory.h" |
+#include "components/browsing_data/core/counters/autofill_counter.h" |
#include "components/browsing_data/core/counters/browsing_data_counter.h" |
+#include "components/browsing_data/core/counters/history_counter.h" |
+#include "components/browsing_data/core/counters/passwords_counter.h" |
#include "components/browsing_data/core/pref_names.h" |
+#include "components/history/core/browser/web_history_service.h" |
+#include "components/password_manager/core/browser/password_store.h" |
#if defined(ENABLE_EXTENSIONS) |
#include "chrome/browser/browsing_data/hosted_apps_counter.h" |
#endif |
+namespace { |
+ history::WebHistoryService* GetUpdatedWebHistoryService(Profile* profile) { |
msramek
2016/07/20 18:26:13
No offset within namespace. Empty lines between th
ioanap
2016/07/21 11:47:36
Done.
|
+ return WebHistoryServiceFactory::GetForProfile(profile); |
+ } |
+} |
+ |
// static |
std::unique_ptr<browsing_data::BrowsingDataCounter> |
BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile, |
@@ -27,17 +42,29 @@ BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile, |
if (!AreCountersEnabled()) |
return nullptr; |
- if (pref_name == browsing_data::prefs::kDeleteBrowsingHistory) |
- return base::MakeUnique<HistoryCounter>(profile); |
+ if (pref_name == browsing_data::prefs::kDeleteBrowsingHistory) { |
+ return base::MakeUnique<browsing_data::HistoryCounter>( |
+ HistoryServiceFactory::GetForProfile( |
+ profile, ServiceAccessType::EXPLICIT_ACCESS), |
+ base::Bind(&GetUpdatedWebHistoryService, |
+ base::Unretained(profile)), |
+ ProfileSyncServiceFactory::GetForProfile(profile)); |
+ } |
if (pref_name == browsing_data::prefs::kDeleteCache) |
return base::MakeUnique<CacheCounter>(profile); |
- if (pref_name == browsing_data::prefs::kDeletePasswords) |
- return base::MakeUnique<PasswordsCounter>(profile); |
+ if (pref_name == browsing_data::prefs::kDeletePasswords) { |
+ return base::MakeUnique<browsing_data::PasswordsCounter>( |
+ PasswordStoreFactory::GetForProfile( |
+ profile, ServiceAccessType::EXPLICIT_ACCESS)); |
+ } |
- if (pref_name == browsing_data::prefs::kDeleteFormData) |
- return base::MakeUnique<AutofillCounter>(profile); |
+ if (pref_name == browsing_data::prefs::kDeleteFormData) { |
+ return base::MakeUnique<browsing_data::AutofillCounter>( |
+ WebDataServiceFactory::GetAutofillWebDataForProfile( |
+ profile, ServiceAccessType::EXPLICIT_ACCESS)); |
+ } |
if (pref_name == browsing_data::prefs::kDeleteDownloadHistory) |
return base::MakeUnique<DownloadsCounter>(profile); |