| Index: chrome/browser/browsing_data/browsing_data_remover.h
|
| diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
|
| index 2286ce6dc550b0017345ef4eb8dd105fd445b39d..f189e92abc360b66458090ba934caa0b3ff0b2a6 100644
|
| --- a/chrome/browser/browsing_data/browsing_data_remover.h
|
| +++ b/chrome/browser/browsing_data/browsing_data_remover.h
|
| @@ -94,7 +94,7 @@ class BrowsingDataRemover : public KeyedService {
|
| // prohibited from deleting history or downloads.
|
| REMOVE_NOCHECKS = 1 << 16,
|
| REMOVE_CACHE_STORAGE = 1 << 17,
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| REMOVE_WEBAPP_DATA = 1 << 18,
|
| #endif
|
| REMOVE_DURABLE_PERMISSION = 1 << 19,
|
| @@ -115,21 +115,18 @@ class BrowsingDataRemover : public KeyedService {
|
| REMOVE_CACHE_STORAGE |
|
| REMOVE_WEBSQL |
|
| REMOVE_CHANNEL_IDS |
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| REMOVE_WEBAPP_DATA |
|
| #endif
|
| REMOVE_SITE_USAGE_DATA |
|
| REMOVE_DURABLE_PERMISSION,
|
|
|
| // Datatypes protected by Important Sites.
|
| - IMPORTANT_SITES_DATATYPES = REMOVE_SITE_DATA |
|
| - REMOVE_CACHE,
|
| + IMPORTANT_SITES_DATATYPES = REMOVE_SITE_DATA | REMOVE_CACHE,
|
|
|
| // Datatypes that can be deleted partially per URL / origin / domain,
|
| // whichever makes sense.
|
| - FILTERABLE_DATATYPES = REMOVE_SITE_DATA |
|
| - REMOVE_CACHE |
|
| - REMOVE_DOWNLOADS,
|
| + FILTERABLE_DATATYPES = REMOVE_SITE_DATA | REMOVE_CACHE | REMOVE_DOWNLOADS,
|
|
|
| // Includes all the available remove options. Meant to be used by clients
|
| // that wish to wipe as much data as possible from a Profile, to make it
|
| @@ -297,7 +294,7 @@ class BrowsingDataRemover : public KeyedService {
|
| protected:
|
| // Use BrowsingDataRemoverFactory::GetForBrowserContext to get an instance of
|
| // this class. The constructor is protected so that the class is mockable.
|
| - BrowsingDataRemover(content::BrowserContext* browser_context);
|
| + explicit BrowsingDataRemover(content::BrowserContext* browser_context);
|
| ~BrowsingDataRemover() override;
|
|
|
| // A common reduction of all public Remove[WithFilter][AndReply] methods.
|
|
|