Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1204)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

Issue 2733393003: Split browsing data masks between content and embedder (Closed)
Patch Set: Rebase (merged automatically) Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/browsing_data/browsing_data_api.cc ('k') | chrome/browser/net/errorpage_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
index 9a908878869e10c4ab7d8144c2fab1e5409fa298..e48434737d11601043090f63ebcd51491404695a 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
@@ -13,6 +13,7 @@
#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"
@@ -29,9 +30,9 @@ 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[] =
@@ -153,23 +154,34 @@ class ExtensionBrowsingDataTest : public InProcessBrowserTest {
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();
@@ -195,34 +207,35 @@ class ExtensionBrowsingDataTest : public InProcessBrowserTest {
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);
}
@@ -291,23 +304,23 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, RemoveBrowsingDataAll) {
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());
}
@@ -340,45 +353,44 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, BrowsingDataOriginTypeMask) {
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().
@@ -393,9 +405,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
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.
{
@@ -428,31 +440,31 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
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.
@@ -470,60 +482,64 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionEmpty) {
// 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;
-
- 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);
+ 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::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);
}
« no previous file with comments | « chrome/browser/extensions/api/browsing_data/browsing_data_api.cc ('k') | chrome/browser/net/errorpage_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698