| Index: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
| diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
| index 2818aa42be11ab6e5a312cb32881091b96a70918..76768d1e5f4075bee6f7be465e6334204367cc72 100644
|
| --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
| +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
| @@ -64,7 +64,7 @@
|
| #include "net/url_request/url_request_context.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
|
| #include "chrome/browser/android/webapps/webapp_registry.h"
|
| #include "chrome/browser/precache/precache_manager_factory.h"
|
| @@ -217,7 +217,7 @@ ChromeBrowsingDataRemoverDelegate::ChromeBrowsingDataRemoverDelegate(
|
| clear_passwords_(sub_task_forward_callback_),
|
| clear_passwords_stats_(sub_task_forward_callback_),
|
| clear_platform_keys_(sub_task_forward_callback_),
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| clear_precache_history_(sub_task_forward_callback_),
|
| clear_offline_page_data_(sub_task_forward_callback_),
|
| #endif
|
| @@ -225,7 +225,7 @@ ChromeBrowsingDataRemoverDelegate::ChromeBrowsingDataRemoverDelegate(
|
| clear_webrtc_logs_(sub_task_forward_callback_),
|
| #endif
|
| clear_auto_sign_in_(sub_task_forward_callback_),
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| webapp_registry_(new WebappRegistry()),
|
| #endif
|
| weak_ptr_factory_(this) {}
|
| @@ -432,7 +432,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
|
| clear_webrtc_logs_.GetCompletionCallback());
|
| #endif
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| precache::PrecacheManager* precache_manager =
|
| precache::PrecacheManagerFactory::GetForBrowserContext(profile_);
|
| // |precache_manager| could be nullptr if the profile is off the record.
|
| @@ -687,7 +687,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
|
| ui_nqe_service->ClearPrefs();
|
| }
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| // For now we're considering offline pages as cache, so if we're removing
|
| // cache we should remove offline pages as well.
|
| if ((remove_mask & BrowsingDataRemover::REMOVE_CACHE)) {
|
| @@ -773,7 +773,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
|
|
|
| //////////////////////////////////////////////////////////////////////////////
|
| // REMOVE_WEBAPP_DATA
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| // Clear all data associated with registered webapps.
|
| if (remove_mask & BrowsingDataRemover::REMOVE_WEBAPP_DATA)
|
| webapp_registry_->UnregisterWebappsForUrls(filter);
|
| @@ -809,7 +809,7 @@ bool ChromeBrowsingDataRemoverDelegate::AllDone() {
|
| !clear_passwords_.is_pending() &&
|
| !clear_passwords_stats_.is_pending() &&
|
| !clear_platform_keys_.is_pending() &&
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| !clear_precache_history_.is_pending() &&
|
| !clear_offline_page_data_.is_pending() &&
|
| #endif
|
| @@ -819,7 +819,7 @@ bool ChromeBrowsingDataRemoverDelegate::AllDone() {
|
| !clear_auto_sign_in_.is_pending();
|
| }
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| void ChromeBrowsingDataRemoverDelegate::OverrideWebappRegistryForTesting(
|
| std::unique_ptr<WebappRegistry> webapp_registry) {
|
| webapp_registry_ = std::move(webapp_registry);
|
|
|