Moved BrowsingDataCounter and part of BrowsingDataCounterUtils to components.

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.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"
 #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"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
+#include "components/browsing_data/counters/browsing_data_counter.h"
+#include "components/browsing_data/pref_names.h"
 #include "components/browsing_data_ui/history_notice_utils.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace {
@@ skipping 31 matching lines @@
 void ClearBrowserDataHandler::InitializeHandler() {
   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()) {
-    AddCounter(base::WrapUnique(new PasswordsCounter()));
-    AddCounter(base::WrapUnique(new HistoryCounter()));
-    AddCounter(base::WrapUnique(new CacheCounter()));
-    AddCounter(base::WrapUnique(new AutofillCounter()));
-    AddCounter(base::WrapUnique(new MediaLicensesCounter()));
+    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)));
 
-    sync_service_ =
-        ProfileSyncServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()));
+    sync_service_ = ProfileSyncServiceFactory::GetForProfile(profile);
     if (sync_service_)
       sync_service_->AddObserver(this);
   }
 }
 
 void ClearBrowserDataHandler::InitializePage() {
   web_ui()->CallJavascriptFunctionUnsafe(
       "ClearBrowserDataOverlay.createFooter",
       base::FundamentalValue(AreCountersEnabled()),
       base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()),
@@ skipping 27 matching lines @@
       text = l10n_util::GetStringFUTF16(IDS_CLEAR_BROWSING_DATA_INFO_BAR_TEXT,
                                         acc.GetShortcutText());
     }
   }
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "ClearBrowserDataOverlay.setBannerText", base::StringValue(text));
 }
 
 void ClearBrowserDataHandler::OnPageOpened(const base::ListValue* value) {
-  for (BrowsingDataCounter* counter : counters_) {
+  for (browsing_data::BrowsingDataCounter* counter : counters_) {
     DCHECK(AreCountersEnabled());
     counter->Restart();
   }
 }
 
 void ClearBrowserDataHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
@@ skipping 145 matching lines @@
         other_types,
         other_types + num_other_types,
         [prefs](const std::string& pref) { return prefs->GetBoolean(pref); });
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         "History.ClearBrowsingData.PasswordsDeletion.AdditionalDatatypesCount",
         checked_other_types);
   }
 
   remover_ = BrowsingDataRemoverFactory::GetForBrowserContext(profile);
   remover_->AddObserver(this);
-  int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);
-  remover_->Remove(
-      BrowsingDataRemover::Period(
-          static_cast<BrowsingDataRemover::TimePeriod>(period_selected)),
-      remove_mask, origin_mask);
+  int period_selected =
+      prefs->GetInteger(browsing_data::prefs::kDeleteTimePeriod);
+  remover_->Remove(BrowsingDataRemover::Period(
+                       static_cast<browsing_data::TimePeriod>(period_selected)),
+                   remove_mask, origin_mask);
 
   // Store the clear browsing data time. Next time the clear browsing data
   // dialog is open, this time is used to decide whether to display an info
   // banner or not.
   prefs->SetInt64(prefs::kLastClearBrowsingDataTime,
                   base::Time::Now().ToInternalValue());
 }
 
 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
   remover_->RemoveObserver(this);
@@ skipping 26 matching lines @@
                                          base::FundamentalValue(show_notice));
 }
 
 void ClearBrowserDataHandler::OnBrowsingHistoryPrefChanged() {
   web_ui()->CallJavascriptFunctionUnsafe(
       "ClearBrowserDataOverlay.setAllowDeletingHistory",
       base::FundamentalValue(*allow_deleting_browser_history_));
 }
 
 void ClearBrowserDataHandler::AddCounter(
-    std::unique_ptr<BrowsingDataCounter> counter) {
+    std::unique_ptr<browsing_data::BrowsingDataCounter> counter) {
   DCHECK(AreCountersEnabled());
 
-  counter->Init(
-      Profile::FromWebUI(web_ui()),
-      base::Bind(&ClearBrowserDataHandler::UpdateCounterText,
-                 base::Unretained(this)));
+  counter->Init(Profile::FromWebUI(web_ui())->GetPrefs(),
+                base::Bind(&ClearBrowserDataHandler::UpdateCounterText,
+                           base::Unretained(this)));
   counters_.push_back(std::move(counter));
 }
 
 void ClearBrowserDataHandler::UpdateCounterText(
-    std::unique_ptr<BrowsingDataCounter::Result> result) {
+    std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) {
   DCHECK(AreCountersEnabled());
   web_ui()->CallJavascriptFunctionUnsafe(
       "ClearBrowserDataOverlay.updateCounter",
       base::StringValue(result->source()->GetPrefName()),
       base::StringValue(GetCounterTextFromResult(result.get())));
 }
 
 void ClearBrowserDataHandler::OnStateChanged() {
   web_ui()->CallJavascriptFunctionUnsafe(
       "ClearBrowserDataOverlay.updateSyncWarningAndHistoryFooter",
@@ skipping 32 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