Moved BrowsingDataCounter and part of BrowsingDataCounterUtils to components.

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_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"
 #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"
 #include "components/browsing_data_ui/history_notice_utils.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_ui.h"
 
 namespace {
 
 const int kMaxTimesHistoryNoticeShown = 1;
 
 }
 
@@ skipping 116 matching lines @@
     };
     static size_t num_other_types = arraysize(other_types);
     int checked_other_types = std::count_if(
         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);
   }
 
-  int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);
+  int period_selected =
+      prefs->GetInteger(browsing_data::prefs::kDeleteTimePeriod);
   remover_ = BrowsingDataRemoverFactory::GetForBrowserContext(profile_);
   remover_->AddObserver(this);
-  remover_->Remove(
-      BrowsingDataRemover::Period(
-          static_cast<BrowsingDataRemover::TimePeriod>(period_selected)),
-      remove_mask, origin_mask);
+  remover_->Remove(BrowsingDataRemover::Period(
+                       static_cast<browsing_data::TimePeriod>(period_selected)),
+                   remove_mask, origin_mask);
 }
 
 void ClearBrowsingDataHandler::OnBrowsingDataRemoverDone() {
   remover_->RemoveObserver(this);
   remover_ = nullptr;
 
   PrefService* prefs = profile_->GetPrefs();
   int notice_shown_times =
       prefs->GetInteger(prefs::kClearBrowsingDataHistoryNoticeShownTimes);
 
@@ skipping 28 matching lines @@
       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.
-  AddCounter(base::WrapUnique(new AutofillCounter()));
-  AddCounter(base::WrapUnique(new CacheCounter()));
-  AddCounter(base::WrapUnique(new DownloadsCounter()));
-  AddCounter(base::WrapUnique(new HistoryCounter()));
-  AddCounter(base::WrapUnique(new HostedAppsCounter()));
-  AddCounter(base::WrapUnique(new PasswordsCounter()));
-  AddCounter(base::WrapUnique(new MediaLicensesCounter()));
+  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_)));
 
   OnStateChanged();
   RefreshHistoryNotice();
 }
 
 void ClearBrowsingDataHandler::OnStateChanged() {
   CallJavascriptFunction(
       "cr.webUIListenerCallback",
       base::StringValue("update-footer"),
       base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()),
@@ skipping 31 matching lines @@
       "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated",
       show_history_footer_);
 }
 
 void ClearBrowsingDataHandler::UpdateHistoryDeletionDialog(bool show) {
   // This is used by OnBrowsingDataRemoverDone (when the deletion finishes).
   show_history_deletion_dialog_ = show;
 }
 
 void ClearBrowsingDataHandler::AddCounter(
-    std::unique_ptr<BrowsingDataCounter> counter) {
-  counter->Init(
-      profile_,
-      base::Bind(&ClearBrowsingDataHandler::UpdateCounterText,
-                 base::Unretained(this)));
+    std::unique_ptr<browsing_data::BrowsingDataCounter> counter) {
+  counter->Init(profile_->GetPrefs(),
+                base::Bind(&ClearBrowsingDataHandler::UpdateCounterText,
+                           base::Unretained(this)));
   counter->Restart();
   counters_.push_back(std::move(counter));
 }
 
 void ClearBrowsingDataHandler::UpdateCounterText(
-    std::unique_ptr<BrowsingDataCounter::Result> result) {
+    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