Move BrowsingDataRemover to content/

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/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/chrome_browsing_data_remover_delegate.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/core/counters/browsing_data_counter.h"
 #include "components/browsing_data/core/history_notice_utils.h"
 #include "components/browsing_data/core/pref_names.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/prefs/pref_service.h"
+#include "content/public/browser/browsing_data_remover.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 {
 
 const char kClearBrowsingDataLearnMoreUrl[] =
     "https://support.google.com/chrome/?p=settings_clear_browsing_data";
@@ skipping 199 matching lines @@
     site_data_mask &= ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA;
 
   int remove_mask = 0;
   int origin_mask = 0;
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistory) &&
       *allow_deleting_browser_history_) {
     remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY;
   }
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteDownloadHistory) &&
       *allow_deleting_browser_history_) {
-    remove_mask |= BrowsingDataRemover::DATA_TYPE_DOWNLOADS;
+    remove_mask |= content::BrowsingDataRemover::DATA_TYPE_DOWNLOADS;
   }
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache))
-    remove_mask |= BrowsingDataRemover::DATA_TYPE_CACHE;
+    remove_mask |= content::BrowsingDataRemover::DATA_TYPE_CACHE;
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) {
     remove_mask |= site_data_mask;
-    origin_mask |= BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB;
+    origin_mask |= content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB;
   }
   if (prefs->GetBoolean(browsing_data::prefs::kDeletePasswords))
     remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS;
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteFormData))
     remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA;
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteMediaLicenses))
-    remove_mask |= BrowsingDataRemover::DATA_TYPE_MEDIA_LICENSES;
+    remove_mask |= content::BrowsingDataRemover::DATA_TYPE_MEDIA_LICENSES;
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData)) {
     remove_mask |= site_data_mask;
-    origin_mask |= BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB;
+    origin_mask |= content::BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB;
   }
 
   // Record the deletion of cookies and cache.
-  BrowsingDataRemover::CookieOrCacheDeletionChoice choice =
-      BrowsingDataRemover::NEITHER_COOKIES_NOR_CACHE;
+  content::BrowsingDataRemover::CookieOrCacheDeletionChoice choice =
+      content::BrowsingDataRemover::NEITHER_COOKIES_NOR_CACHE;
   if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) {
     choice = prefs->GetBoolean(browsing_data::prefs::kDeleteCache)
-                 ? BrowsingDataRemover::BOTH_COOKIES_AND_CACHE
-                 : BrowsingDataRemover::ONLY_COOKIES;
+                 ? content::BrowsingDataRemover::BOTH_COOKIES_AND_CACHE
+                 : content::BrowsingDataRemover::ONLY_COOKIES;
   } else if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache)) {
-    choice = BrowsingDataRemover::ONLY_CACHE;
+    choice = content::BrowsingDataRemover::ONLY_CACHE;
   }
   UMA_HISTOGRAM_ENUMERATION(
-      "History.ClearBrowsingData.UserDeletedCookieOrCacheFromDialog",
-      choice, BrowsingDataRemover::MAX_CHOICE_VALUE);
+      "History.ClearBrowsingData.UserDeletedCookieOrCacheFromDialog", choice,
+      content::BrowsingDataRemover::MAX_CHOICE_VALUE);
 
   // Record the circumstances under which passwords are deleted.
   if (prefs->GetBoolean(browsing_data::prefs::kDeletePasswords)) {
     static const char* other_types[] = {
         browsing_data::prefs::kDeleteBrowsingHistory,
         browsing_data::prefs::kDeleteDownloadHistory,
         browsing_data::prefs::kDeleteCache,
         browsing_data::prefs::kDeleteCookies,
         browsing_data::prefs::kDeleteFormData,
         browsing_data::prefs::kDeleteHostedAppsData,
         browsing_data::prefs::kDeleteMediaLicenses,
     };
     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);
   }
 
-  remover_ = BrowsingDataRemoverFactory::GetForBrowserContext(profile);
+  remover_ = content::BrowserContext::GetBrowsingDataRemover(profile);
   remover_->AddObserver(this);
   int period_selected =
       prefs->GetInteger(browsing_data::prefs::kDeleteTimePeriod);
   browsing_data::TimePeriod time_period =
       static_cast<browsing_data::TimePeriod>(period_selected);
   browsing_data::RecordDeletionForPeriod(time_period);
   remover_->RemoveAndReply(
       browsing_data::CalculateBeginDeleteTime(time_period),
       browsing_data::CalculateEndDeleteTime(time_period),
       remove_mask, origin_mask, this);
@@ skipping 105 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