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

Unified Diff: chrome/browser/browsing_data/browsing_data_remover.cc

Issue 428323002: ifdef remaining extensions code in chrome/browser/browsing_data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/browsing_data/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index fed036e5cd0acaf2e71b3400dd44f125ff50e122..ebdfd2b5580eb49dad93c75be23e5e28d4fc1572 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -20,8 +20,6 @@
#include "chrome/browser/domain_reliability/service_factory.h"
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/download/download_service_factory.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_special_storage_policy.h"
#include "chrome/browser/history/history_service.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/io_thread.h"
@@ -87,6 +85,8 @@
#if defined(ENABLE_EXTENSIONS)
#include "chrome/browser/apps/ephemeral_app_service.h"
#include "chrome/browser/extensions/activity_log/activity_log.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_special_storage_policy.h"
#endif
#if defined(ENABLE_WEBRTC)
@@ -110,8 +110,7 @@ bool DoesOriginMatchMask(int origin_set_mask,
const GURL& origin,
quota::SpecialStoragePolicy* special_storage_policy) {
return BrowsingDataHelper::DoesOriginMatchMask(
- origin, origin_set_mask,
- static_cast<ExtensionSpecialStoragePolicy*>(special_storage_policy));
+ origin, origin_set_mask, special_storage_policy);
}
BrowsingDataRemover::NotificationDetails::NotificationDetails()
@@ -184,7 +183,6 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
base::Time delete_begin,
base::Time delete_end)
: profile_(profile),
- special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()),
delete_begin_(delete_begin),
delete_end_(delete_end),
next_cache_state_(STATE_NONE),

Powered by Google App Engine
This is Rietveld 408576698