Split browsing data masks between content and embedder

chrome/browser/extensions/api/browsing_data/browsing_data_test.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 <memory>
 #include <string>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_util.h"
 #include "base/values.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/extensions/api/browsing_data/browsing_data_api.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
 #include "components/browsing_data/core/pref_names.h"
 #include "components/prefs/pref_service.h"
 
 using extension_function_test_utils::RunFunctionAndReturnError;
 using extension_function_test_utils::RunFunctionAndReturnSingleResult;
 
 namespace {
 
 enum OriginTypeMask {
-  UNPROTECTED_WEB = BrowsingDataHelper::UNPROTECTED_WEB,
-  PROTECTED_WEB = BrowsingDataHelper::PROTECTED_WEB,
-  EXTENSION = BrowsingDataHelper::EXTENSION
+  UNPROTECTED_WEB = BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB,
+  PROTECTED_WEB = BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB,
+  EXTENSION = ChromeBrowsingDataRemoverDelegate::ORIGIN_TYPE_EXTENSION
 };
 
 const char kRemoveEverythingArguments[] =
     "[{\"since\": 1000}, {"
     "\"appcache\": true, \"cache\": true, \"cookies\": true, "
     "\"downloads\": true, \"fileSystems\": true, \"formData\": true, "
     "\"history\": true, \"indexedDB\": true, \"localStorage\": true, "
     "\"serverBoundCertificates\": true, \"passwords\": true, "
     "\"pluginData\": true, \"serviceWorkers\": true, \"cacheStorage\": true, "
     "\"webSQL\": true"
@@ skipping 101 matching lines @@
     // second, so we'll make sure the requested start time is within 10 seconds.
     // Since the smallest selectable period is an hour, that should be
     // sufficient.
     EXPECT_LE(expected_since, since + 10.0 * 1000.0);
   }
 
   void SetPrefsAndVerifySettings(int data_type_flags,
                                  int expected_origin_type_mask,
                                  int expected_removal_mask) {
     PrefService* prefs = browser()->profile()->GetPrefs();
-    prefs->SetBoolean(browsing_data::prefs::kDeleteCache,
-        !!(data_type_flags & BrowsingDataRemover::REMOVE_CACHE));
-    prefs->SetBoolean(browsing_data::prefs::kDeleteCookies,
-        !!(data_type_flags & BrowsingDataRemover::REMOVE_COOKIES));
+    prefs->SetBoolean(
+        browsing_data::prefs::kDeleteCache,
+        !!(data_type_flags & BrowsingDataRemover::DATA_TYPE_CACHE));
+    prefs->SetBoolean(
+        browsing_data::prefs::kDeleteCookies,
+        !!(data_type_flags & BrowsingDataRemover::DATA_TYPE_COOKIES));
     prefs->SetBoolean(browsing_data::prefs::kDeleteBrowsingHistory,
-        !!(data_type_flags & BrowsingDataRemover::REMOVE_HISTORY));
-    prefs->SetBoolean(browsing_data::prefs::kDeleteFormData,
-        !!(data_type_flags & BrowsingDataRemover::REMOVE_FORM_DATA));
-    prefs->SetBoolean(browsing_data::prefs::kDeleteDownloadHistory,
-        !!(data_type_flags & BrowsingDataRemover::REMOVE_DOWNLOADS));
-    prefs->SetBoolean(browsing_data::prefs::kDeleteHostedAppsData,
+                      !!(data_type_flags &
+                         ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY));
+    prefs->SetBoolean(
+        browsing_data::prefs::kDeleteFormData,
         !!(data_type_flags &
-           BrowsingDataRemover::REMOVE_HOSTED_APP_DATA_TESTONLY));
-    prefs->SetBoolean(browsing_data::prefs::kDeletePasswords,
-        !!(data_type_flags & BrowsingDataRemover::REMOVE_PASSWORDS));
-    prefs->SetBoolean(prefs::kClearPluginLSODataEnabled,
-        !!(data_type_flags & BrowsingDataRemover::REMOVE_PLUGIN_DATA));
+           ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA));
+    prefs->SetBoolean(
+        browsing_data::prefs::kDeleteDownloadHistory,
+        !!(data_type_flags & BrowsingDataRemover::DATA_TYPE_DOWNLOADS));
+    prefs->SetBoolean(
+        browsing_data::prefs::kDeleteHostedAppsData,
+        !!(data_type_flags & ChromeBrowsingDataRemoverDelegate::
+                                 DATA_TYPE_HOSTED_APP_DATA_TEST_ONLY));
+    prefs->SetBoolean(
+        browsing_data::prefs::kDeletePasswords,
+        !!(data_type_flags &
+           ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS));
+    prefs->SetBoolean(
+        prefs::kClearPluginLSODataEnabled,
+        !!(data_type_flags &
+           ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA));
 
     scoped_refptr<BrowsingDataSettingsFunction> function =
         new BrowsingDataSettingsFunction();
     SCOPED_TRACE("settings");
     std::unique_ptr<base::Value> result_value(RunFunctionAndReturnSingleResult(
         function.get(), std::string("[]"), browser()));
 
     base::DictionaryValue* result;
     EXPECT_TRUE(result_value->GetAsDictionary(&result));
 
     base::DictionaryValue* options;
     EXPECT_TRUE(result->GetDictionary("options", &options));
     base::DictionaryValue* origin_types;
     EXPECT_TRUE(options->GetDictionary("originTypes", &origin_types));
     int origin_type_mask = GetAsMask(origin_types, "unprotectedWeb",
                                     UNPROTECTED_WEB) |
                           GetAsMask(origin_types, "protectedWeb",
                                     PROTECTED_WEB) |
                           GetAsMask(origin_types, "extension", EXTENSION);
     EXPECT_EQ(expected_origin_type_mask, origin_type_mask);
 
     base::DictionaryValue* data_to_remove;
     EXPECT_TRUE(result->GetDictionary("dataToRemove", &data_to_remove));
     int removal_mask =
         GetAsMask(data_to_remove, "appcache",
-                  BrowsingDataRemover::REMOVE_APPCACHE) |
-        GetAsMask(data_to_remove, "cache", BrowsingDataRemover::REMOVE_CACHE) |
+                  BrowsingDataRemover::DATA_TYPE_APP_CACHE) |
+        GetAsMask(data_to_remove, "cache",
+                  BrowsingDataRemover::DATA_TYPE_CACHE) |
         GetAsMask(data_to_remove, "cookies",
-                  BrowsingDataRemover::REMOVE_COOKIES) |
+                  BrowsingDataRemover::DATA_TYPE_COOKIES) |
         GetAsMask(data_to_remove, "downloads",
-                  BrowsingDataRemover::REMOVE_DOWNLOADS) |
+                  BrowsingDataRemover::DATA_TYPE_DOWNLOADS) |
         GetAsMask(data_to_remove, "fileSystems",
-                  BrowsingDataRemover::REMOVE_FILE_SYSTEMS) |
+                  BrowsingDataRemover::DATA_TYPE_FILE_SYSTEMS) |
         GetAsMask(data_to_remove, "formData",
-                  BrowsingDataRemover::REMOVE_FORM_DATA) |
+                  ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA) |
         GetAsMask(data_to_remove, "history",
-                  BrowsingDataRemover::REMOVE_HISTORY) |
+                  ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY) |
         GetAsMask(data_to_remove, "indexedDB",
-                  BrowsingDataRemover::REMOVE_INDEXEDDB) |
+                  BrowsingDataRemover::DATA_TYPE_INDEXED_DB) |
         GetAsMask(data_to_remove, "localStorage",
-                  BrowsingDataRemover::REMOVE_LOCAL_STORAGE) |
+                  BrowsingDataRemover::DATA_TYPE_LOCAL_STORAGE) |
         GetAsMask(data_to_remove, "pluginData",
-                  BrowsingDataRemover::REMOVE_PLUGIN_DATA) |
+                  ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA) |
         GetAsMask(data_to_remove, "passwords",
-                  BrowsingDataRemover::REMOVE_PASSWORDS) |
+                  ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS) |
         GetAsMask(data_to_remove, "serviceWorkers",
-                  BrowsingDataRemover::REMOVE_SERVICE_WORKERS) |
+                  BrowsingDataRemover::DATA_TYPE_SERVICE_WORKERS) |
         GetAsMask(data_to_remove, "cacheStorage",
-                  BrowsingDataRemover::REMOVE_CACHE_STORAGE) |
+                  BrowsingDataRemover::DATA_TYPE_CACHE_STORAGE) |
         GetAsMask(data_to_remove, "webSQL",
-                  BrowsingDataRemover::REMOVE_WEBSQL) |
+                  BrowsingDataRemover::DATA_TYPE_WEB_SQL) |
         GetAsMask(data_to_remove, "serverBoundCertificates",
-                  BrowsingDataRemover::REMOVE_CHANNEL_IDS);
+                  BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS);
 
     EXPECT_EQ(expected_removal_mask, removal_mask);
   }
 
   // The kAllowDeletingBrowserHistory pref must be set to false before this
   // is called.
   void CheckRemovalPermitted(const std::string& data_types, bool permitted) {
     scoped_refptr<BrowsingDataRemoveFunction> function =
         new BrowsingDataRemoveFunction();
     std::string args = "[{\"since\": 1}," + data_types + "]";
@@ skipping 48 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, RemoveBrowsingDataAll) {
   scoped_refptr<BrowsingDataRemoveFunction> function =
       new BrowsingDataRemoveFunction();
   EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult(function.get(),
                                                    kRemoveEverythingArguments,
                                                    browser()));
 
   EXPECT_EQ(base::Time::FromDoubleT(1.0), GetBeginTime());
   EXPECT_EQ(
-      (BrowsingDataRemover::REMOVE_SITE_DATA |
-       BrowsingDataRemover::REMOVE_CACHE |
-       BrowsingDataRemover::REMOVE_DOWNLOADS |
-       BrowsingDataRemover::REMOVE_FORM_DATA |
-       BrowsingDataRemover::REMOVE_HISTORY |
-       BrowsingDataRemover::REMOVE_PASSWORDS) &
+      (ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA |
+       BrowsingDataRemover::DATA_TYPE_CACHE |
+       BrowsingDataRemover::DATA_TYPE_DOWNLOADS |
+       ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA |
+       ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY |
+       ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS) &
           // TODO(benwells): implement clearing of site usage data via the
           // browsing data API. https://crbug.com/500801.
-          ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA &
+          ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_USAGE_DATA &
           // TODO(dmurph): implement clearing of durable storage permission
           // via the browsing data API. https://crbug.com/500801.
-          ~BrowsingDataRemover::REMOVE_DURABLE_PERMISSION &
+          ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_DURABLE_PERMISSION &
           // We can't remove plugin data inside a test profile.
-          ~BrowsingDataRemover::REMOVE_PLUGIN_DATA &
+          ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA &
           // TODO(ramyasharma): implement clearing of external protocol data
           // via the browsing data API. https://crbug.com/692850.
-          ~BrowsingDataRemover::REMOVE_EXTERNAL_PROTOCOL_DATA,
+          ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_EXTERNAL_PROTOCOL_DATA,
       GetRemovalMask());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, BrowsingDataOriginTypeMask) {
   RunBrowsingDataRemoveFunctionAndCompareOriginTypeMask("{}", 0);
 
   RunBrowsingDataRemoveFunctionAndCompareOriginTypeMask(
       "{\"unprotectedWeb\": true}", UNPROTECTED_WEB);
   RunBrowsingDataRemoveFunctionAndCompareOriginTypeMask(
       "{\"protectedWeb\": true}", PROTECTED_WEB);
@@ skipping 12 matching lines @@
 
   RunBrowsingDataRemoveFunctionAndCompareOriginTypeMask(
       ("{\"unprotectedWeb\": true, \"protectedWeb\": true, "
        "\"extension\": true}"),
       UNPROTECTED_WEB | PROTECTED_WEB | EXTENSION);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
                        BrowsingDataRemovalMask) {
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "appcache", BrowsingDataRemover::REMOVE_APPCACHE);
+      "appcache", BrowsingDataRemover::DATA_TYPE_APP_CACHE);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "cache", BrowsingDataRemover::REMOVE_CACHE);
+      "cache", BrowsingDataRemover::DATA_TYPE_CACHE);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "cookies", BrowsingDataRemover::REMOVE_COOKIES);
+      "cookies", BrowsingDataRemover::DATA_TYPE_COOKIES);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "downloads", BrowsingDataRemover::REMOVE_DOWNLOADS);
+      "downloads", BrowsingDataRemover::DATA_TYPE_DOWNLOADS);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "fileSystems", BrowsingDataRemover::REMOVE_FILE_SYSTEMS);
+      "fileSystems", BrowsingDataRemover::DATA_TYPE_FILE_SYSTEMS);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "formData", BrowsingDataRemover::REMOVE_FORM_DATA);
+      "formData", ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "history", BrowsingDataRemover::REMOVE_HISTORY);
+      "history", ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "indexedDB", BrowsingDataRemover::REMOVE_INDEXEDDB);
+      "indexedDB", BrowsingDataRemover::DATA_TYPE_INDEXED_DB);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "localStorage", BrowsingDataRemover::REMOVE_LOCAL_STORAGE);
+      "localStorage", BrowsingDataRemover::DATA_TYPE_LOCAL_STORAGE);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "serverBoundCertificates",
-      BrowsingDataRemover::REMOVE_CHANNEL_IDS);
+      "serverBoundCertificates", BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "passwords", BrowsingDataRemover::REMOVE_PASSWORDS);
+      "passwords", ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS);
   // We can't remove plugin data inside a test profile.
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "serviceWorkers", BrowsingDataRemover::REMOVE_SERVICE_WORKERS);
+      "serviceWorkers", BrowsingDataRemover::DATA_TYPE_SERVICE_WORKERS);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "cacheStorage", BrowsingDataRemover::REMOVE_CACHE_STORAGE);
+      "cacheStorage", BrowsingDataRemover::DATA_TYPE_CACHE_STORAGE);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
-      "webSQL", BrowsingDataRemover::REMOVE_WEBSQL);
+      "webSQL", BrowsingDataRemover::DATA_TYPE_WEB_SQL);
 }
 
 // Test an arbitrary combination of data types.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
                        BrowsingDataRemovalMaskCombination) {
   RunBrowsingDataRemoveFunctionAndCompareRemovalMask(
-       "{\"appcache\": true, \"cookies\": true, \"history\": true}",
-       BrowsingDataRemover::REMOVE_APPCACHE |
-           BrowsingDataRemover::REMOVE_COOKIES |
-           BrowsingDataRemover::REMOVE_HISTORY);
+      "{\"appcache\": true, \"cookies\": true, \"history\": true}",
+      BrowsingDataRemover::DATA_TYPE_APP_CACHE |
+          BrowsingDataRemover::DATA_TYPE_COOKIES |
+          ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY);
 }
 
 // Make sure the remove() function accepts the format produced by settings().
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
                        BrowsingDataRemovalInputFromSettings) {
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(browsing_data::prefs::kDeleteCache, true);
   prefs->SetBoolean(browsing_data::prefs::kDeleteBrowsingHistory, true);
   prefs->SetBoolean(browsing_data::prefs::kDeleteDownloadHistory, true);
   prefs->SetBoolean(browsing_data::prefs::kDeleteCookies, false);
   prefs->SetBoolean(browsing_data::prefs::kDeleteFormData, false);
   prefs->SetBoolean(browsing_data::prefs::kDeleteHostedAppsData, false);
   prefs->SetBoolean(browsing_data::prefs::kDeletePasswords, false);
   prefs->SetBoolean(prefs::kClearPluginLSODataEnabled, false);
-  int expected_mask = BrowsingDataRemover::REMOVE_CACHE |
-        BrowsingDataRemover::REMOVE_DOWNLOADS |
-        BrowsingDataRemover::REMOVE_HISTORY;
+  int expected_mask = BrowsingDataRemover::DATA_TYPE_CACHE |
+                      BrowsingDataRemover::DATA_TYPE_DOWNLOADS |
+                      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY;
   std::string json;
   // Scoping for the traces.
   {
     scoped_refptr<BrowsingDataSettingsFunction> settings_function =
         new BrowsingDataSettingsFunction();
     SCOPED_TRACE("settings_json");
     std::unique_ptr<base::Value> result_value(RunFunctionAndReturnSingleResult(
         settings_function.get(), std::string("[]"), browser()));
 
     base::DictionaryValue* result;
@@ skipping 12 matching lines @@
         remove_function.get(),
         std::string("[{\"since\": 1},") + json + "]",
         browser()));
     EXPECT_EQ(expected_mask, GetRemovalMask());
     EXPECT_EQ(UNPROTECTED_WEB, GetOriginTypeMask());
   }
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, ShortcutFunctionRemovalMask) {
   RunAndCompareRemovalMask<BrowsingDataRemoveAppcacheFunction>(
-      BrowsingDataRemover::REMOVE_APPCACHE);
+      BrowsingDataRemover::DATA_TYPE_APP_CACHE);
   RunAndCompareRemovalMask<BrowsingDataRemoveCacheFunction>(
-      BrowsingDataRemover::REMOVE_CACHE);
+      BrowsingDataRemover::DATA_TYPE_CACHE);
   RunAndCompareRemovalMask<BrowsingDataRemoveCookiesFunction>(
-      BrowsingDataRemover::REMOVE_COOKIES |
-      BrowsingDataRemover::REMOVE_CHANNEL_IDS);
+      BrowsingDataRemover::DATA_TYPE_COOKIES |
+      BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS);
   RunAndCompareRemovalMask<BrowsingDataRemoveDownloadsFunction>(
-      BrowsingDataRemover::REMOVE_DOWNLOADS);
+      BrowsingDataRemover::DATA_TYPE_DOWNLOADS);
   RunAndCompareRemovalMask<BrowsingDataRemoveFileSystemsFunction>(
-      BrowsingDataRemover::REMOVE_FILE_SYSTEMS);
+      BrowsingDataRemover::DATA_TYPE_FILE_SYSTEMS);
   RunAndCompareRemovalMask<BrowsingDataRemoveFormDataFunction>(
-      BrowsingDataRemover::REMOVE_FORM_DATA);
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA);
   RunAndCompareRemovalMask<BrowsingDataRemoveHistoryFunction>(
-      BrowsingDataRemover::REMOVE_HISTORY);
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY);
   RunAndCompareRemovalMask<BrowsingDataRemoveIndexedDBFunction>(
-      BrowsingDataRemover::REMOVE_INDEXEDDB);
+      BrowsingDataRemover::DATA_TYPE_INDEXED_DB);
   RunAndCompareRemovalMask<BrowsingDataRemoveLocalStorageFunction>(
-      BrowsingDataRemover::REMOVE_LOCAL_STORAGE);
+      BrowsingDataRemover::DATA_TYPE_LOCAL_STORAGE);
   // We can't remove plugin data inside a test profile.
   RunAndCompareRemovalMask<BrowsingDataRemovePasswordsFunction>(
-      BrowsingDataRemover::REMOVE_PASSWORDS);
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS);
   RunAndCompareRemovalMask<BrowsingDataRemoveServiceWorkersFunction>(
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS);
+      BrowsingDataRemover::DATA_TYPE_SERVICE_WORKERS);
   RunAndCompareRemovalMask<BrowsingDataRemoveWebSQLFunction>(
-      BrowsingDataRemover::REMOVE_WEBSQL);
+      BrowsingDataRemover::DATA_TYPE_WEB_SQL);
 }
 
 // Test the processing of the 'delete since' preference.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSince) {
   SetSinceAndVerify(browsing_data::TimePeriod::ALL_TIME);
   SetSinceAndVerify(browsing_data::TimePeriod::LAST_HOUR);
   SetSinceAndVerify(browsing_data::TimePeriod::LAST_DAY);
   SetSinceAndVerify(browsing_data::TimePeriod::LAST_WEEK);
   SetSinceAndVerify(browsing_data::TimePeriod::FOUR_WEEKS);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionEmpty) {
   SetPrefsAndVerifySettings(0, 0, 0);
 }
 
 // Test straightforward settings, mapped 1:1 to data types.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSimple) {
-  SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_CACHE, 0,
-                            BrowsingDataRemover::REMOVE_CACHE);
-  SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_HISTORY, 0,
-                            BrowsingDataRemover::REMOVE_HISTORY);
-  SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_FORM_DATA, 0,
-                            BrowsingDataRemover::REMOVE_FORM_DATA);
-  SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_DOWNLOADS, 0,
-                            BrowsingDataRemover::REMOVE_DOWNLOADS);
-  SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_PASSWORDS, 0,
-                            BrowsingDataRemover::REMOVE_PASSWORDS);
+  SetPrefsAndVerifySettings(BrowsingDataRemover::DATA_TYPE_CACHE, 0,
+                            BrowsingDataRemover::DATA_TYPE_CACHE);
+  SetPrefsAndVerifySettings(
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY, 0,
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY);
+  SetPrefsAndVerifySettings(
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA, 0,
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA);
+  SetPrefsAndVerifySettings(BrowsingDataRemover::DATA_TYPE_DOWNLOADS, 0,
+                            BrowsingDataRemover::DATA_TYPE_DOWNLOADS);
+  SetPrefsAndVerifySettings(
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS, 0,
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS);
 }
 
 // Test cookie and app data settings.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSiteData) {
   int site_data_no_durable_or_usage_or_external =
-      BrowsingDataRemover::REMOVE_SITE_DATA &
-      ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA &
-      ~BrowsingDataRemover::REMOVE_DURABLE_PERMISSION &
-      ~BrowsingDataRemover::REMOVE_EXTERNAL_PROTOCOL_DATA;
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA &
+      ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_USAGE_DATA &
+      ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_DURABLE_PERMISSION &
+      ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_EXTERNAL_PROTOCOL_DATA;
   int site_data_no_plugins_durable_usage_external =
       site_data_no_durable_or_usage_or_external &
-      ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
+      ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA;
 
-  SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_COOKIES,
+  SetPrefsAndVerifySettings(BrowsingDataRemover::DATA_TYPE_COOKIES,
                             UNPROTECTED_WEB,
                             site_data_no_plugins_durable_usage_external);
   SetPrefsAndVerifySettings(
-      BrowsingDataRemover::REMOVE_HOSTED_APP_DATA_TESTONLY, PROTECTED_WEB,
-      site_data_no_plugins_durable_usage_external);
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HOSTED_APP_DATA_TEST_ONLY,
+      PROTECTED_WEB, site_data_no_plugins_durable_usage_external);
+  SetPrefsAndVerifySettings(BrowsingDataRemover::DATA_TYPE_COOKIES |
+                                ChromeBrowsingDataRemoverDelegate::
+                                    DATA_TYPE_HOSTED_APP_DATA_TEST_ONLY,
+                            PROTECTED_WEB | UNPROTECTED_WEB,
+                            site_data_no_plugins_durable_usage_external);
   SetPrefsAndVerifySettings(
-      BrowsingDataRemover::REMOVE_COOKIES |
-          BrowsingDataRemover::REMOVE_HOSTED_APP_DATA_TESTONLY,
-      PROTECTED_WEB | UNPROTECTED_WEB,
-      site_data_no_plugins_durable_usage_external);
-  SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_COOKIES |
-                                BrowsingDataRemover::REMOVE_PLUGIN_DATA,
-                            UNPROTECTED_WEB,
-                            site_data_no_durable_or_usage_or_external);
+      BrowsingDataRemover::DATA_TYPE_COOKIES |
+          ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA,
+      UNPROTECTED_WEB, site_data_no_durable_or_usage_or_external);
 }
 
 // Test an arbitrary assortment of settings.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionAssorted) {
   int site_data_no_plugins_durable_usage_external =
-      BrowsingDataRemover::REMOVE_SITE_DATA &
-      ~BrowsingDataRemover::REMOVE_DURABLE_PERMISSION &
-      ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA &
-      ~BrowsingDataRemover::REMOVE_PLUGIN_DATA &
-      ~BrowsingDataRemover::REMOVE_EXTERNAL_PROTOCOL_DATA;
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA &
+      ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_DURABLE_PERMISSION &
+      ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_USAGE_DATA &
+      ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA &
+      ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_EXTERNAL_PROTOCOL_DATA;
 
-  SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_COOKIES |
-                                BrowsingDataRemover::REMOVE_HISTORY |
-                                BrowsingDataRemover::REMOVE_DOWNLOADS,
-                            UNPROTECTED_WEB,
-                            site_data_no_plugins_durable_usage_external |
-                                BrowsingDataRemover::REMOVE_HISTORY |
-                                BrowsingDataRemover::REMOVE_DOWNLOADS);
+  SetPrefsAndVerifySettings(
+      BrowsingDataRemover::DATA_TYPE_COOKIES |
+          ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY |
+          BrowsingDataRemover::DATA_TYPE_DOWNLOADS,
+      UNPROTECTED_WEB,
+      site_data_no_plugins_durable_usage_external |
+          ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY |
+          BrowsingDataRemover::DATA_TYPE_DOWNLOADS);
 }