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

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 2697123004: Convert RemoveDataMask from enum to pointers and split it between content and embedder (Closed)
Patch Set: Android compilation Created 3 years, 10 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
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 262706d301f8cf97e70c938db99a357c2e844902..526ec4a4e2f5113192a2671d05cde6686e0f94e1 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -34,6 +34,7 @@
#include "chrome/browser/browsing_data/browsing_data_remover.h"
#include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
#include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
+#include "chrome/browser/browsing_data/chrome_browsing_data_types.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ -231,7 +232,9 @@ std::string CreateServerRedirect(const std::string& dest_url) {
}
// Clears the specified data using BrowsingDataRemover.
-void ClearBrowsingData(Browser* browser, int remove_mask) {
+void ClearBrowsingData(
+ Browser* browser,
+ const std::set<const content::BrowsingDataType*>& remove_mask) {
BrowsingDataRemover* remover =
BrowsingDataRemoverFactory::GetForBrowserContext(browser->profile());
BrowsingDataRemoverCompletionObserver observer(remover);
@@ -2528,7 +2531,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearHistory) {
PrerenderTestURL("/prerender/prerender_page.html",
FINAL_STATUS_CACHE_OR_HISTORY_CLEARED, 1);
- ClearBrowsingData(current_browser(), BrowsingDataRemover::REMOVE_HISTORY);
+ ClearBrowsingData(current_browser(), {&kBrowsingDataTypeHistory});
prerender->WaitForStop();
// Make sure prerender history was cleared.
@@ -2542,7 +2545,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearCache) {
PrerenderTestURL("/prerender/prerender_page.html",
FINAL_STATUS_CACHE_OR_HISTORY_CLEARED, 1);
- ClearBrowsingData(current_browser(), BrowsingDataRemover::REMOVE_CACHE);
+ ClearBrowsingData(current_browser(), {&kBrowsingDataTypeCache});
prerender->WaitForStop();
// Make sure prerender history was not cleared. Not a vital behavior, but

Powered by Google App Engine
This is Rietveld 408576698