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

Unified Diff: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Created 3 years, 11 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/chrome_browsing_data_remover_delegate.h
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
index 39f212be031abbbd0fb58f22738a513dfe3eb55c..7d59e33a9368f1dbab75b0a47f09d6b944764687 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
@@ -49,7 +49,7 @@ class ChromeBrowsingDataRemoverDelegate : public BrowsingDataRemoverDelegate
int origin_type_mask,
const base::Closure& callback) override;
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
void OverrideWebappRegistryForTesting(
std::unique_ptr<WebappRegistry> webapp_registry);
#endif
@@ -114,7 +114,7 @@ class ChromeBrowsingDataRemoverDelegate : public BrowsingDataRemoverDelegate
BrowsingDataRemover::SubTask clear_passwords_;
BrowsingDataRemover::SubTask clear_passwords_stats_;
BrowsingDataRemover::SubTask clear_platform_keys_;
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
BrowsingDataRemover::SubTask clear_precache_history_;
BrowsingDataRemover::SubTask clear_offline_page_data_;
#endif
@@ -136,7 +136,7 @@ class ChromeBrowsingDataRemoverDelegate : public BrowsingDataRemoverDelegate
std::unique_ptr<TemplateURLService::Subscription> template_url_sub_;
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
// WebappRegistry makes calls across the JNI. In unit tests, the Java side is
// not initialised, so the registry must be mocked out.
std::unique_ptr<WebappRegistry> webapp_registry_;

Powered by Google App Engine
This is Rietveld 408576698